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

Generalize the logic to all config inheritance

This commit is contained in:
Eugene Yokota 2015-02-23 04:16:36 -05:00
parent 497374f459
commit c685b44482
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ivy/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala
View File

@ -17,7 +17,7 @@ import core.{ IvyPatternHelper, LogOptions }
import org.apache.ivy.util.{ Message, MessageLogger } import org.apache.ivy.util.{ Message, MessageLogger }
import org.apache.ivy.plugins.latest.{ ArtifactInfo => IvyArtifactInfo } import org.apache.ivy.plugins.latest.{ ArtifactInfo => IvyArtifactInfo }
import org.apache.ivy.plugins.matcher.{ MapMatcher, PatternMatcher } import org.apache.ivy.plugins.matcher.{ MapMatcher, PatternMatcher }
import Configurations.{ Compile, Test, Runtime, IntegrationTest } import Configurations.{ System => _, _ }
private[sbt] object CachedResolutionResolveCache { private[sbt] object CachedResolutionResolveCache {
def createID(organization: String, name: String, revision: String) = def createID(organization: String, name: String, revision: String) =
@ -448,19 +448,17 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
(surviving, evicted) (surviving, evicted)
} }
} }
// Some of the configurations contain extends, so you can't simply call config.
def lookupConfig(name: String): Configuration =
name match {
case "compile" => Compile
case "test" => Test
case "runtime" => Runtime
case "it" => IntegrationTest
case x => Configurations.config(x)
}
def remapInternalProject(node: IvyNode, ur: UpdateReport, def remapInternalProject(node: IvyNode, ur: UpdateReport,
md0: ModuleDescriptor, dd: DependencyDescriptor, md0: ModuleDescriptor, dd: DependencyDescriptor,
os: Vector[IvyOverride], log: Logger): UpdateReport = os: Vector[IvyOverride], log: Logger): UpdateReport =
{ {
def parentConfigs(c: String): Vector[String] =
Option(md0.getConfiguration(c)) match {
case Some(config) =>
config.getExtends.toVector ++
(config.getExtends.toVector flatMap parentConfigs)
case None => Vector()
}
// These are the configurations from the original project we want to resolve. // These are the configurations from the original project we want to resolve.
val rootModuleConfs = md0.getConfigurations.toArray.toVector val rootModuleConfs = md0.getConfigurations.toArray.toVector
val configurations0 = ur.configurations.toVector val configurations0 = ur.configurations.toVector
@ -473,14 +471,13 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
}: _*) }: _*)
// This emulates test-internal extending test configuration etc. // This emulates test-internal extending test configuration etc.
val remappedConfigs: Map[String, Vector[String]] = val remappedConfigs: Map[String, Vector[String]] =
(remappedConfigs0 /: rootModuleConfs) { (acc, c) => (remappedConfigs0 /: rootModuleConfs) { (acc0, c) =>
val config = lookupConfig(c.getName) val ps = parentConfigs(c.getName)
val internal = Configurations.internalMap(config) (acc0 /: ps) { (acc, parent) =>
if (config != internal) { val vs0 = acc.getOrElse(c.getName, Vector())
val vs0 = acc.getOrElse(internal.name, Vector()) val vs = acc.getOrElse(parent, Vector())
val vs = acc.getOrElse(config.name, Vector()) acc.updated(c.getName, (vs0 ++ vs).distinct)
acc.updated(internal.name, (vs0 ++ vs).distinct) }
} else acc
} }
log.debug(s"::: remapped configs $remappedConfigs") log.debug(s"::: remapped configs $remappedConfigs")
val configurations = rootModuleConfs map { conf0 => val configurations = rootModuleConfs map { conf0 =>