Skip to content

Commit

Permalink
Stop defining the artifact configuration based on the classifier
Browse files Browse the repository at this point in the history
I believe this was accidentally not forward-ported from the 0.14 branch
to the 1.0.x branch.  Notice the change was present in sbt#1016:

  https://github.com/sbt/sbt/pull/1016/files#diff-6373e7f7122325e753b75fe1cc76ff5fL576

and missing in sbt#2478:

  https://github.com/sbt/sbt/pull/2478/files#diff-6373e7f7122325e753b75fe1cc76ff5fR680
  • Loading branch information
dwijnand committed Apr 5, 2017
1 parent 1f02e61 commit cd5c36a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions main/src/main/scala/sbt/Defaults.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit cd5c36a

Please sign in to comment.