Simplify Mill cross-build to only include major version

This simplifies commands from, e.g. `mill chisel[2.13.18].compile` to
just `mill chisel[2.13].compile`. This makes it such that we no longer
have to change CI and documentation whenever we add support for a new
minor version of Scala.

Author: jackkoenig

benchmark/package.mill

@@ -8,8 +8,8 @@ import mill.contrib.jmh.JmhModule
 import build._
 
 object `package` extends ScalaModule with JmhModule with ScalafmtModule {
-  def scalaVersion = v.scalaVersion
+  def scalaVersion = v.defaultScalaVersion
   def jmhCoreVersion = v.jmhVersion
 
-  override def moduleDeps = Seq(chisel(v.scalaVersion))
+  override def moduleDeps = Seq(chisel(v.defaultScalaVersion))
 }

build.mill

@@ -14,6 +14,12 @@ import mill.scalalib.scalafmt._
 
 object v extends Module {
 
+  // Add support for later Scala 2.13 by bumping this.
+  val scala213MinorVersion: Int = 18
+
+  // Bump Scala 3 version by bumping this.
+  val scala3MinorVersion: String = "3.4"
+
   val javaVersion = {
     val rawVersion = sys.props("java.specification.version")
     // Older versions of Java started with 1., e.g. 1.8 == 8
@@ -32,20 +38,21 @@ object v extends Module {
   // Only publish plugin for 2.13.11+ when using Java > 11, but still
   // publish all versions when Java version <= 11.
   val pluginScalaCrossVersions = {
-    val latest213 = 18
     val java21Min213 = 11
     val minVersion = if (javaVersion > 11) java21Min213 else 0
-    val versions = minVersion to latest213
+    val versions = minVersion to scala213MinorVersion
     val versionSeq = versions.map(v => s"2.13.$v").toSeq
-    versionSeq ++ Seq("3.3.4")
+    versionSeq :+ scalaCrossToVersion("3")
   }
 
-  val scalaCrossVersions = Seq(
-    "2.13.18",
-    "3.3.4"
-  )
+  val scalaCrossVersions = Seq("2.13", "3")
+
+  def scalaCrossToVersion(major: String): String = major match {
+    case "2.13" => s"2.13.$scala213MinorVersion"
+    case "3"    => s"3.$scala3MinorVersion"
+  }
 
-  def isScala3(ver: String): Boolean = ver.startsWith("3.")
+  def isScala3(ver: String): Boolean = ver.startsWith("3")
 
   def buildUnits(): Seq[ScalaModule] = {
     scalaCrossVersions.flatMap { ver =>
@@ -68,7 +75,10 @@ object v extends Module {
     }
   }
 
-  val scalaVersion = scalaCrossVersions.head
+  def defaultCrossVersion = scalaCrossVersions.head
+
+  def defaultScalaVersion = scalaCrossToVersion(defaultCrossVersion)
+
   val jmhVersion = "1.37"
   val osLib = mvn"com.lihaoyi::os-lib:0.10.7" // 0.11 requires Java 11
   val upickle = mvn"com.lihaoyi::upickle:3.3.1" // upickle 4.0 requires Scala 3.4 (we target Scala 3.3 LTS)
@@ -329,10 +339,12 @@ trait HasPanamaConverterModule extends ScalaModule with HasCIRCTPanamaBindingMod
 object chisel extends Cross[Chisel](v.scalaCrossVersions)
 
 trait Chisel extends CrossSbtModule with HasScala2MacroAnno with HasScalaPlugin with ScalafmtModule {
+  def scalaVersion = v.scalaCrossToVersion(crossScalaVersion)
+
   override def moduleDir = super.moduleDir / os.up
   def svsimModule = svsim.cross(crossScalaVersion)
   def coreModule = core.cross(crossScalaVersion)
-  def pluginModule = plugin.cross()
+  def pluginModule = plugin.cross(v.scalaCrossToVersion(crossScalaVersion))
 
   override def scalacOptions = Task {
     if (v.isScala3(crossScalaVersion)) {

core/package.mill

@@ -13,7 +13,7 @@ object `package` extends Module {
 }
 
 trait Core extends CrossSbtModule with HasScala2MacroAnno with HasCommonOptions with ScalafmtModule {
-  def scalaVersion = crossScalaVersion
+  def scalaVersion = v.scalaCrossToVersion(crossScalaVersion)
 
   def moduleDir = super.moduleDir / os.up
 

docs/package.mill

@@ -13,10 +13,10 @@ import build._
 /** MDoc project */
 object `package` extends SbtModule with HasScalaPlugin with HasCommonOptions {
 
-  override def scalaVersion = v.scalaVersion
+  override def scalaVersion = v.defaultScalaVersion
 
   // This not really a CrossModule but HasScala2Plugin and HasCommonOptions require it
-  override def crossValue = v.scalaVersion
+  override def crossValue = v.scalaCrossVersions.head
 
   def pluginModule = plugin.cross()
 
@@ -25,7 +25,7 @@ object `package` extends SbtModule with HasScalaPlugin with HasCommonOptions {
 
   override def mvnDeps = Task { Seq(v.mdoc, v.scalatest) }
 
-  override def moduleDeps = Seq(chisel(v.scalaVersion))
+  override def moduleDeps = Seq(chisel(v.defaultScalaVersion))
 
   // Suppress missing interpolator warnings because mdoc appears to introduce them.
   override def extraWarnConf = Seq("msg=possible missing interpolator:s")

firrtl/package.mill

@@ -18,7 +18,7 @@ trait Firrtl
     with HasScala2MacroAnno
     with HasCommonOptions
     with ScalafmtModule {
-  def scalaVersion = crossScalaVersion
+  def scalaVersion = v.scalaCrossToVersion(crossScalaVersion)
 
   def moduleDir = super.moduleDir / os.up
 

macros/package.mill

@@ -13,6 +13,8 @@ object `package` extends Module {
 }
 
 trait Macros extends CrossSbtModule with HasScala2MacroAnno with HasCommonOptions with ScalafmtModule {
+  def scalaVersion = v.scalaCrossToVersion(crossScalaVersion)
+
   def moduleDir = super.moduleDir / os.up
 
   override def mvnDeps =

release.mill

@@ -36,7 +36,7 @@ trait ChiselPublishModule extends SonatypeCentralPublishModule {
   */
 trait Unipublish extends ScalaModule with ChiselPublishModule with Mima {
 
-  def scalaVersion = v.scalaVersion
+  def scalaVersion = v.defaultScalaVersion
 
   /** Is this a SNAPSHOT release?  */
   def isSnapshot = Task { publishVersion().endsWith("-SNAPSHOT") }
@@ -69,12 +69,12 @@ trait Unipublish extends ScalaModule with ChiselPublishModule with Mima {
     transitive:   Boolean = false
   ) = Task.Command {
     // TODO consider making this parallel and publishing all cross-versions for plugin
-    plugin.cross(v.scalaVersion).publishLocal(localMvnRepo, sources, doc, transitive)()
+    plugin.cross(v.defaultScalaVersion).publishLocal(localMvnRepo, sources, doc, transitive)()
     super.publishLocal(localMvnRepo, sources, doc, transitive)()
   }
 
   // Explicitly not using moduleDeps because that influences so many things
-  def components = Seq(firrtl.cross, svsim.cross, macros.cross, core.cross, chisel).map(_(v.scalaVersion))
+  def components = Seq(firrtl.cross, svsim.cross, macros.cross, core.cross, chisel).map(_(v.defaultCrossVersion))
 
   /** Aggregated mvn deps to include as dependencies in POM */
   def mvnDeps = Task { Task.traverse(components)(_.mvnDeps)().flatten }

svsim/package.mill

@@ -13,6 +13,8 @@ object `package` extends Module {
 }
 
 trait Svsim extends CrossSbtModule with HasCommonOptions with ScalafmtModule {
+  def scalaVersion = v.scalaCrossToVersion(crossScalaVersion)
+
   def moduleDir = super.moduleDir / os.up
 
   override def scalacOptions = Task {