Merge remote-tracking branch 'upstream/master' into 1.14.x

non · non · commit 93159bf77d89 · 2019-09-25T11:04:25.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -5,19 +5,11 @@
 /build
 /.settings
 /dist
-/.Test.scala.swp
-target
 /lib_managed
 /src_managed
 
-# /project/
-/project/boot
-/project/project/
-/project/target/
-/project/build/target
-
-/examples/simple-sbt/project/
-/examples/simple-sbt/target/
+# sbt
+target/
 
 # Intellij
 .idea
diff --git a/.travis.yml b/.travis.yml
@@ -16,8 +16,8 @@ notifications:
 scala:
   - 2.10.7
   - 2.11.12
-  - 2.12.9
-  - 2.13.0
+  - 2.12.10
+  - 2.13.1
 jdk:
   - oraclejdk8
   - openjdk11
@@ -40,6 +40,7 @@ cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt
+    - $HOME/.cache/coursier
 
 matrix:
   include:
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -1,6 +1,6 @@
 # ScalaCheck CHANGELOG
 
-## 1.14.1 (UNRELEASED)
+## 1.14.1 (2019-09-18)
 
 * Binary compatible with 1.14.0 version of ScalaCheck.
 
diff --git a/RELEASE.markdown b/RELEASE.markdown
@@ -10,8 +10,8 @@ features of QuickCheck can be found in ScalaCheck and vice versa, though.
 
 ScalaCheck 1.14.1 is a minor update from ScalaCheck 1.14.0, and it is
 binary compatible. This means that if you
