Merge pull request #91 from Duhemm/different-targets-same-deps

Fix missing targets when deps are duplicated
twitter · Jun 3, 2021 · d9f52fa · d9f52fa
2 parents 7b45d77 + 6713733
commit d9f52fa
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/multiversion/src/main/scala/multiversion/configs/ThirdpartyConfig.scala b/multiversion/src/main/scala/multiversion/configs/ThirdpartyConfig.scala
@@ -86,7 +86,7 @@ final case class ThirdpartyConfig(
   def coursierDeps: List[(DependencyConfig, Dependency)] =
     dependencies2
       .flatMap(d => d.coursierDependencies(scala).map(cd => d -> cd))
-      .distinctBy(_._2)
+      .distinctBy { case (d, cd) => (d.targets.sorted, cd) }
   def relaxedForAllModules: Seq[(ModuleMatchers, Reconciliation)] =
     Vector((ModuleMatchers.all, Reconciliation.Relaxed))
 

diff --git a/tests/src/test/scala/tests/commands/ExportCommandSuite.scala b/tests/src/test/scala/tests/commands/ExportCommandSuite.scala
@@ -766,4 +766,38 @@ class ExportCommandSuite extends tests.BaseSuite with tests.ConfigSyntax {
          |""".stripMargin,
     expectedExit = 1
   )
+
+  checkMultipleDeps(
+    "different targets with the same dependencies",
+    deps(
+      dep("org.apiguardian:apiguardian-api:1.1.1")
+        .target("apiguardian"),
+      dep("org.apiguardian:apiguardian-api:1.1.1")
+        .target("apiguardian-2"),
+      dep("io.netty:netty:3.10.1.Final")
+        .target("netty"),
+      dep("commons-codec:commons-codec:1.9")
+        .target("target-0")
+        .transitive(false)
+        .dependency("netty")
+        .dependency("apiguardian-2")
+        .force(false),
+      dep("commons-codec:commons-codec:1.8")
+        .target("target-1")
+        .transitive(false)
+        .dependency("apiguardian")
+        .dependency("netty")
+        .force(true)
+    ),
+    queries = List(
+      allJars("@maven//:target-0") ->
+        """|@maven//:commons-codec/commons-codec/commons-codec-1.8.jar
+           |@maven//:io.netty/netty/netty-3.10.1.Final.jar
+           |@maven//:org.apiguardian/apiguardian-api/apiguardian-api-1.1.1.jar""".stripMargin,
+      allJars("@maven//:target-1") ->
+        """|@maven//:commons-codec/commons-codec/commons-codec-1.8.jar
+           |@maven//:io.netty/netty/netty-3.10.1.Final.jar
+           |@maven//:org.apiguardian/apiguardian-api/apiguardian-api-1.1.1.jar""".stripMargin,
+    )
+  )
 }