Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ScalaCheck, Scala JS + Native Upgrade #66

Merged
merged 1 commit into from
Jun 13, 2024
Merged
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ ScalaTest + ScalaCheck provides integration support between ScalaTest and ScalaC

**Usage**

To use it for ScalaTest 3.2.18 and ScalaCheck 1.17.x:
To use it for ScalaTest 3.2.18 and ScalaCheck 1.18.x:

SBT:

```
libraryDependencies += "org.scalatestplus" %% "scalacheck-1-17" % "3.2.18.0" % "test"
libraryDependencies += "org.scalatestplus" %% "scalacheck-1-18" % "3.2.18.0" % "test"
```

Maven:

```
<dependency>
<groupId>org.scalatestplus</groupId>
<artifactId>scalacheck-1-17_2.13</artifactId>
<artifactId>scalacheck-1-18_2.13</artifactId>
<version>3.2.18.0</version>
<scope>test</scope>
</dependency>
Expand Down
5 changes: 2 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def docTask(docDir: File, resDir: File, projectName: String): File = {
}

val sharedSettings = Seq(
name := "scalacheck-1.17",
name := "scalacheck-1.18",
organization := "org.scalatestplus",
version := "3.2.18.0",
homepage := Some(url("https://github.com/scalatest/scalatestplus-scalacheck")),
Expand All @@ -69,7 +69,7 @@ val sharedSettings = Seq(
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
libraryDependencies ++= Seq(
"org.scalatest" %%% "scalatest-core" % "3.2.18",
"org.scalacheck" %%% "scalacheck" % "1.17.0",
"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"
Expand Down Expand Up @@ -174,7 +174,6 @@ lazy val scalatestPlusScalaCheck =
}
)
.nativeSettings(
Test / nativeLinkStubs := true,
Compile / sourceGenerators += {
Def.task {
GenResourcesJSVM.genResources((Compile / sourceManaged).value / "org" / "scalatestplus" / "scalacheck", version.value, scalaVersion.value) ++
Expand Down
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.14.0")
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.16.0")

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

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

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

Expand Down
Loading