luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to coursier 2.0.0-RC3-2 (#116)

This commit is contained in:
Alexandre Archambault 2019-08-06 17:02:57 +02:00 committed by GitHub
parent e0ade0d6ba
commit 63ddd4c616
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -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 lazy val `lm-coursier` = project
// .enablePlugins(ContrabandPlugin) // .enablePlugins(ContrabandPlugin)

4
modules/sbt-shading/src/main/scala/coursier/Shading.scala
View File

@ -86,7 +86,7 @@ object Shading {
} }
val dependencyArtifacts = res val dependencyArtifacts = res
.dependencyArtifacts() .dependencyArtifacts(None, classpathOrder = false)
.filter { case (_, attr, _) => classpathTypes(attr.`type`) } .filter { case (_, attr, _) => classpathTypes(attr.`type`) }
.groupBy(_._1) .groupBy(_._1)
.mapValues(_.map(t => (t._2, t._3))) .mapValues(_.map(t => (t._2, t._3)))
@ -118,7 +118,7 @@ object Shading {
def files(deps: Seq[Dependency]) = res def files(deps: Seq[Dependency]) = res
.subset(deps) .subset(deps)
.dependencies .minDependencies
.toSeq .toSeq
.flatMap(dependencyArtifacts.get) .flatMap(dependencyArtifacts.get)
.flatten .flatten