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

update versions and build

This commit is contained in:
Mark Harrah 2010-06-21 21:25:48 -04:00
parent 0168aae0c6
commit 2df010a0f6
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.RC4
build.scala.versions=2.8.0.RC6

4
project/build/SbtProject.scala
View File

@ -26,7 +26,7 @@ abstract class SbtProject(info: ProjectInfo) extends DefaultProject(info) with t
// The output of scripted tasks executed in parallel will be inteleaved if false.
override def scriptedBufferLog = true
// Configure which versions of Scala to test against for those tests that do cross building
override def scriptedBuildVersions = "2.7.7 2.7.5 2.7.2 2.8.0.RC2 2.8.0.Beta1"
override def scriptedBuildVersions = "2.7.7 2.7.5 2.7.2 2.8.0.RC6 2.8.0.RC3"
override def useDefaultConfigurations = false
val default = Configurations.Default
@ -37,7 +37,7 @@ abstract class SbtProject(info: ProjectInfo) extends DefaultProject(info) with t
val srcConf = Configurations.Sources
//testing
val scalacheck = "org.scala-tools.testing" %% "scalacheck" % "1.6" % "test"
val scalacheck = "org.scala-tools.testing" %% "scalacheck" % "1.7" % "test"
val ivy = "org.apache.ivy" % "ivy" % "2.1.0" intransitive()
val jsch = "com.jcraft" % "jsch" % "0.1.31" intransitive()

12
project/build/XSbt.scala
View File

@ -13,7 +13,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
val apiSub = baseProject(compilePath / "api", "API", interfaceSub)
val controlSub = baseProject(utilPath / "control", "Control")
val collectionSub = baseProject(utilPath / "collection", "Collections")
val collectionSub = project(utilPath / "collection", "Collections", new CollectionsProject(_))
val ioSub = project(utilPath / "io", "IO", new IOProject(_), controlSub)
val classpathSub = baseProject(utilPath / "classpath", "Classpath")
val classfileSub = project(utilPath / "classfile", "Classfile", new ClassfileProject(_), ioSub, interfaceSub)
@ -26,6 +26,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
val testSub = project("scripted", "Test", new TestProject(_), ioSub)
val compileInterfaceSub = project(compilePath / "interface", "Compiler Interface", new CompilerInterfaceProject(_), interfaceSub)
val compileIncrementalSub = project(compilePath / "inc", "Incremental Compiler", new IncrementalProject(_), collectionSub, apiSub, ioSub)
val taskSub = project(tasksPath, "Tasks", new TaskProject(_), controlSub, collectionSub)
val cacheSub = project(cachePath, "Cache", new CacheProject(_), ioSub, collectionSub)
@ -86,8 +87,8 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
}
trait TestDependencies extends Project
{
val sc = "org.scala-tools.testing" % "scalacheck_2.8.0.RC3" % "1.7" % "test"
val sp = "org.scala-tools.testing" % "specs_2.8.0.RC3" % "1.6.5-SNAPSHOT" % "test"
val sc = "org.scala-tools.testing" %% "scalacheck" % "1.7" % "test"
val sp = "org.scala-tools.testing" %% "specs" % "1.6.5-SNAPSHOT" % "test"
val snaps = ScalaToolsSnapshots
}
class StandardTaskProject(info: ProjectInfo) extends Base(info)
@ -98,7 +99,8 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
{
val jline = jlineDep
}
class IncrementalProject(info: ProjectInfo) extends Base(info) with TestDependencies
class CollectionsProject(info: ProjectInfo) extends Base(info) with TestDependencies
class IOProject(info: ProjectInfo) extends Base(info) with TestDependencies
class TaskProject(info: ProjectInfo) extends Base(info) with TestDependencies
class ClassfileProject(info: ProjectInfo) extends Base(info) with TestDependencies
@ -204,7 +206,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
// each sub project here will add ~100k to the download
lazy val precompiled28 = precompiledSub("2.8.0.RC4")
lazy val precompiled28 = precompiledSub("2.8.0.RC6")
def precompiledSub(v: String) =
project(info.projectPath, "Precompiled " + v, new Precompiled(v)(_), cip.info.dependencies.toSeq : _* /*doesn't include subprojects of cip*/ )