From 4b7521550d17ea300bb95ff5050b3080169d8343 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 28 Mar 2016 22:43:44 -0400
Subject: [PATCH] Port source-dependencies/inherited-macros

---
 .../inherited-macros/build.sbt                | 21 +++++++++++++
 .../inherited-macros/project/build.scala      | 30 -------------------
 .../source-dependencies/inherited-macros/test |  6 ++--
 3 files changed, 24 insertions(+), 33 deletions(-)
 create mode 100644 sbt/src/sbt-test/source-dependencies/inherited-macros/build.sbt
 delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-macros/project/build.scala

diff --git a/sbt/src/sbt-test/source-dependencies/inherited-macros/build.sbt b/sbt/src/sbt-test/source-dependencies/inherited-macros/build.sbt
new file mode 100644
index 000000000..5ecf2dc5b
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/inherited-macros/build.sbt
@@ -0,0 +1,21 @@
+val defaultSettings = Seq(
+  libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ )//,
+  //incOptions := incOptions.value.withNameHashing(true)
+)
+
+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/inherited-macros/project/build.scala b/sbt/src/sbt-test/source-dependencies/inherited-macros/project/build.scala
deleted file mode 100644
index 59c3b10cb..000000000
--- a/sbt/src/sbt-test/source-dependencies/inherited-macros/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/inherited-macros/test b/sbt/src/sbt-test/source-dependencies/inherited-macros/test
index 9a6e7dfcf..4a755b5b2 100644
--- a/sbt/src/sbt-test/source-dependencies/inherited-macros/test
+++ b/sbt/src/sbt-test/source-dependencies/inherited-macros/test
@@ -1,11 +1,11 @@
-> macro-provider/compile
+> macroProvider/compile
 
-> macro-client/compile
+> macroClient/compile
 
 # Introduce a comment in Client, which inherits a macro from Provider
 $ copy-file changes/Client.scala macro-client/src/main/scala/Client.scala
 
-> macro-client/compile
+> macroClient/compile
 
 # Object Foo depends on Client via composition, thus a whitespace change to
 # Client shouldn't trigger its recompilation