diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b758d7ebf..5ad1cce74 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.12" + val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.1.10" 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 9d4117431..540318393 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,16 +4,6 @@ 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 := { diff --git a/sbt-app/src/sbt-test/plugins/sbt-site/build.sbt b/sbt-app/src/sbt-test/plugins/sbt-site/build.sbt new file mode 100644 index 000000000..e69de29bb diff --git a/sbt-app/src/sbt-test/plugins/sbt-site/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/sbt-site/project/plugins.sbt new file mode 100644 index 000000000..59e438479 --- /dev/null +++ b/sbt-app/src/sbt-test/plugins/sbt-site/project/plugins.sbt @@ -0,0 +1,2 @@ +// This is hosted on Arty (http://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/com.typesafe.sbt/sbt-site/scala_2.12/sbt_1.0/1.4.1/ivys/ivy.xml) +addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") diff --git a/sbt-app/src/sbt-test/plugins/sbt-site/test b/sbt-app/src/sbt-test/plugins/sbt-site/test new file mode 100644 index 000000000..4e3db8162 --- /dev/null +++ b/sbt-app/src/sbt-test/plugins/sbt-site/test @@ -0,0 +1 @@ +> about