From 241c26c78f559e08a295d7cb586b9136d3e608d0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 18 Dec 2024 00:15:44 +0000 Subject: [PATCH 1/2] Update coursier-jvm_2.13, ... to 2.1.22 --- .../test/scala/scala/cli/integration/RunTestDefinitions.scala | 2 +- project/deps.sc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala index 0edf1370db..767ad9767d 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala @@ -2289,7 +2289,7 @@ abstract class RunTestDefinitions val input = "example.scala" TestInputs( os.rel / input -> - s"""//> using dep io.get-coursier:coursier_2.13:2.1.21 + s"""//> using dep io.get-coursier:coursier_2.13:2.1.22 |@main def $main1() = println("$main1") |@main def $main2() = println("$main2") |""".stripMargin diff --git a/project/deps.sc b/project/deps.sc index f6d5eb6c1a..d0f7814dac 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -105,7 +105,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.21" + def coursierDefault = "2.1.22" def coursier = coursierDefault def coursierCli = coursierDefault def coursierM1Cli = coursierDefault From beec814c1ef2e6d0cbd1acd28c7d54176b50c248 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Wed, 18 Dec 2024 10:06:57 +0100 Subject: [PATCH 2/2] Bump `coursier` to 2.1.22 in less obvious spots --- .github/scripts/build-linux-aarch64.sh | 2 +- .github/scripts/get-latest-cs.sh | 2 +- build.sc | 2 +- mill | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/build-linux-aarch64.sh b/.github/scripts/build-linux-aarch64.sh index d961a2add2..a46e4cf3b0 100755 --- a/.github/scripts/build-linux-aarch64.sh +++ b/.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.21/cs-aarch64-pc-linux.gz --archive)" utils/cs +cp "$(cs get https://github.com/VirtusLab/coursier-m1/releases/download/v2.1.22/cs-aarch64-pc-linux.gz --archive)" utils/cs chmod +x utils/cs cp "$DIR/build-linux-aarch64-from-docker.sh" utils/ diff --git a/.github/scripts/get-latest-cs.sh b/.github/scripts/get-latest-cs.sh index 7056bba00a..ad196239b9 100644 --- a/.github/scripts/get-latest-cs.sh +++ b/.github/scripts/get-latest-cs.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -CS_VERSION="2.1.21" +CS_VERSION="2.1.22" DIR="$(cs get --archive "https://github.com/coursier/coursier/releases/download/v$CS_VERSION/cs-x86_64-pc-win32.zip")" diff --git a/build.sc b/build.sc index 598f0e83b8..1402aeddb8 100644 --- a/build.sc +++ b/build.sc @@ -1,5 +1,5 @@ import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION` -import $ivy.`io.get-coursier::coursier-launcher:2.1.21` +import $ivy.`io.get-coursier::coursier-launcher:2.1.22` 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} diff --git a/mill b/mill index f4581955eb..a7732bef22 100755 --- a/mill +++ b/mill @@ -2,7 +2,7 @@ # Adapted from -coursier_version="2.1.21" +coursier_version="2.1.22" # 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