luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-10-06 18:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix compatibility API
This commit is contained in:
Alexandre Archambault
2017-07-19 15:30:26 +02:00
committed by GitHub
parent 95f08e99d6 2815897b7a
commit 5a271fffc5
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/shared/src/main/scala/coursier/maven/MavenSource.scala
+1 -1
View File
@@ -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,
tests/metadata
+1 -1
Submodule tests/metadata updated: ac3871c925...93eccec4ff
tests/shared/src/test/scala/coursier/test/CentralTests.scala
+17
View File
@@ -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)
}
}
}
}