diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8c119973f..a9706ea92 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -76,7 +76,7 @@ object Dependencies { def addSbtZincCompile = addSbtModule(sbtZincPath, "zincCompile", zincCompile) def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore) - val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.0-RC6" + val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.0-RC6-1" def sjsonNew(n: String) = Def.setting("com.eed3si9n" %% n % contrabandSjsonNewVersion.value) val sjsonNewScalaJson = sjsonNew("sjson-new-scalajson") diff --git a/sbt/src/sbt-test/dependency-management/cp-order/build.sbt b/sbt/src/sbt-test/dependency-management/cp-order/build.sbt new file mode 100644 index 000000000..3ea183127 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/cp-order/build.sbt @@ -0,0 +1,5 @@ +scalaVersion := "2.13.1" +csrConfiguration := csrConfiguration.value.withCache(target.value / "coursier-cache") + +libraryDependencies += "com.typesafe.play" %% "play-test" % "2.8.0-RC1" % Test // worked around in 2.8.0 +libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % Test diff --git a/sbt/src/sbt-test/dependency-management/cp-order/src/test/scala/t/UnitSpec.scala b/sbt/src/sbt-test/dependency-management/cp-order/src/test/scala/t/UnitSpec.scala new file mode 100644 index 000000000..d1735b308 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/cp-order/src/test/scala/t/UnitSpec.scala @@ -0,0 +1,20 @@ +package t + +import com.typesafe.config.ConfigFactory +import org.scalatest.{ MustMatchers, WordSpec } + +class UnitSpec extends WordSpec with MustMatchers { + def conf = ConfigFactory.defaultReference() + + "Config" should { + "return Akka HTTP server provider" in { + val serverProvider = conf.getString("play.server.provider") + serverProvider mustBe "play.core.server.AkkaHttpServerProvider" + } + + "be able to load Netty settings" in { + val nettyTransport = conf.getString("play.server.netty.transport") + nettyTransport mustBe "jdk" + } + } +} diff --git a/sbt/src/sbt-test/dependency-management/cp-order/test b/sbt/src/sbt-test/dependency-management/cp-order/test new file mode 100644 index 000000000..499682d37 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/cp-order/test @@ -0,0 +1,5 @@ +# https://github.com/coursier/coursier/issues/1466 +# aka https://github.com/sbt/sbt/issues/5282 +> test +> set csrConfiguration ~= (_.withClasspathOrder(false)) +-> test