Skip to content

Commit a95cd60

Browse files
Adapt to scala-js-cli
1 parent dc75f8d commit a95cd60

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

build.sc

+14-11
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,47 @@ import io.github.alexarchambault.millnativeimage.upload.Upload
88
import mill._
99
import mill.scalalib._
1010

11-
def scalafmtVersion = "3.4.3"
11+
def scalaJsCliVersion = "1.1.1-sc1"
1212

13-
trait ScalafmtNativeImage extends ScalaModule with NativeImage {
13+
trait ScalaJsCliNativeImage extends ScalaModule with NativeImage {
1414
def scalaVersion = "2.13.8"
15+
def scalaJsVersion = "1.9.0"
1516

1617
def nativeImageClassPath = T{
1718
runClasspath()
1819
}
1920
def nativeImageOptions = T{
2021
super.nativeImageOptions() ++ Seq(
21-
"--no-fallback"
22+
"--no-fallback",
23+
"-H:IncludeResources=org/scalajs/linker/backend/emitter/.*.sjsir"
2224
)
2325
}
2426
def nativeImagePersist = System.getenv("CI") != null
2527
def nativeImageGraalVmJvmId = "graalvm-java17:22.0.0"
26-
def nativeImageName = "scalafmt"
28+
def nativeImageName = "scala-js-ld"
2729
def ivyDeps = super.ivyDeps() ++ Seq(
28-
ivy"org.scalameta::scalafmt-cli:$scalafmtVersion"
30+
ivy"io.github.alexarchambault.tmp::scalajs-cli:$scalaJsCliVersion",
31+
ivy"org.scala-js::scalajs-linker:$scalaJsVersion"
2932
)
30-
def nativeImageMainClass = "org.scalafmt.cli.Cli"
33+
def nativeImageMainClass = "org.scalajs.cli.Scalajsld"
3134

3235
def nameSuffix = ""
3336
def copyToArtifacts(directory: String = "artifacts/") = T.command {
3437
val _ = Upload.copyLauncher(
3538
nativeImage().path,
3639
directory,
37-
"scalafmt",
40+
s"scala-js-ld-$scalaJsVersion",
3841
compress = true,
3942
suffix = nameSuffix
4043
)
4144
}
4245
}
4346

44-
object native extends ScalafmtNativeImage
47+
object native extends ScalaJsCliNativeImage
4548

4649
def csDockerVersion = "2.1.0-M5-18-gfebf9838c"
4750

48-
object `native-static` extends ScalafmtNativeImage {
51+
object `native-static` extends ScalaJsCliNativeImage {
4952
def nameSuffix = "-static"
5053
def buildHelperImage = T {
5154
os.proc("docker", "build", "-t", "scala-cli-base-musl:latest", ".")
@@ -67,7 +70,7 @@ object `native-static` extends ScalafmtNativeImage {
6770
}
6871
}
6972

70-
object `native-mostly-static` extends ScalafmtNativeImage {
73+
object `native-mostly-static` extends ScalaJsCliNativeImage {
7174
def nameSuffix = "-mostly-static"
7275
def nativeImageDockerParams = Some(
7376
NativeImage.linuxMostlyStaticParams(
@@ -114,5 +117,5 @@ def upload(directory: String = "artifacts/") = T.command {
114117
if (version.endsWith("-SNAPSHOT")) ("launchers", true)
115118
else ("v" + version, false)
116119

117-
Upload.upload("scala-cli", "scalafmt-native-image", ghToken, tag, dryRun = false, overwrite = overwriteAssets)(launchers: _*)
120+
Upload.upload("scala-cli", "scala-js-cli-native-image", ghToken, tag, dryRun = false, overwrite = overwriteAssets)(launchers: _*)
118121
}

0 commit comments

Comments
 (0)