From 132e0c6bb52590fda89fbc4d9b0dcd267bb7e038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pawlik?= Date: Sat, 14 Mar 2026 11:06:13 +0100 Subject: [PATCH] [1.x] deps: Update lm-coursier-shaded 2.1.12 (#8902) Update lm-coursier-shaded 2.1.12 --- project/Dependencies.scala | 2 +- .../scala-version-check-exempt/build.sbt | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5ad1cce74..b758d7ebf 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -78,7 +78,7 @@ object Dependencies { def addSbtZincCompile = addSbtModule(sbtZincPath, "zincCompile", zincCompile) def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore) - val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.1.10" + val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.1.12" def sjsonNew(n: String) = Def.setting("com.eed3si9n" %% n % "0.10.1") // contrabandSjsonNewVersion.value diff --git a/sbt-app/src/sbt-test/dependency-management/scala-version-check-exempt/build.sbt b/sbt-app/src/sbt-test/dependency-management/scala-version-check-exempt/build.sbt index 540318393..9d4117431 100644 --- a/sbt-app/src/sbt-test/dependency-management/scala-version-check-exempt/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/scala-version-check-exempt/build.sbt @@ -4,6 +4,16 @@ ThisBuild / scalaVersion := "2.11.12" libraryDependencies += "org.scala-lang" %% "scala-actors-migration" % "1.1.0" libraryDependencies += "org.scala-lang" %% "scala-pickling" % "0.9.1" +// This is a workaround for https://github.com/coursier/coursier/issues/3525, ported backported from https://github.com/sbt/sbt/pull/8381/changes#diff-bb1add3538eec3272df81b1f5bef249d096aa240d5408a4ceff8917557f5142fR15 +// [info] [error] lmcoursier.internal.shaded.coursier.params.rule.SameVersion$CantForceSameVersion: +// Can't force version 2.11.12 for modules org.scala-lang:scala-compiler, org.scala-lang:scala-reflect, org.scala-lang:scala-library +// .... +// [info] [error] Caused by: lmcoursier.internal.shaded.coursier.params.rule.SameVersion$SameVersionConflict: +// Unsatisfied rule SameVersion(HashSet(ModuleMatcher(org.scala-lang:scala-compiler), ModuleMatcher(org.scala-lang:scalap), +// ModuleMatcher(org.scala-lang:scala-actors), ModuleMatcher(org.scala-lang:scala-reflect), ModuleMatcher(org.scala-lang:scala-library))): +// Found versions 2.11.0, 2.11.12 for org.scala-lang:scala-actors, org.scala-lang:scala-compiler, org.scala-lang:scala-library, org.scala-lang:scala-reflect +libraryDependencies += "org.scala-lang" % "scala-actors" % "2.11.12" + lazy val check = taskKey[Unit]("Runs the check") check := {