From 46ac72ab40e4c9cd44417456d08e85c4aa3a8c6c Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 1 Aug 2012 09:32:48 -0400
Subject: [PATCH] version bumps

---
 project/Sbt.scala        | 3 ++-
 project/build.properties | 2 +-
 project/p.sbt            | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/project/Sbt.scala b/project/Sbt.scala
index 1dd1a4c6c..505623035 100644
--- a/project/Sbt.scala
+++ b/project/Sbt.scala
@@ -22,7 +22,7 @@ object Sbt extends Build
 		crossPaths := false,
 		concurrentRestrictions in Global += Util.testExclusiveRestriction,
 		testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
-		javacOptions in Compile ++= Seq("-target", "6", "-source", "6")
+		javacOptions in compile ++= Seq("-target", "6", "-source", "6")
 	)
 
 	lazy val myProvided = config("provided") intransitive;
@@ -200,6 +200,7 @@ object Sbt extends Build
 		compileInputs in (Compile,sxr) <<= (sources in sxr, compileInputs in sbtSub in Compile, fullClasspath in sxr) map { (srcs, in, cp) =>
 			in.copy(config = in.config.copy(sources = srcs, classpath = cp.files))
 		},
+		compileInputs in (Compile,doc) <<= (compileInputs in (Compile,sxr)).identity,
 		publishAll <<= inAll(nonRoots, publishLocal.task),
 		TaskKey[Unit]("build-all") <<= (publishAll, proguard in Proguard, sxr, doc) map { (_,_,_,_) => () }
 	)
diff --git a/project/build.properties b/project/build.properties
index 30b81bd04..a8c2f849b 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.0-M2
+sbt.version=0.12.0
diff --git a/project/p.sbt b/project/p.sbt
index d79f3b69b..6a00bc55c 100644
--- a/project/p.sbt
+++ b/project/p.sbt
@@ -1 +1 @@
-libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.5"
\ No newline at end of file
+libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.8"
\ No newline at end of file