Skip to content

Commit e81f133

Browse files
committed
Adjusted for 3.2.12.0 release.
1 parent 2d2b4bb commit e81f133

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

build.sbt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ def docTask(docDir: File, resDir: File, projectName: String): File = {
4747
}
4848

4949
val sharedSettings = Seq(
50-
name := "scalacheck-1.15",
50+
name := "scalacheck-1.16",
5151
organization := "org.scalatestplus",
52-
version := "3.2.12.0-RC2",
52+
version := "3.2.12.0",
5353
homepage := Some(url("https://github.com/scalatest/scalatestplus-scalacheck")),
5454
licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
5555
developers := List(
@@ -68,11 +68,11 @@ val sharedSettings = Seq(
6868
),
6969
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
7070
libraryDependencies ++= Seq(
71-
"org.scalatest" %%% "scalatest-core" % "3.2.12-RC2",
72-
"org.scalacheck" %%% "scalacheck" % "1.15.4",
73-
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.12-RC2" % "test",
74-
"org.scalatest" %%% "scalatest-funspec" % "3.2.12-RC2" % "test",
75-
"org.scalatest" %%% "scalatest-funsuite" % "3.2.12-RC2" % "test"
71+
"org.scalatest" %%% "scalatest-core" % "3.2.12",
72+
"org.scalacheck" %%% "scalacheck" % "1.16.0",
73+
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.12" % "test",
74+
"org.scalatest" %%% "scalatest-funspec" % "3.2.12" % "test",
75+
"org.scalatest" %%% "scalatest-funsuite" % "3.2.12" % "test"
7676
),
7777
// skip dependency elements with a scope
7878
pomPostProcess := { (node: XmlNode) =>
@@ -140,6 +140,7 @@ lazy val scalatestPlusScalaCheck =
140140
.enablePlugins(SbtOsgi)
141141
.settings(osgiSettings: _*).settings(
142142
scalaVersion := defaultScalaVersion,
143+
crossScalaVersions := List("2.12.15", defaultScalaVersion, "3.1.2"),
143144
OsgiKeys.exportPackage := Seq(
144145
"org.scalatestplus.scalacheck.*"
145146
),
@@ -157,7 +158,6 @@ lazy val scalatestPlusScalaCheck =
157158
)
158159
)
159160
.jsSettings(
160-
crossScalaVersions := List("2.12.15", defaultScalaVersion, "3.0.2"),
161161
Compile / sourceGenerators += {
162162
Def.task {
163163
GenResourcesJSVM.genResources((Compile / sourceManaged).value / "org" / "scalatestplus" / "scalacheck", version.value, scalaVersion.value) ++
@@ -166,7 +166,6 @@ lazy val scalatestPlusScalaCheck =
166166
}
167167
)
168168
.jvmSettings(
169-
crossScalaVersions := List("2.12.15", defaultScalaVersion, "3.0.2"),
170169
Compile / sourceGenerators += {
171170
Def.task {
172171
GenResourcesJVM.genResources((Compile / sourceManaged).value / "org" / "scalatestplus" / "scalacheck", version.value, scalaVersion.value) ++
@@ -175,7 +174,6 @@ lazy val scalatestPlusScalaCheck =
175174
}
176175
)
177176
.nativeSettings(
178-
crossScalaVersions := List("2.12.15", defaultScalaVersion),
179177
Test / nativeLinkStubs := true,
180178
Compile / sourceGenerators += {
181179
Def.task {

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ 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.7.1")
5+
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.8.0")
66

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

0 commit comments

Comments
 (0)