diff --git a/compile/ScalaInstance.scala b/compile/ScalaInstance.scala index 3eae59b4f..31b608621 100644 --- a/compile/ScalaInstance.scala +++ b/compile/ScalaInstance.scala @@ -10,6 +10,7 @@ package xsbt final class ScalaInstance(val version: String, val loader: ClassLoader, val libraryJar: File, val compilerJar: File) extends NotNull { require(version.indexOf(' ') < 0, "Version cannot contain spaces (was '" + version + "')") + def jars = libraryJar :: compilerJar :: Nil /** Gets the version of Scala in the compiler.properties file from the loader. This version may be different than that given by 'version'*/ lazy val actualVersion = ScalaInstance.actualVersion(loader)(" version " + version) override def toString = "Scala instance{version label " + version + ", actual version " + actualVersion + ", library jar: " + libraryJar + ", compiler jar: " + compilerJar + "}" diff --git a/launch/src/main/resources/sbt/sbt.boot.properties b/launch/src/main/resources/sbt/sbt.boot.properties index ec0622c7d..43d6ae058 100644 --- a/launch/src/main/resources/sbt/sbt.boot.properties +++ b/launch/src/main/resources/sbt/sbt.boot.properties @@ -34,6 +34,6 @@ project.version: quick=set(1.0), new=prompt(Version)[1.0], fill=prompt(Version)[1.0] def.scala.version: quick=set(2.7.7), new=set(2.7.7), fill=set(2.7.7) build.scala.versions: quick=set(2.7.7), new=prompt(Scala version)[2.7.7], fill=prompt(Scala version)[2.7.7] - sbt.version: quick=set(0.6.13), new=prompt(sbt version)[0.6.13], fill=prompt(sbt version)[0.6.13] + sbt.version: quick=set(0.7.0), new=prompt(sbt version)[0.7.0], fill=prompt(sbt version)[0.7.0] project.scratch: quick=set(true) project.initialize: quick=set(true), new=set(true) \ No newline at end of file