@@ -99,7 +99,7 @@ object runner extends Cross[Runner](Scala.runnerScalaVersions)
99
99
object `test-runner` extends Cross [TestRunner ](Scala .testRunnerScalaVersions)
100
100
object `tasty-lib` extends Cross [TastyLib ](Scala .all)
101
101
// Runtime classes used within native image on Scala 3 replacing runtime from Scala
102
- object `scala3-runtime` extends Scala3Runtime
102
+ object `scala3-runtime` extends Cross [ Scala3Runtime ]( Scala .allScala3)
103
103
// Logic to process classes that is shared between build and the scala-cli itself
104
104
object `scala3-graal` extends Cross [Scala3Graal ](Scala .mainVersions)
105
105
// Main app used to process classpath within build itself
@@ -605,9 +605,9 @@ trait Options extends ScalaCliCrossSbtModule with ScalaCliPublishModule with Has
605
605
}
606
606
}
607
607
608
- trait Scala3Runtime extends SbtModule with ScalaCliPublishModule {
609
- def ivyDeps = super .ivyDeps()
610
- def scalaVersion = Scala .defaultInternal
608
+ trait Scala3Runtime extends CrossSbtModule with ScalaCliPublishModule {
609
+ def crossScalaVersion = crossValue
610
+ def ivyDeps = super .ivyDeps()
611
611
}
612
612
613
613
trait Scala3Graal extends ScalaCliCrossSbtModule
@@ -623,7 +623,7 @@ trait Scala3Graal extends ScalaCliCrossSbtModule
623
623
// scala3RuntimeFixes.jar is also used within
624
624
// resource-config.json and BytecodeProcessor.scala
625
625
os.copy.over(
626
- `scala3-runtime`.jar().path,
626
+ `scala3-runtime`(crossScalaVersion) .jar().path,
627
627
extraResourceDir / " scala3RuntimeFixes.jar" ,
628
628
createFolders = true
629
629
)
0 commit comments