-are using any other framework in combination with ScalaCheck, like `ScalaTest`
-or `specs2` you can typically just bump the version of ScalaCheck in your
+are using any other framework in combination with ScalaCheck, like [ScalaTest](http://www.scalatest.org/)
+or [specs2](http://specs2.org/) you can typically just bump the version of ScalaCheck in your
 build definition or wait for those libraries to transitively do it for you in their next update.  You still need to make sure that the combination of frameworks you
 are using was built and tested together with each other, otherwise you can run
 into errors related to binary compatibility that are possibly very hard to
diff --git a/build.sbt b/build.sbt
@@ -4,15 +4,15 @@ val scalaMajorVersion = SettingKey[Int]("scalaMajorVersion")
 
 scalaVersionSettings
 
-lazy val versionNumber = "1.14.1"
+lazy val versionNumber = "1.14.2"
 
-lazy val isRelease = false
+val isRelease = SettingKey[Boolean]("isRelease")
 
 lazy val travisCommit = Option(System.getenv().get("TRAVIS_COMMIT"))
 
 lazy val scalaVersionSettings = Seq(
-  scalaVersion := "2.13.0",
-  crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.9", scalaVersion.value),
+  scalaVersion := "2.13.1",
+  crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.10", scalaVersion.value),
   scalaMajorVersion := {
     val v = scalaVersion.value
     CrossVersion.partialVersion(v).map(_._2.toInt).getOrElse {
@@ -28,14 +28,16 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
 
   name := "scalacheck",
 
+  isRelease := false,
+
   version := {
     val suffix =
-      if (isRelease) ""
+      if (isRelease.value) ""
       else travisCommit.map("-" + _.take(7)).getOrElse("") + "-SNAPSHOT"
     versionNumber + suffix
   },
 
-  isSnapshot := !isRelease,
+  isSnapshot := !isRelease.value,
 
   organization := "org.scalacheck",
 
@@ -112,7 +114,7 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
       scalaJSVersion.startsWith("1.0.0-M")
     // TODO: re-enable MiMa for 2.14 once there is a final version
     if (scalaMajorVersion.value == 14 || isScalaJSMilestone) Set()
-    else Set("org.scalacheck" %%% "scalacheck" % "1.14.0")
+    else Set("org.scalacheck" %%% "scalacheck" % "1.14.1")
   },
 
   publishTo := {
@@ -125,7 +127,7 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
   publishMavenStyle := true,
 
   // Travis should only publish snapshots
-  publishArtifact := !(isRelease && travisCommit.isDefined),
+  publishArtifact := !(isRelease.value && travisCommit.isDefined),
 
   publishArtifact in Test := false,
 
diff --git a/examples/commands-leveldb/build.sbt b/examples/commands-leveldb/build.sbt
@@ -1,9 +1,9 @@
 name := "commands-leveldb"
 
-scalaVersion := "2.12.9"
+scalaVersion := "2.12.10"
 
 libraryDependencies ++= Seq(
-  "org.scalacheck" %% "scalacheck" % "1.14.0",
+  "org.scalacheck" %% "scalacheck" % "1.14.1",
   "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8"
 //  "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.7"
 //  "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.6.1"
diff --git a/examples/commands-leveldb/project/build.properties b/examples/commands-leveldb/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.3.1
diff --git a/examples/commands-nix/build.sbt b/examples/commands-nix/build.sbt
@@ -1,9 +1,9 @@
 name := "commands-nix"
 
-scalaVersion := "2.12.9"
+scalaVersion := "2.12.10"
 
 libraryDependencies ++= Seq(
-  "org.scalacheck" %% "scalacheck" % "1.14.0",
+  "org.scalacheck" %% "scalacheck" % "1.14.1",
   "net.java.dev.jna" % "jna" % "4.5.1"
 )
 
diff --git a/examples/commands-nix/project/build.properties b/examples/commands-nix/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.3.1
diff --git a/examples/commands-redis/build.sbt b/examples/commands-redis/build.sbt
@@ -1,9 +1,9 @@
 name := "commands-redis"
 
-scalaVersion := "2.12.9"
+scalaVersion := "2.12.10"
 
 libraryDependencies ++= Seq(
-  "org.scalacheck" %% "scalacheck" % "1.14.0",
+  "org.scalacheck" %% "scalacheck" % "1.14.1",
   "org.slf4j" % "slf4j-simple" % "1.7.25",
   "net.debasishg" %% "redisclient" % "3.6"
 )
diff --git a/examples/commands-redis/project/build.properties b/examples/commands-redis/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.3.1
diff --git a/examples/scalajs/README.md b/examples/scalajs/README.md
@@ -1,9 +1,9 @@
 # Using ScalaCheck with Scala.js
 
 ScalaCheck has experimental support for [Scala.js](http://www.scala-js.org/).
-The current master branch of ScalaCheck has been ported to work with Scala.js,
-and a snapshot version has been released. Not all parts of ScalaCheck works
-yet, but around 40% of ScalaCheck's own test suite runs fine under Scala.js.
+The current release of ScalaCheck has artifacts published to work with Scala.js.
+Not all parts of ScalaCheck work in Scala.js,
+but around 40% of ScalaCheck's own test suite runs fine under Scala.js.
 Feel free reporting issues when you find things that don't work as expected.
 
 ## Get started
@@ -24,14 +24,10 @@ The following is what you need to add to your `build.sbt` file to make the
 ScalaCheck test runner work:
 
 ```
-libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.14.0" % "test"
+libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.14.1" % "test"
 ```
 
 ## Limitations
 
-The ScalaCheck Scala.js test runner doesn't parse any options yet, so you can't
-change parameters like `minSuccessfulTests` yet. That parameter defaults to
-`10` for Scala.js tests, not the usual `100`.
-
 No attempts have yet been made on making ScalaCheck work together with other
 test frameworks for Scala.js.
diff --git a/examples/scalajs/build.sbt b/examples/scalajs/build.sbt
@@ -4,8 +4,8 @@ name := "ScalaCheck-scalajs-example"
 
 version := "0.1-SNAPSHOT"
 
-scalaVersion := "2.12.9"
+scalaVersion := "2.12.10"
 
 javacOptions += "-Xmx2048M"
 
-libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.14.0" % "test"
+libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.14.1" % "test"
diff --git a/examples/scalajs/project/build.properties b/examples/scalajs/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.4
+sbt.version=1.3.1
diff --git a/examples/scalajs/project/build.sbt b/examples/scalajs/project/build.sbt
diff --git a/examples/scalajs/project/plugins.sbt b/examples/scalajs/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29")
diff --git a/examples/simple-sbt/build.sbt b/examples/simple-sbt/build.sbt
@@ -1,7 +1,7 @@
 name := "scalacheck-demo"
 
-scalaVersion := "2.12.9"
+scalaVersion := "2.12.10"
 
-libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.0" % "test"
+libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.1" % "test"
 
 testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-maxSize", "5", "-minSuccessfulTests", "33", "-workers", "1", "-verbosity", "1")
diff --git a/examples/simple-sbt/project/build.properties b/examples/simple-sbt/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.3.1
diff --git a/project/MimaSettings.scala b/project/MimaSettings.scala
@@ -19,8 +19,6 @@ object MimaSettings {
   )
 
   private def removedPrivateMethods = Seq(
-    // lazy val cmdLineParser is now an object
-    "org.scalacheck.Test.cmdLineParser"
   )
 
   private def removedPrivateClasses = Seq(
@@ -29,9 +27,6 @@ object MimaSettings {
   private def otherProblems = Seq(
     // New issue added in MiMa 0.4.0
     exclude[IncompatibleSignatureProblem]("org.scalacheck.*"),
-    // Work around weird mima error after cmdLineParser was turned from a lazy
-    // val into an object.
-    exclude[InaccessibleMethodProblem]("java.lang.Object.<clinit>"),
   )
 
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.0
+sbt.version=1.3.1
diff --git a/project/plugin.sbt b/project/plugin.sbt
@@ -1,14 +1,30 @@
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.0")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
 
-val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.28")
+def env(name: String): Option[String] =
+  Option(System.getenv(name))
+
+def printAndDie(msg: String): Nothing = {
+  println(msg)
+  sys.error(msg)
+}
+
+// Update SCALAJS_VERSION in release.sh, as well
+val scalaJSVersion = env("SCALAJS_VERSION") match {
+  case Some("0.6.29") | None => "0.6.29"
+  case Some("1.0.0-M8") => "1.0.0-M8"
+  case Some(v) => printAndDie(s"unsupported scala.js version: $v")
+}
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
-val scalaNativeVersion =
-  Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.3.9")
+// Update SCALANATIVE_VERSION in release.sh, as well
+val scalaNativeVersion = env("SCALANATIVE_VERSION") match {
+  case Some("0.3.9") | None => "0.3.9"
+  case Some("0.4.0-M2") => "0.4.0-M2"
+  case Some(v) => printAndDie(s"unsupported scala native version: $v")
+}
 
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
 
diff --git a/release.sh b/release.sh
@@ -12,7 +12,6 @@
 # step 3: edit build.sbt
 #    a. set versionNumber to this release number (e.g. "1.14.2" or "1.14.3-M1")
 #       this version could include RC or M but should not include SNAPSHOT.
-#    b. set isRelease to true
 #
 # step 4: start the actual release
 #    a. run ./release.sh publishSigned
@@ -24,7 +23,6 @@
 # step 5: edit build.sbt again
 #    a. set versionNumber to the next release number (e.g. "1.14.3")
 #       note -- don't include SNAPSHOT, RC, or M in this version.
-#    b. set isRelease back to false
 
 usage() {
     echo "usage: $0 [compile | test | package | publishLocal | publishSigned]"
@@ -35,23 +33,15 @@ runsbt() {
     sbt "$1"
     RES=$?
     if [ $RES -ne 0 ]; then
-        echo "sbt '$1' failed: $RES"
+        echo "sbt 'set every isRelease := true' '$1' failed: $RES"
         exit $RES
     fi
 }
 
 if [ $# -ne 1 ]; then usage; fi
 
 case "$1" in
-    compile|test|package|publishLocal)
-        CMD="$1";;
-    publishSigned)
-        egrep -q '^lazy val isRelease = true$' build.sbt
-        if [ $? -ne 0 ]; then
-            echo "isRelease is not true in build.sbt. fix this!"
-            echo "also make sure versionNumber is correct!"
-            usage
-        fi
+    compile|test|package|publishLocal|publishSigned)
         CMD="$1";;
     *) echo "unknown argument: $1"; usage;;
 esac
@@ -63,7 +53,7 @@ runsbt "+ clean"
 runsbt "+ jvm/$CMD"
 
 # step 4b: js releases (clean versions)
-SCALAJS_VERSION="0.6.28" runsbt "+ js/$CMD"
+SCALAJS_VERSION="0.6.29" runsbt "+ js/$CMD"
 runsbt "+ js/clean"
 SCALAJS_VERSION="1.0.0-M8" runsbt "+ js/$CMD"
 
diff --git a/scalafix/build.sbt b/scalafix/build.sbt
@@ -21,13 +21,13 @@ lazy val rules = project
 lazy val input = project
   .settings(
     skip in publish := true,
-    libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.0",
+    libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.1",
   )
 
 lazy val output = project
   .settings(
     skip in publish := true,
-    libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.0",
+    libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.1",
   )
 
 lazy val tests = project
diff --git a/scalafix/project/build.properties b/scalafix/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.0
+sbt.version=1.3.1
diff --git a/src/main/scala/org/scalacheck/ScalaCheckFramework.scala b/src/main/scala/org/scalacheck/ScalaCheckFramework.scala
@@ -28,7 +28,11 @@ private abstract class ScalaCheckRunner extends Runner {
 
   def deserializeTask(task: String, deserializer: String => TaskDef): BaseTask = {
     val taskDef = deserializer(task)
-    if (taskDef.selectors.isEmpty) rootTask(taskDef)
+    val countTestSelectors = taskDef.selectors.toSeq.count {
+      case _:TestSelector => true
+      case _ => false
+    }
+    if (countTestSelectors == 0) rootTask(taskDef)
     else checkPropTask(taskDef, single = true)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`name := "commands-nix"`
`2`	`2`
`3`		`-scalaVersion := "2.12.9"`
	`3`	`+scalaVersion := "2.12.10"`
`4`	`4`
`5`	`5`	`libraryDependencies ++= Seq(`
`6`		`- "org.scalacheck" %% "scalacheck" % "1.14.0",`
	`6`	`+ "org.scalacheck" %% "scalacheck" % "1.14.1",`
`7`	`7`	`"net.java.dev.jna" % "jna" % "4.5.1"`
`8`	`8`	`)`
`9`	`9`