Skip to content

Commit 05eaedd

Browse files
committed
Cross compile scala3-graal-processor on Scala 3 LTS & Next
1 parent ce36200 commit 05eaedd

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

build.sc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ object `scala3-runtime` extends Cross[Scala3Runtime](Scala.allScala3)
8484
// Logic to process classes that is shared between build and the scala-cli itself
8585
object `scala3-graal` extends Cross[Scala3Graal](Scala.mainVersions)
8686
// 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)
8888

8989
object `scala-cli-bsp` extends JavaModule with ScalaCliPublishModule {
9090
def ivyDeps = super.ivyDeps() ++ Seq(
@@ -612,9 +612,8 @@ trait Scala3Graal extends ScalaCliCrossSbtModule
612612
}
613613
}
614614

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))
618617
def finalMainClass = "scala.cli.graal.CoursierCacheProcessor"
619618
}
620619

@@ -855,8 +854,8 @@ trait Cli extends CrossSbtModule with ProtoBuildModule with CliLaunchers
855854
val cache = T.dest / "native-cp"
856855
// `scala3-graal-processor`.run() do not give me output and I cannot pass dynamically computed values like classpath
857856
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),
860859
mainArgs = Seq(cache.toNIO.toString, classpath),
861860
workingDir = os.pwd
862861
)

0 commit comments

Comments
 (0)