Skip to content

Commit f388a88

Browse files
authored
Update Coursier to 2.1.0-M2-19-g5a34ba7c1 (#2478)
* Update Coursier to 2.1.0-M2-19-g5a34ba7c1 * Ignore eviction errors * Update assemblyMergeStrategy
1 parent 9ebf96e commit f388a88

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

build.sbt

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ ThisBuild / githubWorkflowBuild :=
6060
)
6161
)
6262

63+
/// global build settings
64+
65+
ThisBuild / evictionErrorLevel := Level.Info
66+
6367
/// projects
6468

6569
lazy val root = project
@@ -123,20 +127,14 @@ lazy val core = myCrossProject("core")
123127
),
124128
assembly / test := {},
125129
assembly / assemblyMergeStrategy := {
126-
val nativeSuffix = "\\.(?:dll|jnilib|so)$".r
127-
128-
{
129-
case PathList(ps @ _*) if nativeSuffix.findFirstMatchIn(ps.last).isDefined =>
130-
MergeStrategy.first
131-
case PathList("org", "fusesource", _*) =>
132-
// (core / assembly) deduplicate: different file contents found in the following:
133-
// https/repo1.maven.org/maven2/jline/jline/2.14.6/jline-2.14.6.jar:org/fusesource/hawtjni/runtime/Callback.class
134-
// https/repo1.maven.org/maven2/org/fusesource/jansi/jansi/1.18/jansi-1.18.jar:org/fusesource/hawtjni/runtime/Callback.class
135-
MergeStrategy.first
136-
case otherwise =>
137-
val defaultStrategy = (assembly / assemblyMergeStrategy).value
138-
defaultStrategy(otherwise)
139-
}
130+
case PathList("META-INF", "versions", "9", "module-info.class") =>
131+
// (core / assembly) deduplicate: different file contents found in the following:
132+
// https/repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.20/kotlin-stdlib-1.4.20.jar:META-INF/versions/9/module-info.class
133+
// https/repo1.maven.org/maven2/org/tukaani/xz/1.9/xz-1.9.jar:META-INF/versions/9/module-info.class
134+
MergeStrategy.first
135+
case otherwise =>
136+
val defaultStrategy = (assembly / assemblyMergeStrategy).value
137+
defaultStrategy(otherwise)
140138
},
141139
buildInfoKeys := Seq[BuildInfoKey](
142140
organization,

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ object Dependencies {
1616
val circeParser = "io.circe" %% "circe-parser" % circeGeneric.revision
1717
val circeRefined = "io.circe" %% "circe-refined" % circeGeneric.revision
1818
val commonsIo = "commons-io" % "commons-io" % "2.11.0"
19-
val coursierCore = "io.get-coursier" %% "coursier" % "2.0.16"
19+
val coursierCore = "io.get-coursier" %% "coursier" % "2.1.0-M2-19-g5a34ba7c1"
2020
val cron4sCore = "com.github.alonsodomin.cron4s" %% "cron4s-core" % "0.6.1"
2121
val decline = "com.monovore" %% "decline" % "2.2.0"
2222
val disciplineMunit = "org.typelevel" %% "discipline-munit" % "1.0.9"

0 commit comments

Comments
 (0)