use --cli-version launcher option on windows

Author: bishabosha

dist/bin-native-overrides/cli-common-platform

@@ -1,3 +1,16 @@
 #!/usr/bin/env bash
 
-SCALA_CLI_CMD_BASH=("\"$PROG_HOME/bin/scala-cli\"")
+if [[ ${cygwin-} || ${mingw-} || ${msys-} ]]; then
+    SCALA_CLI_VERSION=""
+    # iterate through lines in VERSION_SRC
+    while IFS= read -r line; do
+    # if line starts with "version:=" then extract the version
+    if [[ "$line" == cli_version:=* ]]; then
+        SCALA_CLI_VERSION="${line#cli_version:=}"
+        break
+    fi
+    done < "$PROG_HOME/EXTRA_PROPERTIES"
+    SCALA_CLI_CMD_BASH=("\"$PROG_HOME/bin/scala-cli\"" "--cli-version \"$SCALA_CLI_VERSION\"")
+else
+    SCALA_CLI_CMD_BASH=("\"$PROG_HOME/bin/scala-cli\"")
+fi

dist/bin-native-overrides/cli-common-platform.bat

@@ -1,3 +1,18 @@
 @echo off
 
-set SCALA_CLI_CMD_WIN="%_PROG_HOME%\bin\scala-cli.exe"
+setlocal enabledelayedexpansion
+
+set "_SCALA_CLI_VERSION="
+@rem read for cli_version:=_SCALA_CLI_VERSION in EXTRA_PROPERTIES file
+FOR /F "usebackq delims=" %%G IN ("%_PROG_HOME%\EXTRA_PROPERTIES") DO (
+  SET "line=%%G"
+  IF "!line:~0,13!"=="cli_version:=" (
+    SET "_SCALA_CLI_VERSION=!line:~13!"
+    GOTO :foundCliVersion
+  )
+)
+
+:foundCliVersion
+endlocal & set "SCALA_CLI_VERSION=%_SCALA_CLI_VERSION%"
+
+set SCALA_CLI_CMD_WIN="%_PROG_HOME%\bin\scala-cli.exe" "--cli-version" "%SCALA_CLI_VERSION%"

project/Build.scala

@@ -119,6 +119,8 @@ object Build {
 
   /** Version of Scala CLI to download */
   val scalaCliLauncherVersion = "1.3.2"
+  /** Version of Scala CLI to download (on Windows - last known validated version) */
+  val scalaCliLauncherVersionWindows = "1.3.2"
   /** Version of Coursier to download for initializing the local maven repo of Scala command */
   val coursierJarVersion = "2.1.10"
 
@@ -2164,8 +2166,10 @@ object Build {
       packArchiveName := (dist / packArchiveName).value + "-x86_64-pc-win32",
       republishBinOverrides += (dist / baseDirectory).value / "bin-native-overrides",
       republishFetchCoursier := (dist / republishFetchCoursier).value,
+      republishExtraProps += ("cli_version" -> scalaCliLauncherVersion),
+      mappings += (republishRepo.value / "etc" / "EXTRA_PROPERTIES" -> "EXTRA_PROPERTIES"),
       republishLaunchers +=
-        ("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")
+        ("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")
     )
 
   lazy val `dist-linux-x86_64` = project.in(file("dist/linux-x86_64")).asDist(Bootstrapped)

project/RepublishPlugin.scala

@@ -62,13 +62,15 @@ object RepublishPlugin extends AutoPlugin {
     val republishFetchLaunchers = taskKey[Set[File]]("cache the launcher deps for the distribution")
     val republishFetchCoursier = taskKey[File]("cache the coursier.jar for resolving the local maven repo.")
     val republishPrepareBin = taskKey[File]("prepare the bin directory, including launchers and scripts.")
+    val republishWriteExtraProps = taskKey[Option[File]]("write extra properties for the launchers.")
     val republishBinDir = settingKey[File]("where to find static files for the bin dir.")
     val republishCoursierDir = settingKey[File]("where to download the coursier launcher jar.")
     val republishBinOverrides = settingKey[Seq[File]]("files to override those in bin-dir.")
     val republish = taskKey[File]("cache the dependencies and download launchers for the distribution")
     val republishRepo = settingKey[File]("the location to store the republished artifacts.")
     val republishLaunchers = settingKey[Seq[(String, String)]]("launchers to download. Sequence of (name, URL).")
     val republishCoursier = settingKey[Seq[(String, String)]]("coursier launcher to download. Sequence of (name, URL).")
+    val republishExtraProps = settingKey[Seq[(String, String)]]("extra properties for launchers.")
   }
 
   import autoImport._
@@ -276,6 +278,7 @@ object RepublishPlugin extends AutoPlugin {
     republishLaunchers := Seq.empty,
     republishCoursier := Seq.empty,
     republishBinOverrides := Seq.empty,
+    republishExtraProps := Seq.empty,
     republishLocalResolved / republishProjectRefs := {
       val proj = thisProjectRef.value
       val deps = buildDependencies.value
@@ -366,10 +369,31 @@ object RepublishPlugin extends AutoPlugin {
       }
       targetBin
     },
+    republishWriteExtraProps := {
+      val s = streams.value
+      val log = s.log
+      val extraProps = republishExtraProps.value
+      if (extraProps.isEmpty) {
+        log.info("[republish] No extra properties to write.")
+        None
+      }
+      else {
+        val repoDir = republishRepo.value
+        val propsFile = repoDir / "etc" / "EXTRA_PROPERTIES"
+        log.info(s"[republish] Writing extra properties to $propsFile...")
+        Using.fileWriter()(propsFile) { writer =>
+          extraProps.foreach { case (k, v) =>
+            writer.write(s"$k:=$v\n")
+          }
+        }
+        Some(propsFile)
+      }
+    },
     republish := {
       val cacheDir = republishRepo.value
       val artifacts = republishClasspath.value
       val launchers = republishFetchLaunchers.value
+      val extraProps = republishWriteExtraProps.value
       cacheDir
     }
   )