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

Conversation

pvlugter
Copy link
Member

@pvlugter pvlugter commented Sep 7, 2019

Should resolve #67. Works on the Cinnamon build with sbt 1.3.0.

@pvlugter
Copy link
Member Author

pvlugter commented Sep 7, 2019

Or should it check both classifier and type for default merge?

@pvlugter pvlugter changed the title Merge modules with the same classifier Merge modules with the same classifier and type Sep 7, 2019
@pvlugter
Copy link
Member Author

pvlugter commented Sep 7, 2019

Also switch the travis build to openjdk8 to get it building, as it was still on oraclejdk8.

@raboof raboof mentioned this pull request Sep 9, 2019
5 tasks
Copy link
Contributor

@raboof raboof left a 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

@pvlugter
Copy link
Member Author

Thanks @raboof. I wasn't sure if this affected akka too. I'll merge and publish.

@pvlugter pvlugter merged commit e7dc658 into lightbend:master Sep 10, 2019
@pvlugter pvlugter deleted the sbt-1.3.0 branch September 10, 2019 00:04
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.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Doesn't work with sbt 1.3.0-RC2?
2 participants