Skip to content

Commit 0e93a38

Browse files
authored
Bump scala-cli to 1.4.1 + drop old cli management (#21234)
cc @WojciechMazur @Kordyjan
2 parents 2ea90c6 + 7695d9b commit 0e93a38

File tree

3 files changed

+4
-42
lines changed

3 files changed

+4
-42
lines changed

Diff for: dist/bin-native-overrides/cli-common-platform

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
11
#!/usr/bin/env bash
22

3-
if [[ ${cygwin-} || ${mingw-} || ${msys-} ]]; then
4-
SCALA_CLI_VERSION=""
5-
# iterate through lines in VERSION_SRC
6-
while IFS= read -r line; do
7-
# if line starts with "version:=" then extract the version
8-
if [[ "$line" == cli_version:=* ]]; then
9-
SCALA_CLI_VERSION="${line#cli_version:=}"
10-
break
11-
fi
12-
done < "$PROG_HOME/EXTRA_PROPERTIES"
13-
SCALA_CLI_CMD_BASH=("\"$PROG_HOME/bin/scala-cli\"" "--cli-version \"$SCALA_CLI_VERSION\"")
14-
else
15-
SCALA_CLI_CMD_BASH=("\"$PROG_HOME/bin/scala-cli\"")
16-
fi
3+
SCALA_CLI_CMD_BASH=("\"$PROG_HOME/bin/scala-cli\"")

Diff for: dist/bin-native-overrides/cli-common-platform.bat

+1-20
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
11
@echo off
22

3-
setlocal enabledelayedexpansion
4-
5-
set "_SCALA_CLI_VERSION="
6-
@rem read for cli_version:=_SCALA_CLI_VERSION in EXTRA_PROPERTIES file
7-
FOR /F "usebackq delims=" %%G IN ("%_PROG_HOME%\EXTRA_PROPERTIES") DO (
8-
SET "line=%%G"
9-
IF "!line:~0,13!"=="cli_version:=" (
10-
SET "_SCALA_CLI_VERSION=!line:~13!"
11-
GOTO :foundCliVersion
12-
)
13-
)
14-
15-
@REM we didn't find it, so we should fail
16-
echo "ERROR: cli_version not found in EXTRA_PROPERTIES file"
17-
exit /b 1
18-
19-
:foundCliVersion
20-
endlocal & set "SCALA_CLI_VERSION=%_SCALA_CLI_VERSION%"
21-
22-
set SCALA_CLI_CMD_WIN="%_PROG_HOME%\bin\scala-cli.exe" "--cli-version" "%SCALA_CLI_VERSION%"
3+
set SCALA_CLI_CMD_WIN="%_PROG_HOME%\bin\scala-cli.exe"

Diff for: project/Build.scala

+2-8
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,7 @@ object Build {
124124
val mimaPreviousLTSDottyVersion = "3.3.0"
125125

126126
/** Version of Scala CLI to download */
127-
val scalaCliLauncherVersion = "1.4.0"
128-
/** Version of Scala CLI to download (on Windows - last known validated version) */
129-
val scalaCliLauncherVersionWindows = "1.4.0"
127+
val scalaCliLauncherVersion = "1.4.1"
130128
/** Version of Coursier to download for initializing the local maven repo of Scala command */
131129
val coursierJarVersion = "2.1.10"
132130

@@ -2185,12 +2183,8 @@ object Build {
21852183
republishBinDir := (dist / republishBinDir).value,
21862184
republishBinOverrides += (dist / baseDirectory).value / "bin-native-overrides",
21872185
republishFetchCoursier := (dist / republishFetchCoursier).value,
2188-
republishExtraProps += ("cli_version" -> scalaCliLauncherVersion),
21892186
republishLaunchers +=
2190-
("scala-cli.exe" -> s"zip+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersionWindows/scala-cli-x86_64-pc-win32.zip!/scala-cli.exe")
2191-
)
2192-
.settings(
2193-
Universal / mappings += (republishRepo.value / "EXTRA_PROPERTIES" -> "EXTRA_PROPERTIES"),
2187+
("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")
21942188
)
21952189
.settings(
21962190
Windows / name := "scala",

0 commit comments

Comments
 (0)