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

Merge pull request #3080 from dwijnand/artefact-classifier-and-configurations 

Stop defining the artifact configuration based on the classifier
This commit is contained in:
Dale Wijnand 2017-04-05 21:44:44 +01:00 committed by GitHub
parent 1f02e61819 cd5c36a11f
commit 5ec8aac18b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/scala/sbt/Defaults.scala
View File

@ -785,8 +785,8 @@ object Defaults extends BuildCommon {
val combined = cPart.toList ++ classifier.toList
if (combined.isEmpty) a.withClassifier(None).withConfigurations(cOpt.toVector) else {
val classifierString = combined mkString "-"
val confs = cOpt.toVector flatMap { c => artifactConfigurations(a, c, classifier) }
a.withClassifier(Some(classifierString)).withType(Artifact.classifierType(classifierString)).withConfigurations(confs)
a.withClassifier(Some(classifierString)).withType(Artifact.classifierType(classifierString))
.withConfigurations(cOpt.toVector)
}
}
@deprecated("The configuration(s) should not be decided based on the classifier.", "1.0")