luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update to Scala 2.8.1.RC1, Ivy 2.2.0-rc1 

use dependencies compiled against Scala 2.8.0
This commit is contained in:
Mark Harrah 2010-09-21 22:05:57 -04:00
parent 678628741a
commit a630aed777
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/Ivy.scala
View File

@ -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
{

2
launch/src/main/resources/sbt/sbt.boot.properties
View File

@ -1,5 +1,5 @@
[scala]
version: 2.8.0
version: 2.8.1.RC1
classifiers: read(scala.classifiers)[]
[app]

2
project/build.properties
View File

@ -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

10
project/build/XSbt.scala
View File

@ -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)