From 2ed574b30d6d37510a7d7df41d77cca04d9d5397 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 20 Feb 2011 15:40:29 -0500 Subject: [PATCH] fix unmanaged dependencies being excluded in certain cases --- main/Default.scala | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/main/Default.scala b/main/Default.scala index 9188a8057..6ad8fde41 100755 --- a/main/Default.scala +++ b/main/Default.scala @@ -658,19 +658,19 @@ object Classpaths visited.toSeq } def unmanagedDependencies0(projectRef: ProjectRef, project: Project, conf: Configuration, data: Settings[Scope]): Task[Classpath] = - interDependencies(projectRef, project, conf, data)(unmanagedLibs) + interDependencies(projectRef, project, conf, data, true, unmanagedLibs) def internalDependencies0(projectRef: ProjectRef, project: Project, conf: Configuration, data: Settings[Scope]): Task[Classpath] = - interDependencies(projectRef, project, conf, data)(products) - def interDependencies(projectRef: ProjectRef, project: Project, conf: Configuration, data: Settings[Scope])( + interDependencies(projectRef, project, conf, data, false, products) + def interDependencies(projectRef: ProjectRef, project: Project, conf: Configuration, data: Settings[Scope], includeSelf: Boolean, f: (ProjectRef, String, Settings[Scope]) => Task[Classpath]): Task[Classpath] = { val visited = interSort(projectRef, project, conf, data) - val productsTasks = asScalaSet(new LinkedHashSet[Task[Classpath]]) + val tasks = asScalaSet(new LinkedHashSet[Task[Classpath]]) for( (dep, c) <- visited ) - if( (dep != projectRef) || conf.name != c ) - productsTasks += f(dep, c, data) + if(includeSelf || (dep != projectRef) || conf.name != c ) + tasks += f(dep, c, data) - (productsTasks.toSeq.join).map(_.flatten) + (tasks.toSeq.join).map(_.flatten.distinct) } def mapped(confString: Option[String], masterConfs: Seq[String], depConfs: Seq[String], default: String, defaultMapping: String): String => Seq[String] =