Simplify specifying Scala version for tests

Author: dwijnand

.github/workflows/ci.yml

@@ -1,5 +1,3 @@
-name: CI
-
 on:
   pull_request:
   push:
@@ -31,13 +29,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: olafurpg/setup-scala@v13
       - uses: coursier/cache-action@v6
-      - run: |
-          case ${{ matrix.scala }} in
-            2.11) sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -211" ;;
-            2.12) sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -212" ;;
-            2.13) sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -213" ;;
-               3) sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -3"   ;;
-          esac
+      - run: sbt "functional-tests/runMain com.typesafe.tools.mima.lib.UnitTests -${{ matrix.scala }}"
   testScripted:
     needs: build
     strategy:

.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/TestCli.scala

@@ -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))