Merge pull request #585 from coursier/topic/fix-update-sbt-classifiers

Fix updateSbtClassifier
This commit is contained in:
Alexandre Archambault 2017-06-20 14:10:29 +02:00 committed by GitHub
commit 4035e56eb6
2 changed files with 12 additions and 9 deletions

View File

@ -1091,6 +1091,7 @@ object Tasks {
val classifiersRes = coursierSbtClassifiersResolution.value
val mainRes = coursierResolutions.value
val configs0 = coursierConfigurations.value
val res =
if (withClassifiers && sbtClassifiers)
@ -1115,15 +1116,16 @@ object Tasks {
}
)
val configs = {
val m = coursierConfigurations.value
shadedConfigOpt.fold(m) {
case (baseConfig, shadedConfig) =>
(m - shadedConfig) + (
baseConfig -> (m.getOrElse(baseConfig, Set()) - shadedConfig)
)
}
}
val configs =
if (withClassifiers && sbtClassifiers)
cm.configurations.map(c => c.name -> Set.empty[String]).toMap
else
shadedConfigOpt.fold(configs0) {
case (baseConfig, shadedConfig) =>
(configs0 - shadedConfig) + (
baseConfig -> (configs0.getOrElse(baseConfig, Set()) - shadedConfig)
)
}
if (verbosityLevel >= 2) {
val finalDeps = dependenciesWithConfig(

View File

@ -1,3 +1,4 @@
$ delete output
> run
$ exists output
> updateSbtClassifiers