Merge pull request #1358 from romanowski/fix-lazy-vals

Compile runners with 3.0.2

Author: wleczny

build.sc

@@ -47,8 +47,8 @@ object scalaparse     extends ScalaParse
 object directives     extends Directives
 object core           extends Core
 object `build-module` extends Build
-object runner         extends Cross[Runner](Scala.all: _*)
-object `test-runner`  extends Cross[TestRunner](Scala.all: _*)
+object runner         extends Cross[Runner](Scala.runnerScalaVersions: _*)
+object `test-runner`  extends Cross[TestRunner](Scala.runnerScalaVersions: _*)
 object `bloop-rifle`  extends Cross[BloopRifle](Scala.all: _*)
 object `tasty-lib`    extends Cross[TastyLib](Scala.all: _*)
 // Runtime classes used within native image on Scala 3 replacing runtime from Scala
@@ -298,16 +298,16 @@ trait Core extends ScalaCliSbtModule with ScalaCliPublishModule with HasTests
   def constantsFile = T.persistent {
     val dir  = T.dest / "constants"
     val dest = dir / "Constants.scala"
-    val testRunnerMainClass = `test-runner`(Scala.defaultInternal)
+    val testRunnerMainClass = `test-runner`(Scala.runnerScala3)
       .mainClass()
       .getOrElse(sys.error("No main class defined for test-runner"))
-    val runnerMainClass = runner(Scala.defaultInternal)
+    val runnerMainClass = runner(Scala.runnerScala3)
       .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`(Scala.defaultInternal)
+    val testRunnerOrganization = `test-runner`(Scala.runnerScala3)
       .pomSettings()
       .organization
     val code =
@@ -331,13 +331,13 @@ trait Core extends ScalaCliSbtModule with ScalaCliPublishModule with HasTests
          |  def stubsVersion = "${stubs.publishVersion()}"
          |
          |  def testRunnerOrganization = "$testRunnerOrganization"
-         |  def testRunnerModuleName = "${`test-runner`(Scala.defaultInternal).artifactName()}"
-         |  def testRunnerVersion = "${`test-runner`(Scala.defaultInternal).publishVersion()}"
+         |  def testRunnerModuleName = "${`test-runner`(Scala.runnerScala3).artifactName()}"
+         |  def testRunnerVersion = "${`test-runner`(Scala.runnerScala3).publishVersion()}"
          |  def testRunnerMainClass = "$testRunnerMainClass"
          |
-         |  def runnerOrganization = "${runner(Scala.defaultInternal).pomSettings().organization}"
-         |  def runnerModuleName = "${runner(Scala.defaultInternal).artifactName()}"
-         |  def runnerVersion = "${runner(Scala.defaultInternal).publishVersion()}"
+         |  def runnerOrganization = "${runner(Scala.runnerScala3).pomSettings().organization}"
+         |  def runnerModuleName = "${runner(Scala.runnerScala3).artifactName()}"
+         |  def runnerVersion = "${runner(Scala.runnerScala3).publishVersion()}"
          |  def runnerMainClass = "$runnerMainClass"
          |
          |  def semanticDbPluginOrganization = "${Deps.scalametaTrees.dep.module.organization.value}"
@@ -527,7 +527,7 @@ trait Build extends ScalaCliSbtModule with ScalaCliPublishModule with HasTests
     scalaparse,
     directives,
     `scala-cli-bsp`,
-    `test-runner`(scalaVer),
+    `test-runner`(Scala.scala213), // Depending on version compiled with Scala 3 pulls older stdlib
     `tasty-lib`(scalaVer)
   )
   def scalacOptions = T {
@@ -668,8 +668,7 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
   def moduleDeps = Seq(
     `build-module`,
     `cli-options`,
-    `test-runner`(myScalaVersion),
-    `scala3-graal`(myScalaVersion)
+    `scala3-graal`(Scala.scala3)
   )
 
   def repositories = super.repositories ++ customRepositories
@@ -1071,12 +1070,12 @@ object `local-repo` extends LocalRepo {
       stubs
     )
     val crossModules = for {
-      sv   <- Scala.all
+      sv   <- Scala.runnerScalaVersions
       proj <- Seq(runner, `test-runner`)
     } yield proj(sv)
     javaModules ++ crossModules
   }
-  def version = runner(Scala.defaultInternal).publishVersion()
+  def version = runner(Scala.runnerScala3).publishVersion()
 }
 
 // Helper CI commands

modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala

@@ -2219,6 +2219,23 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
     }
   }
 
+  if (actualScalaVersion.startsWith("3"))
+    test("should throw exception for code compiled by scala 3.1.3") {
+      val exceptionMsg = "Throw exception in Scala"
+      val inputs = TestInputs(
+        os.rel / "hello.sc" ->
+          s"""//> using scala "3.1.3"
+             |throw new Exception("$exceptionMsg")""".stripMargin
+      )
+
+      inputs.fromRoot { root =>
+        val res =
+          os.proc(TestUtil.cli, "hello.sc").call(cwd = root, mergeErrIntoOut = true, check = false)
+        val output = res.out.trim()
+        expect(output.contains(exceptionMsg))
+      }
+    }
+
   private def maybeScalapyPrefix =
     if (actualScalaVersion.startsWith("2.13.")) ""
     else "import me.shadaj.scalapy.py" + System.lineSeparator()

project/deps.sc

@@ -6,10 +6,12 @@ import scala.util.Properties
 object Scala {
   def scala212     = "2.12.16"
   def scala213     = "2.13.8"
+  def runnerScala3 = "3.0.2" // the newest version that is compatible with all Scala 3.x versions
   def scala3       = "3.2.0"
   val allScala2    = Seq(scala213, scala212)
   val all          = allScala2 ++ Seq(scala3)
   val mainVersions = Seq(scala3, scala213)
+  val runnerScalaVersions = runnerScala3 +: allScala2
 
   def scalaJs = "1.10.1"