Fix parsing of dependencies config mapping of Ivy files

This commit is contained in:
Alexandre Archambault
2015-12-30 01:34:32 +01:00
parent 2e6e061fe1
commit 357c3fa0f7
2 changed files with 17 additions and 18 deletions
+2 -15
View File
@@ -1,6 +1,6 @@
package coursier
import coursier.ivy.IvyRepository
import coursier.ivy.{ IvyXml, IvyRepository }
import sbt.mavenint.SbtPomExtraProperties
import sbt.{ Resolver, CrossVersion, ModuleID }
@@ -24,19 +24,6 @@ object FromSbt {
case f: CrossVersion.Binary => name + "_" + f.remapVersion(scalaBinaryVersion)
}
def mappings(mapping: String): Seq[(String, String)] =
mapping.split(';').flatMap { m =>
val (froms, tos) = m.split("->", 2) match {
case Array(from) => (from, "default(compile)")
case Array(from, to) => (from, to)
}
for {
from <- froms.split(',')
to <- tos.split(',')
} yield (from.trim, to.trim)
}
def attributes(attr: Map[String, String]): Map[String, String] =
attr.map { case (k, v) =>
k.stripPrefix("e:") -> v
@@ -64,7 +51,7 @@ object FromSbt {
)
val mapping = module.configurations.getOrElse("compile")
val allMappings = mappings(mapping)
val allMappings = IvyXml.mappings(mapping)
val attributes =
if (module.explicitArtifacts.isEmpty)