Skip to content

Update coursier to 2.1.17 #3275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/get-latest-cs.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e

CS_VERSION="2.1.13"
CS_VERSION="2.1.17"

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

Expand Down
3 changes: 2 additions & 1 deletion build.sc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION`
import $ivy.`io.get-coursier::coursier-launcher:2.1.13`
import $ivy.`io.get-coursier::coursier-launcher:2.1.17`
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}
Expand Down Expand Up @@ -228,6 +228,7 @@ trait GenerateReferenceDoc extends CrossSbtModule with ScalaCliScalafixModule {
)
def repositoriesTask = T.task(super.repositoriesTask() ++ customRepositories)
def ivyDeps = Agg(
Deps.argonautShapeless,
Deps.caseApp,
Deps.munit
)
Expand Down
2 changes: 1 addition & 1 deletion mill
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Adapted from

coursier_version="2.1.13"
coursier_version="2.1.17"

# 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package scala.build.internal

import bloop.rifle.VersionUtil.parseJavaVersion
import coursier.jvm.{JavaHome, JvmIndex}
import coursier.jvm.{JavaHome, JvmChannel}

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

lazy val jvmIndexOs: String = {
val default = JvmIndex.defaultOs()
val default = JvmChannel.defaultOs
if (default == "linux" && isMusl.getOrElse(false)) "linux-musl"
else default
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import dependency.AnyDependency
import java.nio.charset.StandardCharsets

import scala.build.options.{BuildOptions, ConfigMonoid}
import scala.reflect.io.Path

final case class ScopedBuildInfo(
sources: Seq[String] = Nil,
Expand Down
7 changes: 5 additions & 2 deletions project/deps.sc
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ object Deps {
object Versions {
def ammonite = "3.0.0-2-6342755f"
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.14"
def coursierDefault = "2.1.17"
def coursier = coursierDefault
def coursierCli = coursierDefault
def coursierM1Cli = coursierDefault
Expand Down Expand Up @@ -137,7 +138,9 @@ object Deps {
// that Scala CLI supports.
def ammonite = ivy"com.lihaoyi:::ammonite:${Versions.ammonite}"
def ammoniteForScala3Lts = ivy"com.lihaoyi:::ammonite:${Versions.ammoniteForScala3Lts}"
def asm = ivy"org.ow2.asm:asm:9.7.1"
def argonautShapeless =
ivy"com.github.alexarchambault:argonaut-shapeless_6.3_2.13:${Versions.argonautShapeless}"
def asm = ivy"org.ow2.asm:asm:9.7.1"
// Force using of 2.13 - is there a better way?
def bloopConfig = ivy"ch.epfl.scala:bloop-config_2.13:2.1.0"
.exclude(("com.github.plokhotnyuk.jsoniter-scala", "jsoniter-scala-core_2.13"))
Expand Down
Loading