From 5e8e72a965847eace074c84098047f68f17a6bb7 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 16 May 2010 21:33:27 -0400
Subject: [PATCH] post-release bumps and changes

---
 project/build.properties             | 4 ++--
 project/build/SbtProject.scala       | 6 +++---
 project/build/Sxr.scala              | 5 ++---
 project/plugins/Plugins.scala        | 2 +-
 sbt/install/project/build.properties | 1 -
 5 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 sbt/install/project/build.properties

diff --git a/project/build.properties b/project/build.properties
index 0571f2e30..e606ce596 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,5 +1,5 @@
 project.organization=org.scala-tools.sbt
 project.name=xsbt
-sbt.version=0.7.3
-project.version=0.7.4
+sbt.version=0.7.4
+project.version=0.7.5-SNAPSHOT
 build.scala.versions=2.7.7
diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 00b90d08a..50e80d001 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -6,7 +6,7 @@ import sbt._
 import java.io.File
 import java.net.URL
 
-abstract class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtScripted with posterous.Publish// with Sxr
+abstract class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtScripted with posterous.Publish with Sxr
 {
 	/* Additional resources to include in the produced jar.*/
 	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"
@@ -26,7 +26,7 @@ abstract class SbtProject(info: ProjectInfo) extends DefaultProject(info) with t
 	//   The output of scripted tasks executed in parallel will be inteleaved if false.
 	override def scriptedBufferLog = true
 	// Configure which versions of Scala to test against for those tests that do cross building
-	override def scriptedCompatibility = sbt.test.CompatibilityLevel.Minimal
+	override def scriptedBuildVersions = "2.7.7 2.7.5 2.7.2 2.8.0.RC2 2.8.0.Beta1"
 
 	override def useDefaultConfigurations = false
 	val default = Configurations.Default
@@ -58,7 +58,7 @@ abstract class SbtProject(info: ProjectInfo) extends DefaultProject(info) with t
 	lazy val sbtDoc = packageTask(mainDocPath ##, packageDocsJar, Recursive) dependsOn(sbtGenDoc)
 	lazy val sbtSrc = packageTask(deepSources, packageSrcJar, packageOptions) dependsOn(compile)
 	
-	override def packageToPublishActions = super.packageToPublishActions //++ Seq(sbtSrc, sbtDoc) //sxr
+	override def packageToPublishActions = super.packageToPublishActions //++ Seq(sbtSrc, sbtDoc, sxr)
 	
 	override def packageDocsJar = defaultJarPath("-javadoc.jar")
 	override def packageSrcJar= defaultJarPath("-sources.jar")
diff --git a/project/build/Sxr.scala b/project/build/Sxr.scala
index 1ef11b9fa..f78ddac19 100644
--- a/project/build/Sxr.scala
+++ b/project/build/Sxr.scala
@@ -17,9 +17,8 @@ trait Sxr extends BasicScalaProject
 	lazy val sxr = task {
 		xsbt.FileUtilities.delete(sxrOutput +++ sxrClassesOutput getFiles)
 		xsbt.FileUtilities.createDirectory(sxrClassesOutput asFile)
-		val compiler = new xsbt.RawCompiler(buildScalaInstance, true, true, log)
-		// `Set() ++` is temporary.  getFiles returns immutable.Set in sbt 0.7.3.
-		compiler(Set() ++ deepSources.getFiles, Set() ++ compileClasspath.getFiles, sxrClassesOutput asFile, sxrOptions)
+		val compiler = new xsbt.RawCompiler(buildScalaInstance, xsbt.ClasspathOptions.auto, log)
+		compiler(deepSources.getFiles, compileClasspath.getFiles, sxrClassesOutput asFile, sxrOptions)
 		None
 	}
 }
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index 3a1e2f166..214bfc542 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -4,7 +4,7 @@ import java.net.URL
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "scripted" % "0.7.0"
+	val scripted = "org.scala-tools.sbt" % "scripted" % "0.7.4"
 	val t_repo = "t_repo" at "http://tristanhunt.com:8081/content/groups/public/"
 	val posterous = "net.databinder" % "posterous-sbt" % "0.1.4"
 	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
diff --git a/sbt/install/project/build.properties b/sbt/install/project/build.properties
deleted file mode 100644
index a5ef57355..000000000
--- a/sbt/install/project/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-project.version=0.3.1