From cd5c36a11f03d505ffd61d305650e87a78288233 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 5 Apr 2017 14:09:21 +0100 Subject: [PATCH] Stop defining the artifact configuration based on the classifier 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 #1016: https://github.com/sbt/sbt/pull/1016/files#diff-6373e7f7122325e753b75fe1cc76ff5fL576 and missing in #2478: https://github.com/sbt/sbt/pull/2478/files#diff-6373e7f7122325e753b75fe1cc76ff5fR680 --- main/src/main/scala/sbt/Defaults.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 300026bbd..a32faf52a 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -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")