From c2a1dfb910b45c149f50c7bcf9e18dfe625e38dc Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 28 Mar 2016 23:06:12 -0400
Subject: [PATCH] Port source-dependencies/macro-arg-dep-nested

---
 .../macro-arg-dep-nested/build.sbt            | 20 +++++++++++++
 .../macro-arg-dep-nested/project/build.scala  | 30 -------------------
 .../macro-arg-dep-nested/test                 |  2 +-
 3 files changed, 21 insertions(+), 31 deletions(-)
 create mode 100644 sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt
 delete mode 100644 sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/project/build.scala

diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt
new file mode 100644
index 000000000..17be9b032
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt
@@ -0,0 +1,20 @@
+val defaultSettings = Seq(
+  libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ )
+)
+
+lazy val root = (project in file(".")).
+  aggregate(macroProvider, macroClient).
+  settings(
+    defaultSettings
+  )
+
+lazy val macroProvider = (project in file("macro-provider")).
+  settings(
+    defaultSettings
+  )
+
+lazy val macroClient = (project in file("macro-client")).
+  dependsOn(macroProvider).
+  settings(
+    defaultSettings
+  )
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/project/build.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/project/build.scala
deleted file mode 100644
index ecc979eaa..000000000
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/project/build.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-import sbt._
-import Keys._
-import Import._
-
-object build extends Build {
-	val defaultSettings = Seq(
-		libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ ),
-		incOptions := incOptions.value.withNameHashing(true)
-	)
-
-	lazy val root = Project(
-	   base = file("."),
-	   id = "macro",
-	   aggregate = Seq(macroProvider, macroClient),
-	   settings = Defaults.defaultSettings ++ defaultSettings
-	)
-
-	lazy val macroProvider = Project(
-	   base = file("macro-provider"),
-	   id = "macro-provider",
-	   settings = Defaults.defaultSettings ++ defaultSettings
-	)
-
-	lazy val macroClient = Project(
-	   base = file("macro-client"),
-	   id = "macro-client",
-	   dependencies = Seq(macroProvider),
-	   settings = Defaults.defaultSettings ++ defaultSettings
-	)
-}
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/test b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/test
index 231939418..2f81b1965 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/test
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/test
@@ -6,7 +6,7 @@ $ copy-file macro-client/changes/Foo.scala macro-client/Foo.scala
 
 # we should recompile Foo.scala first and then fail to compile Client.scala due to missing
 # `Foo.str`
--> macro-client/compile
+-> macroClient/compile
 
 > clean