Skip to content

Add --skip-cli-updates by default to the scala command #20900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2024
Merged

Add --skip-cli-updates by default to the scala command #20900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df2bf40
Bump scala-cli to 1.4.0
hamzaremmal Jun 28, 2024
22931f1
Add --skip-cli-updates by default to the scala command
hamzaremmal Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dist/bin/scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ done
# SCALA_CLI_CMD_BASH is an array, set by cli-common-platform
eval "${SCALA_CLI_CMD_BASH[@]}" \
"--prog-name scala" \
"--skip-cli-updates" \
"--cli-default-scala-version \"$SCALA_VERSION\"" \
"-r \"$MVN_REPOSITORY\"" \
"${scala_args[@]}"
Expand Down
5 changes: 3 additions & 2 deletions dist/bin/scala.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ call :setScalaOpts

call "%_PROG_HOME%\bin\cli-common-platform.bat"

@rem SCALA_CLI_CMD_WIN is an array, set in cli-common-platform.bat
call %SCALA_CLI_CMD_WIN% "--prog-name" "scala" "--cli-default-scala-version" "%_SCALA_VERSION%" "-r" "%MVN_REPOSITORY%" %*
@rem SCALA_CLI_CMD_WIN is an array, set in cli-common-platform.bat.
@rem WE NEED TO PASS '--skip-cli-updates' for JVM launchers but we actually don't need it for native launchers
call %SCALA_CLI_CMD_WIN% "--prog-name" "scala" "--skip-cli-updates" "--cli-default-scala-version" "%_SCALA_VERSION%" "-r" "%MVN_REPOSITORY%" %*

if not %ERRORLEVEL%==0 ( set _EXITCODE=1& goto end )

Expand Down
4 changes: 2 additions & 2 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ object Build {
val mimaPreviousLTSDottyVersion = "3.3.0"

/** Version of Scala CLI to download */
val scalaCliLauncherVersion = "1.3.2"
val scalaCliLauncherVersion = "1.4.0"
/** Version of Scala CLI to download (on Windows - last known validated version) */
val scalaCliLauncherVersionWindows = "1.3.2"
val scalaCliLauncherVersionWindows = "1.4.0"
/** Version of Coursier to download for initializing the local maven repo of Scala command */
val coursierJarVersion = "2.1.10"

Expand Down
Loading