From c1051f1f1ec37abc9c47ca5ed15284dd582b36e7 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 3 Dec 2012 08:56:55 -0500
Subject: [PATCH] Source dependency on sbinary for 2.10.0-RC* for now

---
 project/Sbt.scala  | 8 ++++----
 project/Util.scala | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/Sbt.scala b/project/Sbt.scala
index 60c8763db..e7f72b65d 100644
--- a/project/Sbt.scala
+++ b/project/Sbt.scala
@@ -16,7 +16,7 @@ object Sbt extends Build
 		organization := "org.scala-sbt",
 		version := "0.13.0-SNAPSHOT",
 		publishArtifact in packageDoc := false,
-		scalaVersion := "2.10.0-RC2",
+		scalaVersion := "2.10.0-RC3",
 		publishMavenStyle := false,
 		componentID := None,
 		crossPaths := false,
@@ -87,7 +87,7 @@ object Sbt extends Build
 		// Standard task system.  This provides map, flatMap, join, and more on top of the basic task model.
 	lazy val stdTaskSub = testedBaseProject(tasksPath / "standard", "Task System") dependsOn(taskSub % "compile;test->test", collectionSub, logSub, ioSub, processSub) settings( testExclusive )
 		// Persisted caching based on SBinary
-	lazy val cacheSub = baseProject(cachePath, "Cache") dependsOn(ioSub, collectionSub) settings(sbinary)
+	lazy val cacheSub = baseProject(cachePath, "Cache") dependsOn(ioSub, collectionSub, sbinary) // settings(sbinary)
 		// Builds on cache to provide caching for filesystem-related operations
 	lazy val trackingSub = baseProject(cachePath / "tracking", "Tracking") dependsOn(cacheSub, ioSub)
 		// Embedded Scala code runner
@@ -103,7 +103,7 @@ object Sbt extends Build
 		//   Defines the data structures for representing file fingerprints and relationships and the overall source analysis
 	lazy val compileIncrementalSub = testedBaseProject(compilePath / "inc", "Incremental Compiler") dependsOn(apiSub, ioSub, logSub, classpathSub, relationSub)
 		// Persists the incremental data structures using SBinary
-	lazy val compilePersistSub = baseProject(compilePath / "persist", "Persist") dependsOn(compileIncrementalSub, apiSub) settings(sbinary)
+	lazy val compilePersistSub = baseProject(compilePath / "persist", "Persist") dependsOn(compileIncrementalSub, apiSub, sbinary) // settings(sbinary)
 		// sbt-side interface to compiler.  Calls compiler-side interface reflectively
 	lazy val compilerSub = testedBaseProject(compilePath, "Compile") dependsOn(launchInterfaceSub, interfaceSub % "compile;test->test", logSub, ioSub, classpathSub, 
 		logSub % "test->test", launchSub % "test->test", apiSub % "test") settings( compilerSettings : _*)
@@ -125,7 +125,7 @@ object Sbt extends Build
 	lazy val commandSub = testedBaseProject(mainPath / "command", "Command") dependsOn(interfaceSub, ioSub, launchInterfaceSub, logSub, completeSub, classpathSub)
 		// Fixes scope=Scope for Setting (core defined in collectionSub) to define the settings system used in build definitions
 	lazy val mainSettingsSub = testedBaseProject(mainPath / "settings", "Main Settings") dependsOn(applyMacroSub, interfaceSub, ivySub, relationSub, logSub, ioSub, commandSub,
-		completeSub, classpathSub, stdTaskSub, processSub) settings( sbinary )
+		completeSub, classpathSub, stdTaskSub, processSub, sbinary) //settings( sbinary )
 
 		// The main integration project for sbt.  It brings all of the subsystems together, configures them, and provides for overriding conventions.
 	lazy val mainSub = testedBaseProject(mainPath, "Main") dependsOn(actionsSub, mainSettingsSub, interfaceSub, ioSub, ivySub, launchInterfaceSub, logSub, processSub, runSub, commandSub)
diff --git a/project/Util.scala b/project/Util.scala
index 90f0a0d8d..ed9023afd 100644
--- a/project/Util.scala
+++ b/project/Util.scala
@@ -147,7 +147,7 @@ object Common
 	lazy val ivy = lib("org.apache.ivy" % "ivy" % "2.3.0-rc1")
 	lazy val httpclient = lib("commons-httpclient" % "commons-httpclient" % "3.1")
 	lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.46" intransitive() )
-	lazy val sbinary = lib("org.scala-tools.sbinary" % "sbinary_2.10" % "0.4.0" )
+	lazy val sbinary = ProjectRef(uri("git://github.com/harrah/sbinary.git"), "core") //lib("org.scala-tools.sbinary" % "sbinary_2.10" % "0.4.0" )
 	lazy val scalaCompiler = libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ )
 }
 object Licensed