Merge pull request #3927 from Gedochao/maintenance/cross-compile-runners

Cross compile the `runner` and `test-runner` modules against Scala 3 Next versions

Author: Gedochao

build.mill.scala

@@ -104,9 +104,10 @@ object directives extends Cross[Directives](Scala.scala3MainVersions)
 object core           extends Cross[Core](Scala.scala3MainVersions) with CrossScalaDefaultToInternal
 object `build-module` extends Cross[Build](Scala.scala3MainVersions)
     with CrossScalaDefaultToInternal
-object runner        extends Runner
-object `test-runner` extends TestRunner
-object `tasty-lib`   extends Cross[TastyLib](Scala.scala3MainVersions)
+object runner        extends Cross[Runner](Scala.runnerScalaVersions) with CrossScalaDefaultToRunner
+object `test-runner` extends Cross[TestRunner](Scala.runnerScalaVersions)
+    with CrossScalaDefaultToRunner
+object `tasty-lib` extends Cross[TastyLib](Scala.scala3MainVersions)
     with CrossScalaDefaultToInternal
 // Runtime classes used within native image on Scala 3 replacing runtime from Scala
 object `scala3-runtime` extends Cross[Scala3Runtime](Scala.scala3MainVersions)
@@ -436,16 +437,16 @@ trait Core extends ScalaCliCrossSbtModule
   def constantsFile: T[PathRef] = Task(persistent = true) {
     val dir                 = Task.dest / "constants"
     val dest                = dir / "Constants.scala"
-    val testRunnerMainClass = `test-runner`
+    val testRunnerMainClass = `test-runner`(crossScalaVersion)
       .mainClass()
       .getOrElse(sys.error("No main class defined for test-runner"))
-    val runnerMainClass = build.runner
+    val runnerMainClass = build.runner(crossScalaVersion)
       .mainClass()
       .getOrElse(sys.error("No main class defined for runner"))
     val detailedVersionValue =
       if (`local-repo`.developingOnStubModules) s"""Some("${vcsState()}")"""
       else "None"
-    val testRunnerOrganization = `test-runner`
+    val testRunnerOrganization = `test-runner`(crossScalaVersion)
       .pomSettings()
       .organization
     val code =
@@ -465,13 +466,13 @@ trait Core extends ScalaCliCrossSbtModule
          |  def scalaNativeVersion = "${Deps.Versions.scalaNative}"
          |
          |  def testRunnerOrganization = "$testRunnerOrganization"
-         |  def testRunnerModuleName = "${`test-runner`.artifactName()}"
-         |  def testRunnerVersion = "${`test-runner`.publishVersion()}"
+         |  def testRunnerModuleName = "${`test-runner`(crossScalaVersion).artifactName()}"
+         |  def testRunnerVersion = "${`test-runner`(crossScalaVersion).publishVersion()}"
          |  def testRunnerMainClass = "$testRunnerMainClass"
          |
-         |  def runnerOrganization = "${build.runner.pomSettings().organization}"
-         |  def runnerModuleName = "${build.runner.artifactName()}"
-         |  def runnerVersion = "${build.runner.publishVersion()}"
+         |  def runnerOrganization = "${build.runner(crossScalaVersion).pomSettings().organization}"
+         |  def runnerModuleName = "${build.runner(crossScalaVersion).artifactName()}"
+         |  def runnerVersion = "${build.runner(crossScalaVersion).publishVersion()}"
          |  def runnerScala30LegacyVersion = "${Cli.runnerScala30LegacyVersion}"
          |  def runnerScala2LegacyVersion = "${Cli.runnerScala2LegacyVersion}"
          |  def runnerMainClass = "$runnerMainClass"
@@ -726,7 +727,7 @@ trait Build extends ScalaCliCrossSbtModule
     options(crossScalaVersion),
     directives(crossScalaVersion),
     `scala-cli-bsp`,
-    `test-runner`,
+    `test-runner`(crossScalaVersion),
     `tasty-lib`(crossScalaVersion)
   )
   override def scalacOptions: T[Seq[String]] = Task {
@@ -1258,33 +1259,24 @@ trait CliIntegrationDocker extends SbtModule with ScalaCliPublishModule with Has
   )
 }
 
-trait Runner extends SbtModule
+trait Runner extends CrossSbtModule
     with ScalaCliPublishModule
     with ScalaCliScalafixModule {
-  override def scalaVersion: T[String]       = Scala.scala3Lts
   override def scalacOptions: T[Seq[String]] = Task {
     super.scalacOptions() ++ Seq("-release", "8", "-deprecation")
   }
   override def mainClass: T[Option[String]] = Some("scala.cli.runner.Runner")
   override def sources: T[Seq[PathRef]]     = Task.Sources {
-    val scala3DirNames =
-      if (scalaVersion().startsWith("3.")) {
-        val name =
-          if (scalaVersion().contains("-RC")) "scala-3-unstable"
-          else "scala-3-stable"
-        Seq(name)
-      }
-      else
-        Nil
-    val extraDirs = scala3DirNames.map(name => PathRef(moduleDir / "src" / "main" / name))
+    val scala3DirName =
+      if (crossScalaVersion.contains("-RC")) "scala-3-unstable" else "scala-3-stable"
+    val extraDirs = Seq(PathRef(moduleDir / "src" / "main" / scala3DirName))
     super.sources() ++ extraDirs
   }
 }
 
-trait TestRunner extends SbtModule
+trait TestRunner extends CrossSbtModule
     with ScalaCliPublishModule
     with ScalaCliScalafixModule {
-  override def scalaVersion: T[String]       = Scala.scala3Lts
   override def scalacOptions: T[Seq[String]] = Task {
     super.scalacOptions() ++ Seq("-release", "8", "-deprecation")
   }
@@ -1328,9 +1320,10 @@ object `local-repo` extends LocalRepo {
    */
   def developingOnStubModules = false
 
-  override def stubsModules: Seq[PublishLocalNoFluff] = Seq(runner, `test-runner`)
+  override def stubsModules: Seq[PublishLocalNoFluff] =
+    Seq(runner(Scala.runnerScala3), `test-runner`(Scala.runnerScala3))
 
-  override def version: T[String] = runner.publishVersion()
+  override def version: T[String] = runner(Scala.runnerScala3).publishVersion()
 }
 
 // Helper CI commands

project/deps/package.mill.scala

@@ -32,7 +32,7 @@ object Scala {
   val allScala3           = Seq(scala3Lts, scala3Next, scala3NextAnnounced, scala3NextRc).distinct
   val all                 = (allScala2 ++ allScala3 ++ defaults).distinct
   val scala3MainVersions  = (defaults ++ allScala3).distinct
-  val runnerScalaVersions = Seq(runnerScala3, scala213)
+  val runnerScalaVersions = (Seq(runnerScala3) ++ scala3MainVersions).distinct
 
   def scalaJs    = "1.20.1"
   def scalaJsCli = scalaJs // this must be compatible with the Scala.js version