From a22e4889f48c0bcfa12b03914300c0ac7d1279a2 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 3 Aug 2019 17:25:38 -0400 Subject: [PATCH] reproduce "Conflicting dependencies" Ref #4720 --- project/Dependencies.scala | 2 +- .../dependency-management/conflict-coursier/build.sbt | 5 +++++ .../sbt-test/dependency-management/conflict-coursier/test | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 sbt/src/sbt-test/dependency-management/conflict-coursier/build.sbt create mode 100644 sbt/src/sbt-test/dependency-management/conflict-coursier/test diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e0c1d97a1..962ad1862 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -112,7 +112,7 @@ object Dependencies { def addSbtZincCompileCore(p: Project): Project = addSbtModule(p, sbtZincPath, "zincCompileCore", zincCompileCore) - val lmCoursierVersion = "2.0.0-RC2-1" + val lmCoursierVersion = "2.0.0-RC3" val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % lmCoursierVersion val sjsonNewScalaJson = Def.setting { diff --git a/sbt/src/sbt-test/dependency-management/conflict-coursier/build.sbt b/sbt/src/sbt-test/dependency-management/conflict-coursier/build.sbt new file mode 100644 index 000000000..4c49c2b30 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/conflict-coursier/build.sbt @@ -0,0 +1,5 @@ +ThisBuild / scalaVersion := "2.12.8" +libraryDependencies ++= List( + "org.webjars.npm" % "randomatic" % "1.1.7", + "org.webjars.npm" % "is-odd" % "2.0.0", +) diff --git a/sbt/src/sbt-test/dependency-management/conflict-coursier/test b/sbt/src/sbt-test/dependency-management/conflict-coursier/test new file mode 100644 index 000000000..103bd8d2f --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/conflict-coursier/test @@ -0,0 +1 @@ +> update