Update coursier to 2.1.24 (#3429)

Author: Gedochao

.github/scripts/build-linux-aarch64.sh

@@ -6,7 +6,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
 
 mkdir -p artifacts
 mkdir -p utils
-cp "$(cs get https://github.com/VirtusLab/coursier-m1/releases/download/v2.1.23/cs-aarch64-pc-linux.gz --archive)" utils/cs
+cp "$(cs get https://github.com/VirtusLab/coursier-m1/releases/download/v2.1.24/cs-aarch64-pc-linux.gz --archive)" utils/cs
 chmod +x utils/cs
 
 cp "$DIR/build-linux-aarch64-from-docker.sh" utils/

.github/scripts/get-latest-cs.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-CS_VERSION="2.1.23"
+CS_VERSION="2.1.24"
 
 DIR="$(cs get --archive "https://github.com/coursier/coursier/releases/download/v$CS_VERSION/cs-x86_64-pc-win32.zip")"
 

build.sc

@@ -1,5 +1,5 @@
 import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION`
-import $ivy.`io.get-coursier::coursier-launcher:2.1.23`
+import $ivy.`io.get-coursier::coursier-launcher:2.1.24`
 import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.29`
 import $file.project.deps, deps.{Deps, Docker, InternalDeps, Java, Scala, TestDeps}
 import $file.project.publish, publish.{ghOrg, ghName, ScalaCliPublishModule, organization}

mill

@@ -2,7 +2,7 @@
 
 # Adapted from
 
-coursier_version="2.1.23"
+coursier_version="2.1.24"
 
 # https://stackoverflow.com/questions/3466166/how-to-check-if-running-in-cygwin-mac-or-linux/17072017#17072017
 if [ "$(expr substr $(uname -s) 1 5 2>/dev/null)" == "Linux" ]; then

modules/build/src/main/java/scala/build/internal/JniGetWinDirs.java

@@ -1,9 +1,12 @@
 package scala.build
 
-import coursier.cache.shaded.dirs.{GetWinDirs, ProjectDirectories}
+import coursier.cache.shaded.dirs.ProjectDirectories
+import coursier.cache.shaded.dirs.impl.Windows
+import coursier.cache.shaded.dirs.jni.WindowsJni
+
+import java.util.function.Supplier
 
 import scala.build.errors.ConfigDbException
-import scala.build.internal.JniGetWinDirs
 import scala.build.internals.EnvVar
 import scala.cli.config.ConfigDb
 import scala.util.Properties
@@ -83,13 +86,10 @@ object Directories {
   }
 
   def default(): Directories = {
-    val getWinDirs: GetWinDirs =
-      if (coursier.paths.Util.useJni())
-        new JniGetWinDirs
-      else
-        GetWinDirs.powerShellBased
-
-    OsLocations(ProjectDirectories.from(null, null, "ScalaCli", getWinDirs))
+    val windows: Supplier[Windows] =
+      if coursier.paths.Util.useJni() then WindowsJni.getJdkAwareSupplier
+      else Windows.getDefaultSupplier
+    OsLocations(ProjectDirectories.from(null, null, "ScalaCli", windows))
   }
 
   def under(dir: os.Path): Directories =

modules/build/src/main/scala/scala/build/Directories.scala

@@ -2306,7 +2306,7 @@ abstract class RunTestDefinitions
     val input          = "example.scala"
     TestInputs(
       os.rel / input ->
-        s"""//> using dep io.get-coursier:coursier_2.13:2.1.23
+        s"""//> using dep io.get-coursier:coursier_2.13:2.1.24
            |@main def $main1() = println("$main1")
            |@main def $main2() = println("$main2")
            |""".stripMargin

modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala

@@ -108,7 +108,7 @@ object Deps {
     def ammoniteForScala3Lts = ammonite
     def argonautShapeless    = "1.3.1"
     // jni-utils version may need to be sync-ed when bumping the coursier version
-    def coursierDefault                   = "2.1.23"
+    def coursierDefault                   = "2.1.24"
     def coursier                          = coursierDefault
     def coursierCli                       = coursierDefault
     def coursierM1Cli                     = coursierDefault