Add support for Scala 2.13-M4

Author: julienrf

build.sbt

@@ -1,3 +1,5 @@
+import sbt.CrossVersion
+
 sourceDirectory := file("dummy source directory")
 
 scalaVersionSettings
@@ -11,7 +13,9 @@ lazy val travisCommit = Option(System.getenv().get("TRAVIS_COMMIT"))
 
 lazy val scalaVersionSettings = Seq(
   scalaVersion := "2.12.3",
-  crossScalaVersions := Seq("2.10.6", "2.11.11", "2.13.0-M2", scalaVersion.value)
+  // Temporary: we will eventually use 2.13.0-M4, which will be published to maven central
+  resolvers += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/",
+  crossScalaVersions := Seq("2.10.6", "2.11.11", "2.13.0-pre-c577876", scalaVersion.value)
 )
 
 lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
@@ -46,6 +50,17 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
 
   unmanagedSourceDirectories in Test += (baseDirectory in LocalRootProject).value / "src" / "test" / "scala",
 
+  unmanagedSourceDirectories in Compile ++= {
+    (unmanagedSourceDirectories in Compile).value.map { dir =>
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, 13)) => file(dir.getPath ++ "-2.13")
+        case _             => file(dir.getPath ++ "-2.10-2.12")
+      }
+    }
+  },
+
+  libraryDependencies += "org.scala-lang" %% "scala-collection-compat" % "0.1-SNAPSHOT",
+
   resolvers += "sonatype" at "https://oss.sonatype.org/content/repositories/releases",
 
   javacOptions += "-Xmx1024M",
@@ -55,7 +70,7 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
     "-encoding", "UTF-8",
     "-feature",
     "-unchecked",
-    "-Xfatal-warnings",
+    //"-Xfatal-warnings", Disabled because “import scala.collection.compat._” causes “Unused import” warnings on 2.13.
     "-Xfuture",
     "-Yno-adapted-args",
     "-Ywarn-dead-code",

doc/UserGuide.md

@@ -873,15 +873,15 @@ object CounterSpecification extends Commands {
    *  (a singleton [[Sut]]), implement this method the following way:
    *
    *  {{{
-   *  def canCreateNewSut(newState: State, initSuts: Traversable[State]
-   *    runningSuts: Traversable[Sut]
+   *  def canCreateNewSut(newState: State, initSuts: Iterable[State]
+   *    runningSuts: Iterable[Sut]
    *  ) = {
    *    initSuts.isEmpty && runningSuts.isEmpty
    *  }
    *  }}}
    */
-  def canCreateNewSut(newState: State, initSuts: Traversable[State],
-    runningSuts: Traversable[Sut]): Boolean = true
+  def canCreateNewSut(newState: State, initSuts: Iterable[State],
+    runningSuts: Iterable[Sut]): Boolean = true
 
   /** The precondition for the initial state, when no commands yet have
    *  run. This is used by ScalaCheck when command sequences are shrinked

examples/commands-leveldb/src/test/scala/CommandsLevelDB.scala

@@ -30,8 +30,8 @@ object LevelDBSpec extends Commands {
     def path = s"db_$name"
   }
 
-  def canCreateNewSut(newState: State, initSuts: Traversable[State],
-    runningSuts: Traversable[Sut]
+  def canCreateNewSut(newState: State, initSuts: Iterable[State],
+    runningSuts: Iterable[Sut]
   ) = {
     !initSuts.exists(_.name == newState.name) &&
     !runningSuts.exists(_.name == newState.name)

examples/commands-nix/src/test/scala/CommandsNix.scala

@@ -100,8 +100,8 @@ object MachineSpec extends Commands {
   type Sut = Map[String, org.libvirt.Domain]
 
   // TODO we should check for example total amount of memory used here
-  def canCreateNewSut(newState: State, initSuts: Traversable[State],
-    runningSuts: Traversable[Sut]
+  def canCreateNewSut(newState: State, initSuts: Iterable[State],
+    runningSuts: Iterable[Sut]
   ): Boolean = true
 
   def newSut(state: State): Sut = {

examples/commands-redis/src/test/scala/CommandsRedis.scala

@@ -26,8 +26,8 @@ object RedisSpec extends Commands {
     connected: Boolean
   )
 
-  def canCreateNewSut(newState: State, initSuts: Traversable[State],
-    runningSuts: Traversable[Sut]
+  def canCreateNewSut(newState: State, initSuts: Iterable[State],
+    runningSuts: Iterable[Sut]
   ): Boolean = {
     initSuts.isEmpty && runningSuts.isEmpty
   }

jvm/src/test/scala/org/scalacheck/GenSpecification.scala

@@ -203,7 +203,7 @@ object GenSpecification extends Properties("Gen") {
   property("distributed pick") = {
     val lst = (0 to 7).toIterable
     val n = 2
-    forAll(pick(n, lst)) { xs: Seq[Int] =>
+    forAll(pick(n, lst)) { xs: collection.Seq[Int] =>
       xs.map { x: Int =>
         Prop.collect(x) {
           xs.size == n

jvm/src/test/scala/org/scalacheck/commands/CommandsSpecification.scala

@@ -30,8 +30,8 @@ object CommandsSpecification extends Properties("Commands") {
 
     override def shrinkState: Shrink[Int] = implicitly
 
-    def canCreateNewSut(newState: State, initSuts: Traversable[State],
-      runningSuts: Traversable[Sut]) = true
+    def canCreateNewSut(newState: State, initSuts: Iterable[State],
+      runningSuts: Iterable[Sut]) = true
 
     def newSut(state: State): Sut = Counter(state)
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.0.4
+sbt.version=1.1.0

src/main/scala-2.10-2.12/org/scalacheck/util/ArrayListBuilder.scala

@@ -0,0 +1,17 @@
+package org.scalacheck.util
+
+import java.util
+import java.util.ArrayList
+
+import scala.collection.mutable
+
+private[scalacheck] class ArrayListBuilder[T]
+  extends mutable.Builder[T, util.ArrayList[T]] {
+  val al = new ArrayList[T]
+  def +=(x: T) = {
+    al.add(x)
+    this
+  }
+  def clear() = al.clear()
+  def result() = al
+}

src/main/scala-2.13/org/scalacheck/util/ArrayListBuilder.scala

@@ -0,0 +1,17 @@
+package org.scalacheck.util
+
+import java.util
+import java.util.ArrayList
+
+import scala.collection.mutable
+
+private[scalacheck] class ArrayListBuilder[T]
+  extends mutable.Builder[T, util.ArrayList[T]] {
+  val al = new ArrayList[T]
+  def addOne(x: T) = {
+    al.add(x)
+    this
+  }
+  def clear() = al.clear()
+  def result() = al
+}