Skip to content

Commit

Permalink
Release 3.2.4.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
cheeseng committed Feb 18, 2021
1 parent e83ba75 commit 40fca67
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ publishLocal := {}
val sharedSettings = Seq(
name := "scalacheck-1.15",
organization := "org.scalatestplus",
version := "3.2.4.0-M1",
version := "3.2.4.0",
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 @@ -39,11 +39,11 @@ val sharedSettings = Seq(
),
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
libraryDependencies ++= Seq(
"org.scalatest" %%% "scalatest-core" % "3.2.4-M1",
"org.scalacheck" %%% "scalacheck" % "1.15.2",
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.4-M1" % "test",
"org.scalatest" %%% "scalatest-funspec" % "3.2.4-M1" % "test",
"org.scalatest" %%% "scalatest-funsuite" % "3.2.4-M1" % "test"
"org.scalatest" %%% "scalatest-core" % "3.2.4",
"org.scalacheck" %%% "scalacheck" % "1.15.3",
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.4" % "test",
"org.scalatest" %%% "scalatest-funspec" % "3.2.4" % "test",
"org.scalatest" %%% "scalatest-funsuite" % "3.2.4" % "test"
),
// skip dependency elements with a scope
pomPostProcess := { (node: XmlNode) =>
Expand Down Expand Up @@ -123,7 +123,7 @@ lazy val scalatestPlusScalaCheck =
)
)
.jsSettings(
crossScalaVersions := List("2.11.12", "2.12.13", defaultScalaVersion),
crossScalaVersions := List("2.12.13", defaultScalaVersion),
sourceGenerators in Compile += {
Def.task {
GenResourcesJSVM.genResources((sourceManaged in Compile).value / "org" / "scalatestplus" / "scalacheck", version.value, scalaVersion.value) ++
Expand All @@ -132,7 +132,7 @@ lazy val scalatestPlusScalaCheck =
}
)
.jvmSettings(
crossScalaVersions := List("2.11.12", "2.12.13", defaultScalaVersion, "3.0.0-M3"),
crossScalaVersions := List("2.12.13", defaultScalaVersion, "3.0.0-RC1"),
Test / scalacOptions ++= (if (isDotty.value) Seq("-language:implicitConversions") else Nil),
sourceGenerators in Compile += {
Def.task {
Expand All @@ -142,7 +142,7 @@ lazy val scalatestPlusScalaCheck =
}
)
.nativeSettings(
crossScalaVersions := List("2.11.12", "2.12.13", defaultScalaVersion),
crossScalaVersions := List("2.12.13", defaultScalaVersion),
nativeLinkStubs in Test := true,
sourceGenerators in Compile += {
Def.task {
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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.3.0")
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.5.0")

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

Expand Down

0 comments on commit 40fca67

Please sign in to comment.