luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132 from alexarchambault/topic/drop-info-attr-fix 

Better handling of info attributes
This commit is contained in:
Alexandre Archambault 2016-02-07 13:28:07 +01:00
parent ca27dbc99e 796a428ca6
commit b6cc9be5b9
9 changed files with 96 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cache/src/main/scala/coursier/Cache.scala vendored
View File

@ -487,7 +487,8 @@ object Cache {
lazy val ivy2Local = IvyRepository(
ivy2HomeUri + "local/" +
"[organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/" +
"[artifact](-[classifier]).[ext]"
"[artifact](-[classifier]).[ext]",
dropInfoAttributes = true
)
lazy val ivy2Cache = IvyRepository(

2
cli/src/main/scala-2.11/coursier/cli/Coursier.scala
View File

@ -37,6 +37,8 @@ case class CommonOptions(
noDefault: Boolean = false,
@Help("Modify names in Maven repository paths for SBT plugins")
sbtPluginHack: Boolean = false,
@Help("Drop module attributes starting with 'info.' - these are sometimes used by projects built with SBT")
dropInfoAttr: Boolean = false,
@Help("Force module version")
@Value("organization:name:forcedVersion")
@Short("V")

16
cli/src/main/scala-2.11/coursier/cli/Helper.scala
View File

@ -90,14 +90,22 @@ class Helper(
)
val repositoriesValidation = CacheParse.repositories(common.repository).map { repos0 =>
val repos = (if (common.noDefault) Nil else defaultRepositories) ++ repos0
var repos = (if (common.noDefault) Nil else defaultRepositories) ++ repos0
if (common.sbtPluginHack)
repos.map {
repos = repos.map {
case m: MavenRepository => m.copy(sbtAttrStub = true)
case other => other
}
else
repos
if (common.dropInfoAttr)
repos = repos.map {
case m: IvyRepository => m.copy(dropInfoAttributes = true)
case other => other
}
repos
}
val repositories = repositoriesValidation match {

14
core/shared/src/main/scala/coursier/ivy/IvyRepository.scala
View File

@ -156,7 +156,19 @@ case class IvyRepository(
attributes = proj0.module.attributes.filter {
case (k, _) => !k.startsWith("info.")
}
)
),
dependencies = proj0.dependencies.map {
case (config, dep0) =>
val dep = dep0.copy(
module = dep0.module.copy(
attributes = dep0.module.attributes.filter {
case (k, _) => !k.startsWith("info.")
}
)
)
config -> dep
}
)
else
proj0

6
plugin/src/main/scala-2.10/coursier/FromSbt.scala
View File

@ -121,7 +121,8 @@ object FromSbt {
"file://" + patterns.artifactPatterns.head,
metadataPatternOpt = Some("file://" + patterns.ivyPatterns.head),
changing = Some(true),
properties = ivyProperties
properties = ivyProperties,
dropInfoAttributes = true
))
case sbt.URLRepository(_, patterns)
@ -132,7 +133,8 @@ object FromSbt {
patterns.artifactPatterns.head,
metadataPatternOpt = Some(patterns.ivyPatterns.head),
changing = None,
properties = ivyProperties
properties = ivyProperties,
dropInfoAttributes = true
))
case other =>

31
tests/jvm/src/test/scala/coursier/test/IvyTests.scala Normal file
View File

@ -0,0 +1,31 @@
package coursier.test
import coursier.Module
import coursier.ivy.IvyRepository
import utest._
object IvyTests extends TestSuite {
// only tested on the JVM for lack of support of XML attributes in our XML wrappers
val tests = TestSuite {
'dropInfoAttributes - {
CentralTests.resolutionCheck(
module = Module(
"org.scala-js", "sbt-scalajs", Map("sbtVersion" -> "0.13", "scalaVersion" -> "2.10")
),
version = "0.6.6",
extraRepo = Some(
IvyRepository(
"https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/" +
"[organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)" +
"[revision]/[type]s/[artifact](-[classifier]).[ext]",
dropInfoAttributes = true
)
)
)
}
}
}

8
tests/jvm/src/test/scala/coursier/test/compatibility/package.scala
View File

@ -14,10 +14,10 @@ package object compatibility {
}
def textResource(path: String)(implicit ec: ExecutionContext): Future[String] = Future {
def is = getClass
.getClassLoader
.getResource(path)
.openStream()
val res = Option(getClass.getClassLoader.getResource(path)).getOrElse {
throw new Exception(s"Not found: resource $path")
}
val is = res.openStream()
new String(Platform.readFullySync(is), "UTF-8")
}

18
tests/shared/src/test/resources/resolutions/org.scala-js/sbt-scalajs/sbtVersion_0.13_scalaVersion_2.10/0.6.6 Normal file
View File

@ -0,0 +1,18 @@
args4j:args4j:jar:2.0.16
com.google.code.findbugs:jsr305:jar:1.3.9
com.google.guava:guava:jar:14.0.1
com.google.javascript:closure-compiler:jar:v20130603
com.google.protobuf:protobuf-java:jar:2.4.1
com.googlecode.json-simple:json-simple:jar:1.1.1
io.apigee:rhino:jar:1.7R5pre4
junit:junit:jar:4.10
org.hamcrest:hamcrest-core:jar:1.1
org.json:json:jar:20090211
org.scala-js:sbt-scalajs;sbtVersion=0.13;scalaVersion=2.10:jar:0.6.6
org.scala-js:scalajs-ir_2.10:jar:0.6.6
org.scala-js:scalajs-js-envs_2.10:jar:0.6.6
org.scala-js:scalajs-sbt-test-adapter_2.10:jar:0.6.6
org.scala-js:scalajs-tools_2.10:jar:0.6.6
org.scala-lang:scala-library:jar:2.10.6
org.scala-sbt:test-interface:jar:1.0
org.webjars:envjs:jar:1.2

13
tests/shared/src/test/scala/coursier/test/CentralTests.scala
View File

@ -29,8 +29,7 @@ object CentralTests extends TestSuite {
def repr(dep: Dependency) =
(
Seq(
dep.module.organization,
dep.module.name,
dep.module,
dep.attributes.`type`
) ++
Some(dep.attributes.classifier)
@ -48,9 +47,17 @@ object CentralTests extends TestSuite {
configuration: String = ""
) =
async {
val attrPathPart =
if (module.attributes.isEmpty)
""
else
"/" + module.attributes.toVector.sorted.map {
case (k, v) => k + "_" + v
}.mkString("_")
val expected =
await(
textResource(s"resolutions/${module.organization}/${module.name}/$version")
textResource(s"resolutions/${module.organization}/${module.name}$attrPathPart/$version")
)
.split('\n')
.toSeq