From b60bd95d7363f143690e87d1a330d8724c938c7f Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 4 Nov 2014 17:56:34 -0500 Subject: [PATCH] Fixes #1711. Fixes cached resolution pulling in % "test" from subproj deps --- .../scala/sbt/ivyint/CachedResolutionResolveEngine.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ivy/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala b/ivy/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala index 88dd4241c..fa8361c95 100644 --- a/ivy/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala +++ b/ivy/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala @@ -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