Merge pull request #275 from SethTisue/version-bumps

bump some versions (Scala, MiMa)

Author: SethTisue

.travis.yml

@@ -6,8 +6,8 @@ language: scala
 
 scala:
   - 2.11.12
-  - 2.12.8
-  - 2.13.0
+  - 2.12.10
+  - 2.13.1
 
 env:
   - SCALAJS_VERSION=          ADOPTOPENJDK=8
@@ -22,15 +22,15 @@ matrix:
   include:
 
     # run migration test
-    - scala: 2.12.8
+    - scala: 2.12.10
       env: TEST_SCALAFIX=true           ADOPTOPENJDK=8
 
     # run binary compatibility test
-    - scala: 2.12.8
+    - scala: 2.12.10
       env: TEST_BINARY_COMPAT=true      ADOPTOPENJDK=8
 
     # run scalafmt
-    - scala: 2.12.8
+    - scala: 2.12.10
       env: TEST_SCALAFMT=true           ADOPTOPENJDK=8
 
     # Scala Native includes

README.md

@@ -39,7 +39,7 @@ The library also adds backported versions of new collection types, currently `sc
 
 ## Migration Tool
 
-The migration rules use scalafix. Please see the [official installation instruction](https://scalacenter.github.io/scalafix/docs/users/installation.html) and, in particular, check that your full Scala version is supported (ex 2.12.8).
+The migration rules use scalafix. Please see the [official installation instruction](https://scalacenter.github.io/scalafix/docs/users/installation.html) and, in particular, check that your full Scala version is supported (ex 2.12.10).
 
 ```scala
 // project/plugins.sbt

binary-compat/test/src/test/scala/BinaryCompaTest.scala

@@ -23,6 +23,16 @@ class BinaryCompaTest {
     Config.setup("foo", Array(oldClasspath, newClasspath))
     val mima        = new MiMaLib(Config.baseClassPath)
     val allProblems = mima.collectProblems(oldClasspath, newClasspath)
-    Assert.assertEquals(allProblems, Nil)
+    val unexpectedDescriptions =
+      allProblems.iterator
+        .map(_.description("new"))
+        .map{x => println(x); x}
+        .filterNot(_ == "static method id(scala.collection.Iterable,scala.collection.generic.CanBuildFrom)scala.collection.Iterable in class org.example.Lib has a different signature in new version, where it is <A:Ljava/lang/Object;C::Lscala/collection/Iterable<Ljava/lang/Object;>;>(TC;Lscala/collection/generic/CanBuildFrom<Lscala/runtime/Nothing$;TA;TC;>;)TC; rather than <A:Ljava/lang/Object;C::Lscala/collection/Iterable<Ljava/lang/Object;>;>(TC;Lscala/collection/generic/CanBuildFrom<TC;TA;TC;>;)TC;")
+        .filterNot(_ == "method id(scala.collection.Iterable,scala.collection.generic.CanBuildFrom)scala.collection.Iterable in object org.example.Lib has a different signature in new version, where it is <A:Ljava/lang/Object;C::Lscala/collection/Iterable<Ljava/lang/Object;>;>(TC;Lscala/collection/generic/CanBuildFrom<Lscala/runtime/Nothing$;TA;TC;>;)TC; rather than <A:Ljava/lang/Object;C::Lscala/collection/Iterable<Ljava/lang/Object;>;>(TC;Lscala/collection/generic/CanBuildFrom<TC;TA;TC;>;)TC;")
+        .toList
+    val msg =
+      unexpectedDescriptions.mkString(
+        s"The following ${allProblems.size} problems were reported but not expected:\n  - ", "\n  - ", "\n")
+    Assert.assertEquals(msg, Nil, unexpectedDescriptions)
   }
 }

build.sbt

@@ -47,8 +47,8 @@ lazy val root = project
 lazy val junit = libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
 
 lazy val scala211 = "2.11.12"
-lazy val scala212 = "2.12.8"
-lazy val scala213 = "2.13.0"
+lazy val scala212 = "2.12.10"
+lazy val scala213 = "2.13.1"
 
 /** Create an OSGi version range for standard Scala versioning
  * schemes that describes binary compatible versions. */
@@ -139,7 +139,7 @@ lazy val `binary-compat` = project
   .settings(commonSettings)
   .settings(
     scalaVersion := scala212,
-    libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.3.0" % Test,
+    libraryDependencies += "com.typesafe" %% "mima-core" % "0.6.1" % Test,
     junit,
     buildInfoPackage := "build",
     buildInfoKeys := Seq[BuildInfoKey](

project/MultiScalaProject.scala

@@ -22,7 +22,7 @@ import java.io.File
  *
  * // instanciate a sbt project
  * lazy val myProject211 = myProject("2.11.12", _.settings(...) /* scala version dependent configurations */)
- * lazy val myProject212 = myProject("2.12.8" , _.settings(...))
+ * lazy val myProject212 = myProject("2.12.10" , _.settings(...))
  * // ...
  * }}}
  */