From c1246d6fc30c8a71f0f20788af85f99b7b3b384c Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Tue, 29 Mar 2016 00:12:38 -0400
Subject: [PATCH] Port actions/reload

---
 sbt/src/sbt-test/actions/reload/build.sbt            | 10 ++++++++++
 .../sbt-test/actions/reload/changes/Changed.scala    |  8 --------
 sbt/src/sbt-test/actions/reload/changes/changed.sbt  |  4 ++++
 sbt/src/sbt-test/actions/reload/external/build.sbt   |  4 ++++
 .../actions/reload/external/project/Ext.scala        |  9 ---------
 .../actions/reload/project/TestProject.scala         | 12 ------------
 sbt/src/sbt-test/actions/reload/test                 |  2 +-
 7 files changed, 19 insertions(+), 30 deletions(-)
 create mode 100755 sbt/src/sbt-test/actions/reload/build.sbt
 delete mode 100755 sbt/src/sbt-test/actions/reload/changes/Changed.scala
 create mode 100755 sbt/src/sbt-test/actions/reload/changes/changed.sbt
 create mode 100755 sbt/src/sbt-test/actions/reload/external/build.sbt
 delete mode 100755 sbt/src/sbt-test/actions/reload/external/project/Ext.scala
 delete mode 100755 sbt/src/sbt-test/actions/reload/project/TestProject.scala

diff --git a/sbt/src/sbt-test/actions/reload/build.sbt b/sbt/src/sbt-test/actions/reload/build.sbt
new file mode 100755
index 000000000..955ea4615
--- /dev/null
+++ b/sbt/src/sbt-test/actions/reload/build.sbt
@@ -0,0 +1,10 @@
+lazy val root = (project in file(".")).
+  aggregate(sub).
+  settings(
+    TaskKey[Unit]("f") := sys.error("f")
+  )
+
+lazy val sub = (project in file("sub")).
+  settings(
+    TaskKey[Unit]("f") := {}
+  )
diff --git a/sbt/src/sbt-test/actions/reload/changes/Changed.scala b/sbt/src/sbt-test/actions/reload/changes/Changed.scala
deleted file mode 100755
index e3bdec504..000000000
--- a/sbt/src/sbt-test/actions/reload/changes/Changed.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-import sbt._
-import Import._
-
-object TestBuild extends Build
-{
-	lazy val root1 = Project("root1", file(".")) dependsOn(root2)
-	lazy val root2 = ProjectRef(uri("external"), "root2")
-}
diff --git a/sbt/src/sbt-test/actions/reload/changes/changed.sbt b/sbt/src/sbt-test/actions/reload/changes/changed.sbt
new file mode 100755
index 000000000..fbffa92c3
--- /dev/null
+++ b/sbt/src/sbt-test/actions/reload/changes/changed.sbt
@@ -0,0 +1,4 @@
+lazy val root1 = (project in file(".")).
+  aggregate(root2)
+
+lazy val root2 = ProjectRef(uri("external"), "root2")
diff --git a/sbt/src/sbt-test/actions/reload/external/build.sbt b/sbt/src/sbt-test/actions/reload/external/build.sbt
new file mode 100755
index 000000000..b2c185fb2
--- /dev/null
+++ b/sbt/src/sbt-test/actions/reload/external/build.sbt
@@ -0,0 +1,4 @@
+lazy val root2 = (project in file("root2")).
+  settings(
+    TaskKey[Unit]("g") := {}
+  )
diff --git a/sbt/src/sbt-test/actions/reload/external/project/Ext.scala b/sbt/src/sbt-test/actions/reload/external/project/Ext.scala
deleted file mode 100755
index b8a512f7e..000000000
--- a/sbt/src/sbt-test/actions/reload/external/project/Ext.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-import sbt._
-import Import._
-
-object Ext extends Build
-{
-	lazy val root2 = Project("root2", file("root2")) settings(
-		TaskKey[Unit]("g") := {}
-	)
-}
diff --git a/sbt/src/sbt-test/actions/reload/project/TestProject.scala b/sbt/src/sbt-test/actions/reload/project/TestProject.scala
deleted file mode 100755
index ccfe73cae..000000000
--- a/sbt/src/sbt-test/actions/reload/project/TestProject.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-import sbt._
-import Import._
-
-object TestBuild extends Build
-{
-	lazy val root = Project("root", file("."), aggregate = Seq(sub)) settings(
-		TaskKey[Unit]("f") := sys.error("f")
-	)
-	lazy val sub = Project("sub", file("sub")) settings(
-		TaskKey[Unit]("f") := {}
-	)
-}
diff --git a/sbt/src/sbt-test/actions/reload/test b/sbt/src/sbt-test/actions/reload/test
index 0e8bb10b2..04351a33e 100755
--- a/sbt/src/sbt-test/actions/reload/test
+++ b/sbt/src/sbt-test/actions/reload/test
@@ -6,7 +6,7 @@
 > f
 > reload
 > f
-$ copy-file changes/Changed.scala project/TestProject.scala
+$ copy-file changes/changed.sbt build.sbt
 > reload
 -> f
 > project {external}root2