wip

Author: SethTisue

build.sbt

@@ -30,9 +30,9 @@ lazy val root = project
     compat213JVM,
     compat213JS,
     compat213Native,
-    compat31JVM,
-    compat31JS,
-    compat31Native,
+    compat3JVM,
+    compat3JS,
+    compat3Native,
     scalafixData211,
     scalafixData212,
     scalafixData213,
@@ -157,7 +157,7 @@ lazy val compat = new MultiScalaCrossProject(
 val compat211 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala211)
 val compat212 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala212)
 val compat213 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala213)
-val compat31  = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala3)
+val compat3   = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala3)
 
 lazy val compat211JVM    = compat211.jvm
 lazy val compat211JS     = compat211.js
@@ -168,9 +168,9 @@ lazy val compat212Native = compat212.native
 lazy val compat213JVM    = compat213.jvm
 lazy val compat213JS     = compat213.js
 lazy val compat213Native = compat213.native
-lazy val compat31JVM     = compat31.jvm
-lazy val compat31JS      = compat31.js
-lazy val compat31Native  = compat31.native
+lazy val compat3JVM      = compat3.jvm
+lazy val compat3JS       = compat3.js
+lazy val compat3Native   = compat3.native
 
 lazy val binaryCompatOld = project
   .in(file("binary-compat/old"))

project/Version.scala

@@ -1,24 +1,19 @@
-case class Version(major: Int, minor: Int) {
-  override def toString = s"${major}${minor}"
-}
-
 object Version {
   // `(#.+)?` allows republishing for a new Scala version
   // `|x` allows the sbt 1.7 style ".x" versions
   private val versionRegex0 = "v?([0-9]+)\\.([0-9]+)\\.([0-9]+|x)(?:#.+)?".r
   private val versionRegex1 = "v?([0-9]+)\\.([0-9]+)\\.([0-9]+|x)-(.+)(?:#.+)?".r
-  private val versionRegex2 = "([0-9]+)\\.([0-9]+)(?:#.+)?".r
-  private val versionRegex3 = "([0-9]+)(?:#.+)?".r
-  def parse(raw: String): Option[Version] = {
+  private val versionRegex2 = "([0-9]+)\\.([0-9]+|x)(?:#.+)?".r
+  def parse(raw: String): Option[String] = {
     raw match {
       case versionRegex0(major, minor, _) =>
-        Some(Version(major.toInt, minor.toInt))
+        Some(s"${major.toInt}{minor.toInt}")
       case versionRegex1(major, minor, _, _) =>
-        Some(Version(major.toInt, minor.toInt))
+        Some(s"${major.toInt}{minor.toInt}")
+      case versionRegex2(major, "x") =>
+        Some(s"${major.toInt}")
       case versionRegex2(major, minor) =>
-        Some(Version(major.toInt, minor.toInt))
-      case versionRegex3(major) =>
-        Some(Version(major.toInt, 0))
+        Some(s"${major.toInt}{minor.toInt}")
       case _ =>
         None
     }