From c7ed253b29ed8903831376cab094a6e209bf85e6 Mon Sep 17 00:00:00 2001 From: Peter Vlugter Date: Sat, 7 Sep 2019 14:17:17 +1200 Subject: [PATCH 1/2] Merge modules with the same classifier and type --- src/main/scala/sbtwhitesource/WhiteSource.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/scala/sbtwhitesource/WhiteSource.scala b/src/main/scala/sbtwhitesource/WhiteSource.scala index 7a43169..af85a60 100644 --- 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) From b24706f5116e4835814a1f8806d2f90eb4a4f04c Mon Sep 17 00:00:00 2001 From: Peter Vlugter Date: Sat, 7 Sep 2019 14:17:19 +1200 Subject: [PATCH 2/2] Travis: switch from oraclejdk8 to openjdk8 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5ea154c..aa23a43 100644 --- 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