Skip to content
This repository has been archived by the owner on Dec 23, 2021. It is now read-only.

Merge modules with the same classifier and type #68

Merged
merged 2 commits into from
Sep 10, 2019
Merged

Merge modules with the same classifier and type #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7ed253
Merge modules with the same classifier and type
pvlugter Sep 7, 2019
b24706f
Travis: switch from oraclejdk8 to openjdk8
pvlugter Sep 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/main/scala/sbtwhitesource/WhiteSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down