Skip to content

Commit 4f55724

Browse files
authored
Update coursier to 2.1.17 (#3275)
1 parent f806a20 commit 4f55724

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
CS_VERSION="2.1.13"
4+
CS_VERSION="2.1.17"
55

66
DIR="$(cs get --archive "https://github.com/coursier/coursier/releases/download/v$CS_VERSION/cs-x86_64-pc-win32.zip")"
77

build.sc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION`
2-
import $ivy.`io.get-coursier::coursier-launcher:2.1.13`
2+
import $ivy.`io.get-coursier::coursier-launcher:2.1.17`
33
import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.29`
44
import $file.project.deps, deps.{Deps, Docker, InternalDeps, Java, Scala, TestDeps}
55
import $file.project.publish, publish.{ghOrg, ghName, ScalaCliPublishModule, organization}
@@ -228,6 +228,7 @@ trait GenerateReferenceDoc extends CrossSbtModule with ScalaCliScalafixModule {
228228
)
229229
def repositoriesTask = T.task(super.repositoriesTask() ++ customRepositories)
230230
def ivyDeps = Agg(
231+
Deps.argonautShapeless,
231232
Deps.caseApp,
232233
Deps.munit
233234
)

mill

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Adapted from
44

5-
coursier_version="2.1.13"
5+
coursier_version="2.1.17"
66

77
# https://stackoverflow.com/questions/3466166/how-to-check-if-running-in-cygwin-mac-or-linux/17072017#17072017
88
if [ "$(expr substr $(uname -s) 1 5 2>/dev/null)" == "Linux" ]; then

modules/core/src/main/scala/scala/build/internals/OsLibc.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scala.build.internal
22

33
import bloop.rifle.VersionUtil.parseJavaVersion
4-
import coursier.jvm.{JavaHome, JvmIndex}
4+
import coursier.jvm.{JavaHome, JvmChannel}
55

66
import java.io.IOException
77
import java.nio.charset.Charset
@@ -56,7 +56,7 @@ object OsLibc {
5656
// FIXME These values should be the default ones in coursier-jvm
5757

5858
lazy val jvmIndexOs: String = {
59-
val default = JvmIndex.defaultOs()
59+
val default = JvmChannel.defaultOs
6060
if (default == "linux" && isMusl.getOrElse(false)) "linux-musl"
6161
else default
6262
}

modules/options/src/main/scala/scala/build/info/ScopedBuildInfo.scala

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import dependency.AnyDependency
88
import java.nio.charset.StandardCharsets
99

1010
import scala.build.options.{BuildOptions, ConfigMonoid}
11-
import scala.reflect.io.Path
1211

1312
final case class ScopedBuildInfo(
1413
sources: Seq[String] = Nil,

project/deps.sc

+5-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,9 @@ object Deps {
101101
object Versions {
102102
def ammonite = "3.0.0-2-6342755f"
103103
def ammoniteForScala3Lts = ammonite
104+
def argonautShapeless = "1.3.1"
104105
// jni-utils version may need to be sync-ed when bumping the coursier version
105-
def coursierDefault = "2.1.14"
106+
def coursierDefault = "2.1.17"
106107
def coursier = coursierDefault
107108
def coursierCli = coursierDefault
108109
def coursierM1Cli = coursierDefault
@@ -137,7 +138,9 @@ object Deps {
137138
// that Scala CLI supports.
138139
def ammonite = ivy"com.lihaoyi:::ammonite:${Versions.ammonite}"
139140
def ammoniteForScala3Lts = ivy"com.lihaoyi:::ammonite:${Versions.ammoniteForScala3Lts}"
140-
def asm = ivy"org.ow2.asm:asm:9.7.1"
141+
def argonautShapeless =
142+
ivy"com.github.alexarchambault:argonaut-shapeless_6.3_2.13:${Versions.argonautShapeless}"
143+
def asm = ivy"org.ow2.asm:asm:9.7.1"
141144
// Force using of 2.13 - is there a better way?
142145
def bloopConfig = ivy"ch.epfl.scala:bloop-config_2.13:2.1.0"
143146
.exclude(("com.github.plokhotnyuk.jsoniter-scala", "jsoniter-scala-core_2.13"))

0 commit comments

Comments
 (0)