Merge pull request #650 from dwijnand/scala-3.0.1

Author: dwijnand

.github/workflows/ci.yml

@@ -0,0 +1,44 @@
+on:
+  pull_request:
+  push:
+    branches: ['main']
+    tags: ['v[0-9]']
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [adopt@1.8, adopt@1.11]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: olafurpg/setup-scala@v13
+        with:
+          java-version: ${{ matrix.java }}
+      - uses: coursier/cache-action@v6
+      - run: "sbt test mimaReportBinaryIssues 'set sbtplugin/scriptedSbt := \"1.2.8\"' 'scripted sbt-mima-plugin/minimal' IntegrationTest/test"
+  testFunctional:
+    needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        scala: [2.11, 2.12, 2.13, 3]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: olafurpg/setup-scala@v13
+      - uses: coursier/cache-action@v6
+      - run: sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -${{ matrix.scala }}"
+  testScripted:
+    needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        scripted: [1of2, 2of2]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: olafurpg/setup-scala@v13
+      - uses: coursier/cache-action@v6
+      - run: sbt "scripted sbt-mima-plugin/*${{ matrix.scripted }}"

.travis.yml

@@ -14,10 +14,10 @@ jdk:
 
 jobs:
   include:
-  - { name: testFunctional 2.11, script: sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -211" }
-  - { name: testFunctional 2.12, script: sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -212" }
-  - { name: testFunctional 2.13, script: sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -213" }
-  - { name: testFunctional 3,    script: sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -3"   }
+  - { name: testFunctional 2.11, script: sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -2.11" }
+  - { name: testFunctional 2.12, script: sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -2.12" }
+  - { name: testFunctional 2.13, script: sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -2.13" }
+  - { name: testFunctional 3,    script: sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -3"    }
   - { name: scripted 1/2, script: sbt "scripted sbt-mima-plugin/*1of2" }
   - { name: scripted 2/2, script: sbt "scripted sbt-mima-plugin/*2of2" }
 

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

@@ -9,7 +9,7 @@ import coursier._
 final class ScalaCompiler(val version: String) {
   val isScala3 = version.startsWith("3.")
 
-  val name = if (isScala3) ModuleName(s"scala3-compiler_$version") else name"scala-compiler"
+  val name = if (isScala3) ModuleName(s"scala3-compiler_3") else name"scala-compiler"
   val jars = Coursier.fetch(Dependency(Module(org"org.scala-lang", name), version))
 
   val classLoader = new URLClassLoader(jars.toArray.map(_.toURI.toURL), parentClassLoader())

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

@@ -11,7 +11,7 @@ object TestCli {
   val scala211 = "2.11.12"
   val scala212 = "2.12.14"
   val scala213 = "2.13.6"
-  val scala3   = "3.0.0-RC3"
+  val scala3   = "3.0.1"
   val hostScalaVersion = StdLibProps.scalaPropOrNone("maven.version.number").get
   val allScalaVersions = List(scala211, scala212, scala213, scala3)
   val testsDir = Directory("functional-tests/src/test")
@@ -52,9 +52,9 @@ object TestCli {
 
   @tailrec private def readArgs(args: List[String], conf: Conf): Conf = args match {
     case "-3"   :: xs                  => readArgs(xs, conf.copy(scalaVersions = scala3   :: conf.scalaVersions))
-    case "-213" :: xs                  => readArgs(xs, conf.copy(scalaVersions = scala213 :: conf.scalaVersions))
-    case "-212" :: xs                  => readArgs(xs, conf.copy(scalaVersions = scala212 :: conf.scalaVersions))
-    case "-211" :: xs                  => readArgs(xs, conf.copy(scalaVersions = scala211 :: 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 "--cross" :: xs               => readArgs(xs, conf.copy(scalaVersions = allScalaVersions))
     case s :: xs                       => readArgs(xs, conf.copy(dirs = testDirs(s) ::: conf.dirs))

sbtplugin/src/sbt-test/sbt-mima-plugin/scala-3/build.sbt

@@ -1,5 +1,5 @@
 ThisBuild / organization := "com.example"
-ThisBuild / scalaVersion := "3.0.0-RC3"
+ThisBuild / scalaVersion := "3.0.1"
 
 val `v1-0-0` =
   project.settings(