Merge pull request #68 from pvlugter/sbt-1.3.0

Merge modules with the same classifier and type
lightbend · Sep 10, 2019 · e7dc658 · e7dc658
2 parents 3169062 + b24706f
commit e7dc658
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: scala
-jdk: oraclejdk8
+jdk: openjdk8
 script: project/travis.sh
 
 # Build only master and version tags - http://stackoverflow.com/a/31882307/463761

diff --git a/src/main/scala/sbtwhitesource/WhiteSource.scala b/src/main/scala/sbtwhitesource/WhiteSource.scala
@@ -338,7 +338,9 @@ object BaseAction {
         case (Some(_), None)                  => None
         case (None, None)                     => Some(m1)
         case (Some((a1, f1)), Some((a2, f2))) =>
-          if (a1.classifier == Some("native") && a2.classifier == None)
+          if (a1.classifier == a2.classifier && a1.`type` == a2.`type`)
+            Some(m1)
+          else if (a1.classifier == Some("native") && a2.classifier == None)
             Some(m2)
           else if (a1.classifier == None && a2.classifier == Some("native"))
             Some(m1)