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

Revert to using 2.8.1

This commit is contained in:
Mark Harrah 2011-05-30 17:49:39 -04:00
parent 1169e7790d
commit f786060883
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compile/Eval.scala
View File

@ -114,7 +114,7 @@ final class Eval(optionsNoncp: Seq[String], classpath: Seq[File], mkReporter: Se
Nil, Nil,
List(Nil), List(Nil),
TypeTree(), TypeTree(),
Block(List(Apply(Select(Super(This(emptyTypeName), emptyTypeName), nme.CONSTRUCTOR), Nil)), Literal(Constant(()))) Block(List(Apply(Select(Super(emptyTypeName, emptyTypeName), nme.CONSTRUCTOR), Nil)), Literal(Constant(())))
) )
def method = DefDef(NoMods, WrapValName, Nil, Nil, tpt, tree) def method = DefDef(NoMods, WrapValName, Nil, Nil, tpt, tree)

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

@ -1,5 +1,5 @@
[scala] [scala]
version: 2.9.0-1 version: 2.8.1
[app] [app]
org: org.scala-tools.sbt org: org.scala-tools.sbt

2
project/build.properties
View File

@ -2,4 +2,4 @@ project.organization=org.scala-tools.sbt
project.name=xsbt project.name=xsbt
sbt.version=0.7.7 sbt.version=0.7.7
project.version=0.9.10-SNAPSHOT project.version=0.9.10-SNAPSHOT
build.scala.versions=2.9.0-1 build.scala.versions=2.8.1

8
project/build/XSbt.scala
View File

@ -147,8 +147,8 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
} }
trait TestDependencies extends Project trait TestDependencies extends Project
{ {
val sc = "org.scala-tools.testing" % "scalacheck_2.9.0" % "1.8" % "test" val sc = "org.scala-tools.testing" %% "scalacheck" % "1.8" % "test"
val sp = "org.scala-tools.testing" % "specs_2.9.0" % "1.6.8" % "test" val sp = "org.scala-tools.testing" %% "specs" % "1.6.8" % "test"
} }
class LogProject(info: ProjectInfo) extends Base(info) with TestDependencies class LogProject(info: ProjectInfo) extends Base(info) with TestDependencies
{ {
@ -164,7 +164,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
{ {
// these compilation options are useful for debugging caches and task composition // these compilation options are useful for debugging caches and task composition
//override def compileOptions = super.compileOptions ++ List(Unchecked,ExplainTypes, CompileOption("-Xlog-implicits")) //override def compileOptions = super.compileOptions ++ List(Unchecked,ExplainTypes, CompileOption("-Xlog-implicits"))
val sbinary = "org.scala-tools.sbinary" % "sbinary_2.9.0" % "0.4.0" val sbinary = "org.scala-tools.sbinary" %% "sbinary" % "0.4.0"
} }
class Base(info: ProjectInfo) extends DefaultProject(info) with ManagedBase with Component with Licensed class Base(info: ProjectInfo) extends DefaultProject(info) with ManagedBase with Component with Licensed
{ {
@ -271,7 +271,7 @@ 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 // 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 // each sub project here will add ~100k to the download
lazy val precompiled28 = precompiledSub("2.8.1") lazy val precompiled29 = precompiledSub("2.9.0")
lazy val precompiled27 = precompiledSub("2.7.7") lazy val precompiled27 = precompiledSub("2.7.7")
def precompiledSub(v: String) = def precompiledSub(v: String) =