Fix tests

sbt/src/sbt-test/actions/aggregate/changes/build.sbt

@@ -1,5 +1,5 @@
 lazy val root = (project in file(".")).
-  aggregate((if(file("aggregate").exists) Seq(sub: sbt.ProjectReference) else Nil): _*)
+  aggregateSeq((if(file("aggregate").exists) Seq(sub: sbt.ProjectReference) else Nil))
 
 lazy val sub = (project in file("sub")).
   aggregate(sub2)

sbt/src/sbt-test/actions/aggregate/project/Marker.scala

@@ -1,10 +1,9 @@
 import sbt._
 import Keys._
 import Import._
-import Project.Initialize
+import Def.Initialize
 
-object Marker extends AutoPlugin
-{
+object Marker extends AutoPlugin {
   override def trigger = allRequirements
   override def requires = sbt.plugins.JvmPlugin
   object autoImport {

sbt/src/sbt-test/actions/state/build.sbt

@@ -2,7 +2,7 @@ import Import._
 import complete.Parser
 import complete.DefaultParsers._
 import sbinary.DefaultProtocol._
-import Project.Initialize
+import Def.Initialize
 
 val keep = TaskKey[Int]("keep")
 val persisted = TaskKey[Int]("persist")

sbt/src/sbt-test/dependency-management/delegate/build.sbt

@@ -1,8 +0,0 @@
-lazy val root = (project in file(".")).
-  aggregate(logic, ui)
-
-lazy val logic = (project in file("logic")).
-  delegateTo(LocalProject("root"))
-
-lazy val ui = (project in file("ui")).
-  delegateTo(LocalProject("root"))

sbt/src/sbt-test/dependency-management/delegate/test

@@ -1 +0,0 @@
-> compile

sbt/src/sbt-test/project/delegates/build.sbt

@@ -1,14 +0,0 @@
-import complete.DefaultParsers._
-
-val check = InputKey[Unit]("check-max-errors")
-
-lazy val root = (project in file("."))
-lazy val sub = (project in file("sub")).
-  delegateTo(root).
-  settings(check <<= checkTask)
-
-lazy val checkTask = InputTask(_ => Space ~> NatBasic) { result =>
-  (result, maxErrors) map { (i, max)  =>
-    if(i != max) sys.error("Expected max-errors to be " + i + ", but it was " + max)
-  }
-}

sbt/src/sbt-test/project/delegates/test

@@ -1,5 +0,0 @@
-> sub/check-max-errors 100
-> set maxErrors := 17
-> sub/check-max-errors 17
-> set maxErrors in LocalProject("sub") := 13
-> sub/check-max-errors 13