From f4792f77d6f12b34dea8885ddb996aa69a48187a Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 25 Apr 2016 05:45:48 -0400
Subject: [PATCH] Fix tests

---
 .../sbt-test/actions/aggregate/changes/build.sbt   |  2 +-
 .../actions/aggregate/project/Marker.scala         |  5 ++---
 sbt/src/sbt-test/actions/state/build.sbt           |  2 +-
 .../dependency-management/delegate/build.sbt       |  8 --------
 .../sbt-test/dependency-management/delegate/test   |  1 -
 sbt/src/sbt-test/project/delegates/build.sbt       | 14 --------------
 sbt/src/sbt-test/project/delegates/test            |  5 -----
 7 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 sbt/src/sbt-test/dependency-management/delegate/build.sbt
 delete mode 100644 sbt/src/sbt-test/dependency-management/delegate/test
 delete mode 100644 sbt/src/sbt-test/project/delegates/build.sbt
 delete mode 100644 sbt/src/sbt-test/project/delegates/test

diff --git a/sbt/src/sbt-test/actions/aggregate/changes/build.sbt b/sbt/src/sbt-test/actions/aggregate/changes/build.sbt
index d369e4f9c..6e31842b1 100644
--- a/sbt/src/sbt-test/actions/aggregate/changes/build.sbt
+++ b/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)
diff --git a/sbt/src/sbt-test/actions/aggregate/project/Marker.scala b/sbt/src/sbt-test/actions/aggregate/project/Marker.scala
index 91d73a39b..c4624579a 100644
--- a/sbt/src/sbt-test/actions/aggregate/project/Marker.scala
+++ b/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 {
diff --git a/sbt/src/sbt-test/actions/state/build.sbt b/sbt/src/sbt-test/actions/state/build.sbt
index 01c346e49..7b57aac9e 100644
--- a/sbt/src/sbt-test/actions/state/build.sbt
+++ b/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")
diff --git a/sbt/src/sbt-test/dependency-management/delegate/build.sbt b/sbt/src/sbt-test/dependency-management/delegate/build.sbt
deleted file mode 100644
index fd76508a0..000000000
--- a/sbt/src/sbt-test/dependency-management/delegate/build.sbt
+++ /dev/null
@@ -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"))
diff --git a/sbt/src/sbt-test/dependency-management/delegate/test b/sbt/src/sbt-test/dependency-management/delegate/test
deleted file mode 100644
index 73a68203f..000000000
--- a/sbt/src/sbt-test/dependency-management/delegate/test
+++ /dev/null
@@ -1 +0,0 @@
-> compile
\ No newline at end of file
diff --git a/sbt/src/sbt-test/project/delegates/build.sbt b/sbt/src/sbt-test/project/delegates/build.sbt
deleted file mode 100644
index a30926515..000000000
--- a/sbt/src/sbt-test/project/delegates/build.sbt
+++ /dev/null
@@ -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)
-  }
-}
diff --git a/sbt/src/sbt-test/project/delegates/test b/sbt/src/sbt-test/project/delegates/test
deleted file mode 100644
index 7420a5632..000000000
--- a/sbt/src/sbt-test/project/delegates/test
+++ /dev/null
@@ -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