@@ -8,44 +8,47 @@ import io.github.alexarchambault.millnativeimage.upload.Upload
8
8
import mill ._
9
9
import mill .scalalib ._
10
10
11
- def scalafmtVersion = " 3.4.3 "
11
+ def scalaJsCliVersion = " 1.1.1-sc1 "
12
12
13
- trait ScalafmtNativeImage extends ScalaModule with NativeImage {
13
+ trait ScalaJsCliNativeImage extends ScalaModule with NativeImage {
14
14
def scalaVersion = " 2.13.8"
15
+ def scalaJsVersion = " 1.9.0"
15
16
16
17
def nativeImageClassPath = T {
17
18
runClasspath()
18
19
}
19
20
def nativeImageOptions = T {
20
21
super .nativeImageOptions() ++ Seq (
21
- " --no-fallback"
22
+ " --no-fallback" ,
23
+ " -H:IncludeResources=org/scalajs/linker/backend/emitter/.*.sjsir"
22
24
)
23
25
}
24
26
def nativeImagePersist = System .getenv(" CI" ) != null
25
27
def nativeImageGraalVmJvmId = " graalvm-java17:22.0.0"
26
- def nativeImageName = " scalafmt "
28
+ def nativeImageName = " scala-js-ld "
27
29
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"
29
32
)
30
- def nativeImageMainClass = " org.scalafmt .cli.Cli "
33
+ def nativeImageMainClass = " org.scalajs .cli.Scalajsld "
31
34
32
35
def nameSuffix = " "
33
36
def copyToArtifacts (directory : String = " artifacts/" ) = T .command {
34
37
val _ = Upload .copyLauncher(
35
38
nativeImage().path,
36
39
directory,
37
- " scalafmt " ,
40
+ s " scala-js-ld- $scalaJsVersion " ,
38
41
compress = true ,
39
42
suffix = nameSuffix
40
43
)
41
44
}
42
45
}
43
46
44
- object native extends ScalafmtNativeImage
47
+ object native extends ScalaJsCliNativeImage
45
48
46
49
def csDockerVersion = " 2.1.0-M5-18-gfebf9838c"
47
50
48
- object `native-static` extends ScalafmtNativeImage {
51
+ object `native-static` extends ScalaJsCliNativeImage {
49
52
def nameSuffix = " -static"
50
53
def buildHelperImage = T {
51
54
os.proc(" docker" , " build" , " -t" , " scala-cli-base-musl:latest" , " ." )
@@ -67,7 +70,7 @@ object `native-static` extends ScalafmtNativeImage {
67
70
}
68
71
}
69
72
70
- object `native-mostly-static` extends ScalafmtNativeImage {
73
+ object `native-mostly-static` extends ScalaJsCliNativeImage {
71
74
def nameSuffix = " -mostly-static"
72
75
def nativeImageDockerParams = Some (
73
76
NativeImage .linuxMostlyStaticParams(
@@ -114,5 +117,5 @@ def upload(directory: String = "artifacts/") = T.command {
114
117
if (version.endsWith(" -SNAPSHOT" )) (" launchers" , true )
115
118
else (" v" + version, false )
116
119
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 : _* )
118
121
}
0 commit comments