From 2bf127aaf60ac7b18baf7151192138104d7fa1b5 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 20 Feb 2014 13:28:02 -0500
Subject: [PATCH] Make BuildDependencies construction a proper function outside
 of the settings sytem.

---
 main/src/main/scala/sbt/BuildUtil.scala | 14 ++++++++++++++
 main/src/main/scala/sbt/Defaults.scala  | 15 ++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/main/src/main/scala/sbt/BuildUtil.scala b/main/src/main/scala/sbt/BuildUtil.scala
index c48e721f7..dd963e05d 100644
--- a/main/src/main/scala/sbt/BuildUtil.scala
+++ b/main/src/main/scala/sbt/BuildUtil.scala
@@ -48,6 +48,20 @@ object BuildUtil
 		new BuildUtil(keyIndex, data, root, Load getRootProject units, getp, configs, aggregates)
 	}
 
+	def dependencies(units: Map[URI, LoadedBuildUnit]): BuildDependencies =
+	{
+			import collection.mutable.HashMap
+		val agg = new HashMap[ProjectRef, Seq[ProjectRef]]
+		val cp = new HashMap[ProjectRef, Seq[ClasspathDep[ProjectRef]]]
+		for(lbu <- units.values; rp <- lbu.defined.values)
+		{
+			val ref = ProjectRef(lbu.unit.uri, rp.id)
+			cp(ref) = rp.dependencies
+			agg(ref) = rp.aggregate
+		}
+		BuildDependencies(cp.toMap, agg.toMap)
+	}
+
 	def checkCycles(units: Map[URI, LoadedBuildUnit])
 	{
 		def getRef(pref: ProjectRef) = units(pref.build).defined(pref.project)
diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 5ca5a6356..cd651e21d 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -1254,19 +1254,8 @@ object Classpaths
 			if(useJars) Seq(pkgTask).join else psTask
 		}
 
-	def constructBuildDependencies: Initialize[BuildDependencies] =
-		loadedBuild { lb =>
-				import collection.mutable.HashMap
-			val agg = new HashMap[ProjectRef, Seq[ProjectRef]]
-			val cp = new HashMap[ProjectRef, Seq[ClasspathDep[ProjectRef]]]
-			for(lbu <- lb.units.values; rp <- lbu.defined.values)
-			{
-				val ref = ProjectRef(lbu.unit.uri, rp.id)
-				cp(ref) = rp.dependencies
-				agg(ref) = rp.aggregate
-			}
-			BuildDependencies(cp.toMap, agg.toMap)
-		}
+	def constructBuildDependencies: Initialize[BuildDependencies] = loadedBuild(lb => BuildUtil.dependencies(lb.units))
+
 	def internalDependencies: Initialize[Task[Classpath]] =
 		(thisProjectRef, classpathConfiguration, configuration, settingsData, buildDependencies) flatMap internalDependencies0
 	def unmanagedDependencies: Initialize[Task[Classpath]] =