@@ -84,7 +84,7 @@ object `scala3-runtime` extends Cross[Scala3Runtime](Scala.allScala3)
84
84
// Logic to process classes that is shared between build and the scala-cli itself
85
85
object `scala3-graal` extends Cross [Scala3Graal ](Scala .mainVersions)
86
86
// Main app used to process classpath within build itself
87
- object `scala3-graal-processor` extends Scala3GraalProcessor
87
+ object `scala3-graal-processor` extends Cross [ Scala3GraalProcessor ]( Scala .allScala3)
88
88
89
89
object `scala-cli-bsp` extends JavaModule with ScalaCliPublishModule {
90
90
def ivyDeps = super .ivyDeps() ++ Seq (
@@ -612,9 +612,8 @@ trait Scala3Graal extends ScalaCliCrossSbtModule
612
612
}
613
613
}
614
614
615
- trait Scala3GraalProcessor extends ScalaModule with ScalaCliPublishModule {
616
- def moduleDeps = Seq (`scala3-graal`(Scala .defaultInternal))
617
- def scalaVersion = Scala .defaultInternal
615
+ trait Scala3GraalProcessor extends CrossScalaModule with ScalaCliPublishModule {
616
+ def moduleDeps = Seq (`scala3-graal`(crossScalaVersion))
618
617
def finalMainClass = " scala.cli.graal.CoursierCacheProcessor"
619
618
}
620
619
@@ -855,8 +854,8 @@ trait Cli extends CrossSbtModule with ProtoBuildModule with CliLaunchers
855
854
val cache = T .dest / " native-cp"
856
855
// `scala3-graal-processor`.run() do not give me output and I cannot pass dynamically computed values like classpath
857
856
val res = mill.util.Jvm .callSubprocess(
858
- mainClass = `scala3-graal-processor`.finalMainClass(),
859
- classPath = `scala3-graal-processor`.runClasspath().map(_.path),
857
+ mainClass = `scala3-graal-processor`(crossScalaVersion) .finalMainClass(),
858
+ classPath = `scala3-graal-processor`(crossScalaVersion) .runClasspath().map(_.path),
860
859
mainArgs = Seq (cache.toNIO.toString, classpath),
861
860
workingDir = os.pwd
862
861
)
0 commit comments