Bump versions

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@824 d89573ee-9141-11dd-94d4-bdf5e562f29c

project/build.properties

@@ -2,6 +2,6 @@
 #Thu Jun 25 20:59:30 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool Parent
-sbt.version=0.4.6
-project.version=0.5
+sbt.version=0.5
+project.version=0.5.1
 scala.version=2.7.2

project/build/src/CrossCompileProject.scala

@@ -5,7 +5,7 @@ import scala.xml.NodeSeq
 
 /** Support for compiling sbt across multiple versions of Scala.  The scala compiler is run in a
 * separate JVM and no partial compilation is done.*/
-abstract class CrossCompileProject extends BasicScalaProject
+abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScalaPaths
 {
 	/** Used for 2.8.0-SNAPSHOT*/
 	val scalaToolsSnapshots = "Scala Tools Snapshots" at "http://scala-tools.org/repo-snapshots"

project/build/src/SbtProject.scala

@@ -26,11 +26,11 @@ class SbtProject(info: ProjectInfo) extends ParentProject(info)
 
 protected class MainProject(val info: ProjectInfo) extends CrossCompileProject
 {
-	override def mainScalaSources =
-		if(Project.currentScalaVersion.map(_.startsWith("2.8")).getOrElse(false)) // cannot compile against test libraries currently
-			Path.lazyPathFinder { super.mainScalaSources.get.filter(_.asFile.getName.endsWith("TestFrameworkImpl.scala")) }
+	override def mainSources =
+		if(ScalaVersion.currentString.startsWith("2.8")) // cannot compile against test libraries currently
+			Path.lazyPathFinder { super.mainSources.get.filter(!_.asFile.getName.endsWith("TestFrameworkImpl.scala")) }
 		else
-			super.mainScalaSources
+			super.mainSources
 	override def defaultJarBaseName = "sbt_" + version.toString
 	/** Additional resources to include in the produced jar.*/
 	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"