From a630aed77708ca661f38ffce421b7d37b11d1e02 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Tue, 21 Sep 2010 22:05:57 -0400 Subject: [PATCH] update to Scala 2.8.1.RC1, Ivy 2.2.0-rc1 use dependencies compiled against Scala 2.8.0 --- ivy/Ivy.scala | 2 +- launch/src/main/resources/sbt/sbt.boot.properties | 2 +- project/build.properties | 2 +- project/build/XSbt.scala | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ivy/Ivy.scala b/ivy/Ivy.scala index d4b2c0a2f..1e0b59bf1 100644 --- a/ivy/Ivy.scala +++ b/ivy/Ivy.scala @@ -257,7 +257,7 @@ private object IvySbt javaMap(ea.extraAttributes) } private def javaMap(map: Map[String,String]) = - if(map.isEmpty) null else scala.collection.JavaConversions.asMap(map) + if(map.isEmpty) null else scala.collection.JavaConversions.asJavaMap(map) private object javaMap { diff --git a/launch/src/main/resources/sbt/sbt.boot.properties b/launch/src/main/resources/sbt/sbt.boot.properties index b00ef57e1..ec080d904 100644 --- a/launch/src/main/resources/sbt/sbt.boot.properties +++ b/launch/src/main/resources/sbt/sbt.boot.properties @@ -1,5 +1,5 @@ [scala] - version: 2.8.0 + version: 2.8.1.RC1 classifiers: read(scala.classifiers)[] [app] diff --git a/project/build.properties b/project/build.properties index e679b1265..ac5c68871 100644 --- a/project/build.properties +++ b/project/build.properties @@ -2,4 +2,4 @@ project.organization=org.scala-tools.sbt project.name=xsbt sbt.version=0.7.4 project.version=0.9.0-SNAPSHOT -build.scala.versions=2.8.0 +build.scala.versions=2.8.1.RC1 diff --git a/project/build/XSbt.scala b/project/build/XSbt.scala index f84a8e821..f1573c13f 100644 --- a/project/build/XSbt.scala +++ b/project/build/XSbt.scala @@ -85,7 +85,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-rc1" override def deliverProjectDependencies = Nil // defines the package that proguard operates on @@ -140,8 +140,8 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths } trait TestDependencies extends Project { - val sc = "org.scala-tools.testing" %% "scalacheck" % "1.7" % "test" - val sp = "org.scala-tools.testing" %% "specs" % "1.6.5" % "test" + val sc = "org.scala-tools.testing" % "scalacheck_2.8.0" % "1.7" % "test" + val sp = "org.scala-tools.testing" % "specs_2.8.0" % "1.6.5" % "test" } class LogProject(info: ProjectInfo) extends Base(info) with TestDependencies { @@ -154,7 +154,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths { // these compilation options are useful for debugging caches and task composition //override def compileOptions = super.compileOptions ++ List(Unchecked,ExplainTypes, CompileOption("-Xlog-implicits")) - val sbinary = "org.scala-tools.sbinary" %% "sbinary" % "0.3.1" + val sbinary = "org.scala-tools.sbinary" % "sbinary_2.8.0" % "0.3.1" } class Base(info: ProjectInfo) extends DefaultProject(info) with ManagedBase with Component with Licensed { @@ -183,7 +183,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-rc1" } abstract class BaseInterfaceProject(info: ProjectInfo) extends DefaultProject(info) with ManagedBase with TestWithLog with Component with JavaProject class InterfaceProject(info: ProjectInfo) extends BaseInterfaceProject(info)