Merge pull request #614 from coursier/topic/fix-compatibility-api

Fix compatibility API
coursier · Jul 19, 2017 · 5a271ff · 5a271ff
2 parents 95f08e9 + 2815897
commit 5a271ff
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/core/shared/src/main/scala/coursier/maven/MavenSource.scala b/core/shared/src/main/scala/coursier/maven/MavenSource.scala
@@ -281,7 +281,7 @@ final case class MavenSource(
               k -> other.extra.get(k).fold(v)(merge(v, _))
           } ++
           other.extra
-            .filterKeys(k => !a.extra.contains(k))
+            .filterKeys(k => !a.extra.contains(k) && k != Artifact.optionalKey)
 
         a.copy(
           checksumUrls = other.checksumUrls ++ a.checksumUrls,

diff --git a/tests/metadata b/tests/metadata
diff --git a/tests/shared/src/test/scala/coursier/test/CentralTests.scala b/tests/shared/src/test/scala/coursier/test/CentralTests.scala
@@ -804,6 +804,23 @@ abstract class CentralTests extends TestSuite {
         val mainArtifactOpt = artifacts.find(_.url == mainUrl)
         assert(mainArtifactOpt.isEmpty)
       }
+
+      * - {
+        if (isActualCentral)
+          withArtifacts(Module("com.lihaoyi", "scalatags_2.12"), "0.6.2", "jar", transitive = true, optional = false) { artifacts =>
+
+            assert(artifacts.forall(!_.isOptional))
+
+            val urls = artifacts.map(_.url).toSet
+
+            val expectedUrls = Set(
+              "https://repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.0/scala-library-2.12.0.jar",
+              "https://repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.12/0.1.3/sourcecode_2.12-0.1.3.jar",
+              "https://repo1.maven.org/maven2/com/lihaoyi/scalatags_2.12/0.6.2/scalatags_2.12-0.6.2.jar"
+            )
+            assert(urls == expectedUrls)
+          }
+      }
     }
   }