From df2bf408b35c109fed5a0e3e6ba98b2e70770d7b Mon Sep 17 00:00:00 2001 From: Hamza REMMAL Date: Fri, 28 Jun 2024 16:33:59 +0200 Subject: [PATCH 1/2] Bump scala-cli to 1.4.0 --- project/Build.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index cc24940de67c..32a4577fe34c 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -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" From 22931f1b3b05b016f8e29a053adabef5d6c116b7 Mon Sep 17 00:00:00 2001 From: Hamza REMMAL Date: Mon, 1 Jul 2024 10:29:16 +0200 Subject: [PATCH 2/2] Add --skip-cli-updates by default to the scala command --- dist/bin/scala | 1 + dist/bin/scala.bat | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dist/bin/scala b/dist/bin/scala index c6c6f8807a64..fa4f4cb25a11 100755 --- a/dist/bin/scala +++ b/dist/bin/scala @@ -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[@]}" diff --git a/dist/bin/scala.bat b/dist/bin/scala.bat index d473facbbb1c..7418909da263 100644 --- a/dist/bin/scala.bat +++ b/dist/bin/scala.bat @@ -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 )