From 63ddd4c616925655dfff4d596d52870c0900fdff Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 6 Aug 2019 17:02:57 +0200 Subject: [PATCH] Switch to coursier 2.0.0-RC3-2 (#116) --- build.sbt | 2 +- modules/sbt-shading/src/main/scala/coursier/Shading.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 1e6df01d2..643bd54ca 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ inThisBuild(List( ) )) -val coursierVersion0 = "2.0.0-RC3-1" +val coursierVersion0 = "2.0.0-RC3-2" lazy val `lm-coursier` = project // .enablePlugins(ContrabandPlugin) diff --git a/modules/sbt-shading/src/main/scala/coursier/Shading.scala b/modules/sbt-shading/src/main/scala/coursier/Shading.scala index 1ebb73b74..6f2ccdbd1 100644 --- a/modules/sbt-shading/src/main/scala/coursier/Shading.scala +++ b/modules/sbt-shading/src/main/scala/coursier/Shading.scala @@ -86,7 +86,7 @@ object Shading { } val dependencyArtifacts = res - .dependencyArtifacts() + .dependencyArtifacts(None, classpathOrder = false) .filter { case (_, attr, _) => classpathTypes(attr.`type`) } .groupBy(_._1) .mapValues(_.map(t => (t._2, t._3))) @@ -118,7 +118,7 @@ object Shading { def files(deps: Seq[Dependency]) = res .subset(deps) - .dependencies + .minDependencies .toSeq .flatMap(dependencyArtifacts.get) .flatten