Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ If ScalaTest has saved you time, helped you ship better software, or become a ke

**Usage**

To use it for ScalaTest 3.2.19 and ScalaCheck 1.18.x:
To use it for ScalaTest 3.3.0-RC1 and ScalaCheck 1.18.x:

SBT:

```
libraryDependencies += "org.scalatestplus" %% "scalacheck-1-18" % "3.2.19.0" % "test"
libraryDependencies += "org.scalatestplus" %% "scalacheck-1-18" % "3.3.0.0-RC1" % "test"
```

Maven:
Expand All @@ -28,7 +28,7 @@ Maven:
<dependency>
<groupId>org.scalatestplus</groupId>
<artifactId>scalacheck-1-18_3</artifactId>
<version>3.2.19.0</version>
<version>3.3.0.0-RC1</version>
<scope>test</scope>
</dependency>
```
Expand All @@ -41,6 +41,7 @@ Please use the following commands to publish to Sonatype:

```
$ sbt clean +publishSigned
$ sbt sonaUpload
```

**Creating Scaladoc**
Expand Down
35 changes: 15 additions & 20 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ import scala.xml.transform.{RewriteRule, RuleTransformer}
import java.io.PrintWriter
import scala.io.Source

val defaultScalaVersion = "2.13.13"
ThisBuild / organization := "org.scalatestplus"

scalaVersion := defaultScalaVersion
ThisBuild / version := "3.3.0.0-RC1"

publishTo := {
val nexus = "https://oss.sonatype.org/"
Some("publish-releases" at nexus + "service/local/staging/deploy/maven2")
}
val defaultScalaVersion = "2.13.16"

publishTo := localStaging.value

publishArtifact := false

Expand Down Expand Up @@ -47,9 +46,7 @@ def docTask(docDir: File, resDir: File, projectName: String): File = {
}

val sharedSettings = Seq(
name := "scalacheck-1.18",
organization := "org.scalatestplus",
version := "3.2.19.0",
name := "scalacheck-1.18",
homepage := Some(url("https://github.com/scalatest/scalatestplus-scalacheck")),
licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
developers := List(
Expand All @@ -68,11 +65,11 @@ val sharedSettings = Seq(
),
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
libraryDependencies ++= Seq(
"org.scalatest" %%% "scalatest-core" % "3.2.19",
"org.scalacheck" %%% "scalacheck" % "1.18.0",
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.18" % "test",
"org.scalatest" %%% "scalatest-funspec" % "3.2.18" % "test",
"org.scalatest" %%% "scalatest-funsuite" % "3.2.18" % "test"
"org.scalatest" %%% "scalatest-core" % "3.3.0",
"org.scalacheck" %%% "scalacheck" % "1.18.1",
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.3.0" % "test",
"org.scalatest" %%% "scalatest-funspec" % "3.3.0" % "test",
"org.scalatest" %%% "scalatest-funsuite" % "3.3.0" % "test"
),
// skip dependency elements with a scope
pomPostProcess := { (node: XmlNode) =>
Expand All @@ -96,10 +93,7 @@ val sharedSettings = Seq(
GenScalaCheckGen.genTest((Test / sourceManaged).value / "org" / "scalatest" / "check", version.value, scalaVersion.value)
}
},
publishTo := {
val nexus = "https://oss.sonatype.org/"
Some("publish-releases" at nexus + "service/local/staging/deploy/maven2")
},
publishTo := localStaging.value,
publishMavenStyle := true,
Test / publishArtifact := false,
pomIncludeRepository := { _ => false },
Expand Down Expand Up @@ -140,7 +134,7 @@ lazy val scalatestPlusScalaCheck =
.enablePlugins(SbtOsgi)
.settings(osgiSettings: _*).settings(
scalaVersion := defaultScalaVersion,
crossScalaVersions := List("2.12.19", defaultScalaVersion, "3.3.3"),
crossScalaVersions := List("2.12.20", defaultScalaVersion, "3.3.6"),
OsgiKeys.exportPackage := Seq(
"org.scalatestplus.scalacheck.*"
),
Expand Down Expand Up @@ -179,7 +173,8 @@ lazy val scalatestPlusScalaCheck =
GenResourcesJSVM.genResources((Compile / sourceManaged).value / "org" / "scalatestplus" / "scalacheck", version.value, scalaVersion.value) ++
GenResourcesJSVM.genFailureMessages((Compile / sourceManaged).value / "org" / "scalatestplus" / "scalacheck", version.value, scalaVersion.value)
}
}
},
evictionErrorLevel := Level.Warn // Workaround as scalacheck 1.18.1 is using test-interface native 0.5.5, when newer scalacheck version available we may try remove this.
)

lazy val scalatestPlusScalaCheckJS = scalatestPlusScalaCheck.js
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.8
sbt.version=1.11.4
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")

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

val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.16.0")
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.19.0")

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

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

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

Expand Down
Loading