Skip to content

Commit 0bf7e75

Browse files
committed
use coursier.jar launcher subprocess to fetch instead.
1 parent f6c27b6 commit 0bf7e75

File tree

2 files changed

+245
-140
lines changed

2 files changed

+245
-140
lines changed

project/Build.scala

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ object Build {
116116
val mimaPreviousLTSDottyVersion = "3.3.0"
117117

118118
/** Version of Scala CLI to download */
119-
val scalaCliLauncherVersion = "1.3.1"
119+
val scalaCliLauncherVersion = "1.3.2"
120+
val coursierJarVersion = "2.1.10"
120121

121122
object CompatMode {
122123
final val BinaryCompatible = 0
@@ -2110,15 +2111,18 @@ object Build {
21102111
.settings(
21112112
packArchiveName := "scala3-" + dottyVersion,
21122113
republishBinDir := baseDirectory.value / "bin",
2113-
republishLaunchers +=
2114-
("scala-cli.jar" -> s"https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli.jar")
2114+
republishLaunchers ++= Seq(
2115+
("scala-cli.jar" -> s"https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli.jar"),
2116+
("coursier.jar" -> s"https://github.com/coursier/coursier/releases/download/v$coursierJarVersion/coursier.jar")
2117+
)
21152118
)
21162119

21172120
lazy val `dist-mac-x64` = project.in(file("dist/mac-x64")).asDist(Bootstrapped)
21182121
.settings(
21192122
republishBinDir := (dist / republishBinDir).value,
21202123
packArchiveName := (dist / packArchiveName).value + "-x86_64-apple-darwin",
21212124
republishBinOverrides += (dist / baseDirectory).value / "bin-native-overrides",
2125+
republishFetchCoursier := (dist / republishFetchCoursier).value,
21222126
republishLaunchers +=
21232127
("scala-cli" -> s"gz+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-x86_64-apple-darwin.gz")
21242128
)
@@ -2128,6 +2132,7 @@ object Build {
21282132
republishBinDir := (dist / republishBinDir).value,
21292133
packArchiveName := (dist / packArchiveName).value + "-aarch64-apple-darwin",
21302134
republishBinOverrides += (dist / baseDirectory).value / "bin-native-overrides",
2135+
republishFetchCoursier := (dist / republishFetchCoursier).value,
21312136
republishLaunchers +=
21322137
("scala-cli" -> s"gz+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-aarch64-apple-darwin.gz")
21332138
)
@@ -2137,6 +2142,7 @@ object Build {
21372142
republishBinDir := (dist / republishBinDir).value,
21382143
packArchiveName := (dist / packArchiveName).value + "-x86_64-pc-win32",
21392144
republishBinOverrides += (dist / baseDirectory).value / "bin-native-overrides",
2145+
republishFetchCoursier := (dist / republishFetchCoursier).value,
21402146
republishLaunchers +=
21412147
("scala-cli.exe" -> s"zip+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-x86_64-pc-win32.zip!/scala-cli.exe")
21422148
)
@@ -2146,6 +2152,7 @@ object Build {
21462152
republishBinDir := (dist / republishBinDir).value,
21472153
packArchiveName := (dist / packArchiveName).value + "-x86_64-pc-linux",
21482154
republishBinOverrides += (dist / baseDirectory).value / "bin-native-overrides",
2155+
republishFetchCoursier := (dist / republishFetchCoursier).value,
21492156
republishLaunchers +=
21502157
("scala-cli" -> s"gz+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-x86_64-pc-linux.gz")
21512158
)
@@ -2155,6 +2162,7 @@ object Build {
21552162
republishBinDir := (dist / republishBinDir).value,
21562163
packArchiveName := (dist / packArchiveName).value + "-aarch64-pc-linux",
21572164
republishBinOverrides += (dist / baseDirectory).value / "bin-native-overrides",
2165+
republishFetchCoursier := (dist / republishFetchCoursier).value,
21582166
republishLaunchers +=
21592167
("scala-cli" -> s"gz+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-aarch64-pc-linux.gz")
21602168
)

0 commit comments

Comments
 (0)