File tree 3 files changed +3
-39
lines changed
dist/bin-native-overrides
3 files changed +3
-39
lines changed Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
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\" " )
Original file line number Diff line number Diff line change 1
1
@ echo off
2
2
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"
Original file line number Diff line number Diff line change @@ -119,8 +119,6 @@ object Build {
119
119
120
120
/** Version of Scala CLI to download */
121
121
val scalaCliLauncherVersion = " 1.4.0"
122
- /** Version of Scala CLI to download (on Windows - last known validated version) */
123
- val scalaCliLauncherVersionWindows = " 1.4.0"
124
122
/** Version of Coursier to download for initializing the local maven repo of Scala command */
125
123
val coursierJarVersion = " 2.1.10"
126
124
@@ -2176,10 +2174,8 @@ object Build {
2176
2174
packArchiveName := (dist / packArchiveName).value + " -x86_64-pc-win32" ,
2177
2175
republishBinOverrides += (dist / baseDirectory).value / " bin-native-overrides" ,
2178
2176
republishFetchCoursier := (dist / republishFetchCoursier).value,
2179
- republishExtraProps += (" cli_version" -> scalaCliLauncherVersion),
2180
- mappings += (republishRepo.value / " EXTRA_PROPERTIES" -> " EXTRA_PROPERTIES" ),
2181
2177
republishLaunchers +=
2182
- (" 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 " )
2178
+ (" 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 " )
2183
2179
)
2184
2180
2185
2181
lazy val `dist-linux-x86_64` = project.in(file(" dist/linux-x86_64" )).asDist(Bootstrapped )
You can’t perform that action at this time.
0 commit comments