diff --git a/compile/src/test/scala/TestCompile.scala b/compile/src/test/scala/TestCompile.scala index 63519b0ab..0f6913227 100644 --- a/compile/src/test/scala/TestCompile.scala +++ b/compile/src/test/scala/TestCompile.scala @@ -8,7 +8,7 @@ package compiler object TestCompile { - def allVersions = List("2.8.1", "2.9.0-1") + def allVersions = List("2.8.1", "2.9.0-1", "2.8.0") /** Tests running the compiler interface with the analyzer plugin with a test callback. The test callback saves all information * that the plugin sends it for post-compile analysis by the provided function.*/ def apply[T](scalaVersion: String, sources: Seq[File], outputDirectory: File, options: Seq[String]) diff --git a/project/Sbt.scala b/project/Sbt.scala index 1937276df..9812294d3 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -72,7 +72,7 @@ object Sbt extends Build /***** Intermediate-level Modules *****/ // Apache Ivy integration - lazy val ivySub = baseProject(file("ivy"), "Ivy") dependsOn(interfaceSub, launchInterfaceSub, logSub % "compile;test->test", ioSub % "compile;test->test", launchSub % "test->test") settings(ivy, jsch, httpclient, excludeJUnit) + lazy val ivySub = baseProject(file("ivy"), "Ivy") dependsOn(interfaceSub, launchInterfaceSub, logSub % "compile;test->test", ioSub % "compile;test->test", launchSub % "test->test") settings(ivy, jsch, httpclient) // Runner for uniform test interface lazy val testingSub = baseProject(file("testing"), "Testing") dependsOn(ioSub, classpathSub, logSub) settings(libraryDependencies += "org.scala-tools.testing" % "test-interface" % "0.5") @@ -120,7 +120,7 @@ object Sbt extends Build // Strictly for bringing implicits and aliases from subsystems into the top-level sbt namespace through a single package object // technically, we need a dependency on all of mainSub's dependencies, but we don't do that since this is strictly an integration project // with the sole purpose of providing certain identifiers without qualification (with a package object) - lazy val sbtSub = baseProject(sbtPath, "Simple Build Tool") dependsOn(mainSub, scriptedSbtSub % "test->test") settings(sbtSettings : _*) + lazy val sbtSub = baseProject(sbtPath, "Simple Build Tool") dependsOn(mainSub, compileInterfaceSub, precompiled29, scriptedSbtSub % "test->test") settings(sbtSettings : _*) /* Nested subproject paths */ def sbtPath = file("sbt") @@ -198,6 +198,7 @@ object Sbt extends Build libraryDependencies <+= scalaVersion( "org.scala-lang" % "scala-compiler" % _ % "provided"), libraryDependencies += jlineDep artifacts(Artifact("jline", Map("e:component" -> srcID))) ) + // def compileInterfaceSettings: Seq[Setting[_]] = precompiledSettings ++ Seq( exportJars := true, artifact in packageSrc := Artifact(srcID) extra("e:component" -> srcID)