Skip to content

Commit bb2ac6f

Browse files
authored
Merge pull request #71 from scalatest/feature-scalacheck-1.19.0
ScalaCheck 1.19.0 Build
2 parents ac4a95d + 1baa3e0 commit bb2ac6f

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ If ScalaTest has saved you time, helped you ship better software, or become a ke
1414

1515
**Usage**
1616

17-
To use it for ScalaTest 3.2.19 and ScalaCheck 1.18.x:
17+
To use it for ScalaTest 3.2.19 and ScalaCheck 1.19.x:
1818

1919
SBT:
2020

2121
```
22-
libraryDependencies += "org.scalatestplus" %% "scalacheck-1-18" % "3.2.19.0" % "test"
22+
libraryDependencies += "org.scalatestplus" %% "scalacheck-1-19" % "3.2.19.0" % "test"
2323
```
2424

2525
Maven:
2626

2727
```
2828
<dependency>
2929
<groupId>org.scalatestplus</groupId>
30-
<artifactId>scalacheck-1-18_3</artifactId>
30+
<artifactId>scalacheck-1-19_3</artifactId>
3131
<version>3.2.19.0</version>
3232
<scope>test</scope>
3333
</dependency>
@@ -41,6 +41,7 @@ Please use the following commands to publish to Sonatype:
4141

4242
```
4343
$ sbt clean +publishSigned
44+
$ sbt sonaUpload
4445
```
4546

4647
**Creating Scaladoc**

build.sbt

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
33
import scala.xml.transform.{RewriteRule, RuleTransformer}
44
import java.io.PrintWriter
55
import scala.io.Source
6+
import sbt.util.Level
67

7-
val defaultScalaVersion = "2.13.13"
8+
ThisBuild / organization := "org.scalatestplus"
89

9-
scalaVersion := defaultScalaVersion
10+
ThisBuild / version := "3.2.19.0"
1011

11-
publishTo := {
12-
val nexus = "https://oss.sonatype.org/"
13-
Some("publish-releases" at nexus + "service/local/staging/deploy/maven2")
14-
}
12+
val defaultScalaVersion = "2.13.17"
13+
14+
publishTo := localStaging.value
1515

1616
publishArtifact := false
1717

@@ -47,9 +47,7 @@ def docTask(docDir: File, resDir: File, projectName: String): File = {
4747
}
4848

4949
val sharedSettings = Seq(
50-
name := "scalacheck-1.18",
51-
organization := "org.scalatestplus",
52-
version := "3.2.19.0",
50+
name := "scalacheck-1.19",
5351
homepage := Some(url("https://github.com/scalatest/scalatestplus-scalacheck")),
5452
licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
5553
developers := List(
@@ -67,12 +65,13 @@ val sharedSettings = Seq(
6765
)
6866
),
6967
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
68+
evictionErrorLevel := Level.Warn,
7069
libraryDependencies ++= Seq(
7170
"org.scalatest" %%% "scalatest-core" % "3.2.19",
72-
"org.scalacheck" %%% "scalacheck" % "1.18.0",
73-
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.18" % "test",
74-
"org.scalatest" %%% "scalatest-funspec" % "3.2.18" % "test",
75-
"org.scalatest" %%% "scalatest-funsuite" % "3.2.18" % "test"
71+
"org.scalacheck" %%% "scalacheck" % "1.19.0",
72+
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.19" % "test",
73+
"org.scalatest" %%% "scalatest-funspec" % "3.2.19" % "test",
74+
"org.scalatest" %%% "scalatest-funsuite" % "3.2.19" % "test"
7675
),
7776
// skip dependency elements with a scope
7877
pomPostProcess := { (node: XmlNode) =>
@@ -96,10 +95,7 @@ val sharedSettings = Seq(
9695
GenScalaCheckGen.genTest((Test / sourceManaged).value / "org" / "scalatest" / "check", version.value, scalaVersion.value)
9796
}
9897
},
99-
publishTo := {
100-
val nexus = "https://oss.sonatype.org/"
101-
Some("publish-releases" at nexus + "service/local/staging/deploy/maven2")
102-
},
98+
publishTo := localStaging.value,
10399
publishMavenStyle := true,
104100
Test / publishArtifact := false,
105101
pomIncludeRepository := { _ => false },
@@ -140,7 +136,7 @@ lazy val scalatestPlusScalaCheck =
140136
.enablePlugins(SbtOsgi)
141137
.settings(osgiSettings: _*).settings(
142138
scalaVersion := defaultScalaVersion,
143-
crossScalaVersions := List("2.12.19", defaultScalaVersion, "3.3.3"),
139+
crossScalaVersions := List("2.12.20", defaultScalaVersion, "3.3.7"),
144140
OsgiKeys.exportPackage := Seq(
145141
"org.scalatestplus.scalacheck.*"
146142
),
@@ -181,6 +177,9 @@ lazy val scalatestPlusScalaCheck =
181177
}
182178
}
183179
)
180+
.nativeSettings(
181+
libraryDependencies += "org.scala-native" %%% "test-interface" % "0.5.8"
182+
)
184183

185184
lazy val scalatestPlusScalaCheckJS = scalatestPlusScalaCheck.js
186185
lazy val scalatestPlusScalaCheckJVM = scalatestPlusScalaCheck.jvm

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.8
1+
sbt.version=1.11.7

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
22

33
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
44

5-
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.16.0")
5+
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.20.1")
66

77
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
88

9-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
9+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
1010

1111
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
1212

0 commit comments

Comments
 (0)