wip

Author: SethTisue

build.sbt

@@ -333,7 +333,7 @@ lazy val scalafixTests = project
   .enablePlugins(BuildInfoPlugin, ScalafixTestkitPlugin)
 
 val ciScalaVersion = sys.env.get("CI_SCALA_VERSION").flatMap(Version.parse)
-val ciPlatform     = sys.env.get("CI_PLATFORM")
+val ciPlatform     = sys.env.get("CI_PLATFORM").map(p => if (p == "JVM") "" else p)
 val isScalafix     = sys.env.get("CI_MODE") == Some("testScalafix")
 val isScalafmt     = sys.env.get("CI_MODE") == Some("testScalafmt")
 val isBinaryCompat = sys.env.get("CI_MODE") == Some("testBinaryCompat")

project/MultiScalaProject.scala

@@ -30,7 +30,10 @@ import java.io.File
 trait MultiScala {
   def majorMinor(in: String): String = {
     val Array(major, minor, _) = in.split("\\.")
-    major + minor
+    if (major == "2")
+      s"$major$minor"
+    else
+      major
   }
 
   def projectIdPerScala(name: String, scalaV: String): String = s"$name${majorMinor(scalaV)}"

project/Version.scala

@@ -7,13 +7,13 @@ object Version {
   def parse(raw: String): Option[String] = {
     raw match {
       case versionRegex0(major, minor, _) =>
-        Some(s"${major.toInt}{minor.toInt}")
+        Some(s"${major.toInt}${minor.toInt}")
       case versionRegex1(major, minor, _, _) =>
-        Some(s"${major.toInt}{minor.toInt}")
+        Some(s"${major.toInt}${minor.toInt}")
       case versionRegex2(major, "x") =>
         Some(s"${major.toInt}")
       case versionRegex2(major, minor) =>
-        Some(s"${major.toInt}{minor.toInt}")
+        Some(s"${major.toInt}${minor.toInt}")
       case _ =>
         None
     }