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

Fixes #1711. Fixes cached resolution pulling in % "test" from subproj deps

This commit is contained in:
Eugene Yokota 2014-11-04 17:56:34 -05:00
parent 4815fc6d69
commit b60bd95d73
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,8 +54,10 @@ private[sbt] class CachedResolutionResolveCache() {
def expandInternalDeps(dep: DependencyDescriptor): Vector[DependencyDescriptor] =
prOpt map {
_.getModuleDescriptor(dep.getDependencyRevisionId) match {
case Some(internal) => directDependencies(internal) flatMap expandInternalDeps
case _ => Vector(dep)
case Some(internal) => directDependencies(internal) filter { dd =>
!dd.getDependencyConfigurations("compile").isEmpty
} flatMap expandInternalDeps
case _ => Vector(dep)
}
} getOrElse Vector(dep)
val expanded = directDependencies(md0) flatMap expandInternalDeps