diff --git a/launch/src/main/resources/sbt/sbt.boot.properties b/launch/src/main/resources/sbt/sbt.boot.properties index 851660002d..8d2ee02895 100644 --- a/launch/src/main/resources/sbt/sbt.boot.properties +++ b/launch/src/main/resources/sbt/sbt.boot.properties @@ -33,7 +33,7 @@ project.name: quick=set(test), new=prompt(Name), fill=prompt(Name) project.organization: new=prompt(Organization) project.version: quick=set(1.0), new=prompt(Version)[1.0], fill=prompt(Version)[1.0] - build.scala.versions: quick=set(2.7.7), new=prompt(Scala version)[2.7.7], fill=prompt(Scala version)[2.7.7] + build.scala.versions: quick=set(2.8.0), new=prompt(Scala version)[2.8.0], fill=prompt(Scala version)[2.8.0] sbt.version: quick=set(0.7.4), new=prompt(sbt version)[0.7.4], fill=prompt(sbt version)[0.7.4] project.scratch: quick=set(true) project.initialize: quick=set(true), new=set(true) diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala index 5b3b9d3a7f..477b7303cd 100644 --- a/project/build/SbtProject.scala +++ b/project/build/SbtProject.scala @@ -39,7 +39,7 @@ abstract class SbtProject(info: ProjectInfo) extends DefaultProject(info) with t //testing val scalacheck = "org.scala-tools.testing" %% "scalacheck" % "1.6" % "test" - val ivy = "org.apache.ivy" % "ivy" % "2.1.0" intransitive() + val ivy = "org.apache.ivy" % "ivy" % "2.2.0" intransitive() val jsch = "com.jcraft" % "jsch" % "0.1.31" intransitive() val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "optional" val jettyplus = "org.mortbay.jetty" % "jetty-plus" % "6.1.14" % "optional" diff --git a/project/build/XSbt.scala b/project/build/XSbt.scala index 8438981887..2c91c7cff3 100644 --- a/project/build/XSbt.scala +++ b/project/build/XSbt.scala @@ -62,7 +62,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths class LaunchProject(info: ProjectInfo) extends Base(info) with TestWithIO with TestDependencies with ProguardLaunch with NoCrossPaths { val jline = jlineDep - val ivy = "org.apache.ivy" % "ivy" % "2.1.0" + val ivy = "org.apache.ivy" % "ivy" % "2.2.0" override def deliverProjectDependencies = Nil // defines the package that proguard operates on @@ -120,7 +120,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths } class IvyProject(info: ProjectInfo) extends Base(info) with TestWithIO with TestWithLog with TestWithLaunch { - val ivy = "org.apache.ivy" % "ivy" % "2.1.0" + val ivy = "org.apache.ivy" % "ivy" % "2.2.0" } abstract class BaseInterfaceProject(info: ProjectInfo) extends DefaultProject(info) with ManagedBase with TestWithLog with Component with JavaProject class InterfaceProject(info: ProjectInfo) extends BaseInterfaceProject(info) @@ -193,7 +193,8 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths // sub projects for each version of Scala to precompile against other than the one sbt is built against // each sub project here will add ~100k to the download - lazy val precompiled28 = precompiledSub("2.8.0.RC2") + lazy val precompiled280 = precompiledSub("2.8.0") + lazy val precompiled281 = precompiledSub("2.8.1.RC2") def precompiledSub(v: String) = project(info.projectPath, "Precompiled " + v, new Precompiled(v)(_), cip.info.dependencies.toSeq : _* /*doesn't include subprojects of cip*/ )