This repository has been archived by the owner on Dec 23, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 8
Merge modules with the same classifier and type #68
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Or should it check both classifier and type for default merge? |
pvlugter
changed the title
Merge modules with the same classifier
Merge modules with the same classifier and type
Sep 7, 2019
Also switch the travis build to openjdk8 to get it building, as it was still on oraclejdk8. |
raboof
approved these changes
Sep 9, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can confirm this change fixes akka/akka#26935 as well
Thanks @raboof. I wasn't sure if this affected akka too. I'll merge and publish. |
This was referenced Oct 16, 2019
Merged
dwijnand
added a commit
to dwijnand/zinc
that referenced
this pull request
May 1, 2020
Without this Travis CI was failing: https://travis-ci.org/github/sbt/zinc/jobs/671727552 [error] Caused by: java.lang.RuntimeException: Multiple elements for the same key (org.scala-lang.modules,scala-xml_2.12): [error] ModuleInfo(org.scala-lang.modules,scala-xml_2.12,1.2.0,Some((Artifact(scala-xml_2.12, bundle, jar, None, Vector(), Some(https://repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.2.0/scala-xml_2.12-1.2.0.jar), Map(), None, false),/home/travis/.cache/coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.2.0/scala-xml_2.12-1.2.0.jar))) [error] ModuleInfo(org.scala-lang.modules,scala-xml_2.12,1.2.0,Some((Artifact(scala-xml_2.12, bundle, jar, None, Vector(), Some(https://repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.2.0/scala-xml_2.12-1.2.0.jar), Map(), None, false),/home/travis/.cache/coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.2.0/scala-xml_2.12-1.2.0.jar))) [error] at scala.sys.package$.error(package.scala:30) [error] at sbtwhitesource.package$KeyByAndMergeSyntax$.$anonfun$keyByAndMerge$2(package.scala:26) This brings in the following 2 fixes: * lightbend/sbt-whitesource#68 * lightbend/sbt-whitesource#70
dwijnand
added a commit
to ijuma/zinc
that referenced
this pull request
May 1, 2020
Without this Travis CI was failing: https://travis-ci.org/github/sbt/zinc/jobs/671727552 [error] Caused by: java.lang.RuntimeException: Multiple elements for the same key (org.scala-lang.modules,scala-xml_2.12): [error] ModuleInfo(org.scala-lang.modules,scala-xml_2.12,1.2.0,Some((Artifact(scala-xml_2.12, bundle, jar, None, Vector(), Some(https://repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.2.0/scala-xml_2.12-1.2.0.jar), Map(), None, false),/home/travis/.cache/coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.2.0/scala-xml_2.12-1.2.0.jar))) [error] ModuleInfo(org.scala-lang.modules,scala-xml_2.12,1.2.0,Some((Artifact(scala-xml_2.12, bundle, jar, None, Vector(), Some(https://repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.2.0/scala-xml_2.12-1.2.0.jar), Map(), None, false),/home/travis/.cache/coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.2.0/scala-xml_2.12-1.2.0.jar))) [error] at scala.sys.package$.error(package.scala:30) [error] at sbtwhitesource.package$KeyByAndMergeSyntax$.$anonfun$keyByAndMerge$2(package.scala:26) This brings in the following 2 fixes: * lightbend/sbt-whitesource#68 * lightbend/sbt-whitesource#70
dwijnand
added a commit
to ijuma/zinc
that referenced
this pull request
May 1, 2020
Without this Travis CI was failing: https://travis-ci.org/github/sbt/zinc/jobs/671727552 [error] Caused by: java.lang.RuntimeException: Multiple elements for the same key (org.scala-lang.modules,scala-xml_2.12): [error] ModuleInfo(org.scala-lang.modules,scala-xml_2.12,1.2.0,Some((Artifact(scala-xml_2.12, bundle, jar, None, Vector(), Some(https://repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.2.0/scala-xml_2.12-1.2.0.jar), Map(), None, false),/home/travis/.cache/coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.2.0/scala-xml_2.12-1.2.0.jar))) [error] ModuleInfo(org.scala-lang.modules,scala-xml_2.12,1.2.0,Some((Artifact(scala-xml_2.12, bundle, jar, None, Vector(), Some(https://repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.2.0/scala-xml_2.12-1.2.0.jar), Map(), None, false),/home/travis/.cache/coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.2.0/scala-xml_2.12-1.2.0.jar))) [error] at scala.sys.package$.error(package.scala:30) [error] at sbtwhitesource.package$KeyByAndMergeSyntax$.$anonfun$keyByAndMerge$2(package.scala:26) This brings in the following 2 fixes: * lightbend/sbt-whitesource#68 * lightbend/sbt-whitesource#70
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Should resolve #67. Works on the Cinnamon build with sbt 1.3.0.