Merge pull request #665 from dwijnand/versions

Author: dwijnand

build.sbt

@@ -11,6 +11,7 @@ inThisBuild(Seq(
   ),
   scmInfo := Some(ScmInfo(url("https://github.com/lightbend/mima"), "scm:git:git@github.com:lightbend/mima.git")),
   dynverVTagPrefix := false,
+  scalaVersion := scala212,
   scalacOptions ++= Seq("-feature", "-Xsource:3", "-Xlint", "-Wconf:cat=deprecation&msg=Stream|JavaConverters:s"),
   resolvers ++= (if (isStaging) List(stagingResolver) else Nil),
   publishTo := Some(if (isSnapshot.value) Opts.resolver.sonatypeSnapshots else Opts.resolver.sonatypeStaging),
@@ -25,6 +26,8 @@ commands += Command.command("testStaging") { state =>
   prep ::: "mimaReportBinaryIssues" :: state
 }
 
+// Keep in sync with TestCli
+val scala212 = "2.12.15"
 val scala213 = "2.13.6"
 val scala3 = "3.0.2"
 

functional-tests/src/main/scala/com/typesafe/tools/mima/lib/TestCli.scala

@@ -8,10 +8,11 @@ import scala.util.Try
 import scala.util.{ Properties => StdLibProps }
 
 object TestCli {
+  // Keep in sync with build.sbt
   val scala211 = "2.11.12"
   val scala212 = "2.12.15"
   val scala213 = "2.13.6"
-  val scala3   = "3.0.1"
+  val scala3   = "3.0.2"
   val hostScalaVersion = StdLibProps.scalaPropOrNone("maven.version.number").get
   val allScalaVersions = List(scala211, scala212, scala213, scala3)
   val testsDir = Directory("functional-tests/src/test")
@@ -51,11 +52,11 @@ object TestCli {
   final case class Conf(scalaVersions: List[String], dirs: List[Directory])
 
   @tailrec private def readArgs(args: List[String], conf: Conf): Conf = args match {
-    case "-3"   :: xs                  => readArgs(xs, conf.copy(scalaVersions = scala3   :: conf.scalaVersions))
-    case "-2.13" :: xs                 => readArgs(xs, conf.copy(scalaVersions = scala213 :: conf.scalaVersions))
-    case "-2.12" :: xs                 => readArgs(xs, conf.copy(scalaVersions = scala212 :: conf.scalaVersions))
-    case "-2.11" :: xs                 => readArgs(xs, conf.copy(scalaVersions = scala211 :: conf.scalaVersions))
-    case "--scala-version" :: sv :: xs => readArgs(xs, conf.copy(scalaVersions = sv       :: conf.scalaVersions))
+    case "-3"   :: xs                  => readArgs(xs, conf.copy(scalaVersions = conf.scalaVersions :+ scala3  ))
+    case "-2.13" :: xs                 => readArgs(xs, conf.copy(scalaVersions = conf.scalaVersions :+ scala213))
+    case "-2.12" :: xs                 => readArgs(xs, conf.copy(scalaVersions = conf.scalaVersions :+ scala212))
+    case "-2.11" :: xs                 => readArgs(xs, conf.copy(scalaVersions = conf.scalaVersions :+ scala211))
+    case "--scala-version" :: sv :: xs => readArgs(xs, conf.copy(scalaVersions = conf.scalaVersions :+ sv      ))
     case "--cross" :: xs               => readArgs(xs, conf.copy(scalaVersions = allScalaVersions))
     case s :: xs                       => readArgs(xs, conf.copy(dirs = testDirs(s) ::: conf.dirs))
     case Nil                           => conf