From 10c737ae2085b6015a7e3993917c620c4a774ba8 Mon Sep 17 00:00:00 2001
From: jvican <jorgevc@fastmail.es>
Date: Tue, 23 May 2017 23:54:22 +0200
Subject: [PATCH] Move to `core-macros` and depend on it

---
 build.sbt                                                      | 3 +--
 .../main/scala/sbt/internal/util/appmacro/ContextUtil.scala    | 0
 .../src/main/scala/sbt/internal/util/appmacro/Convert.scala    | 0
 .../src/main/scala/sbt/internal/util/appmacro/Instance.scala   | 0
 .../main/scala/sbt/internal/util/appmacro/KListBuilder.scala   | 0
 .../main/scala/sbt/internal/util/appmacro/MixedBuilder.scala   | 0
 .../main/scala/sbt/internal/util/appmacro/TupleBuilder.scala   | 0
 .../main/scala/sbt/internal/util/appmacro/TupleNBuilder.scala  | 0
 8 files changed, 1 insertion(+), 2 deletions(-)
 rename {internal/util-appmacro => core-macros}/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala (100%)
 rename {internal/util-appmacro => core-macros}/src/main/scala/sbt/internal/util/appmacro/Convert.scala (100%)
 rename {internal/util-appmacro => core-macros}/src/main/scala/sbt/internal/util/appmacro/Instance.scala (100%)
 rename {internal/util-appmacro => core-macros}/src/main/scala/sbt/internal/util/appmacro/KListBuilder.scala (100%)
 rename {internal/util-appmacro => core-macros}/src/main/scala/sbt/internal/util/appmacro/MixedBuilder.scala (100%)
 rename {internal/util-appmacro => core-macros}/src/main/scala/sbt/internal/util/appmacro/TupleBuilder.scala (100%)
 rename {internal/util-appmacro => core-macros}/src/main/scala/sbt/internal/util/appmacro/TupleNBuilder.scala (100%)

diff --git a/build.sbt b/build.sbt
index 675ac0e8e..33a4cde61 100644
--- a/build.sbt
+++ b/build.sbt
@@ -261,14 +261,13 @@ lazy val coreMacrosProj = (project in file("core-macros"))
 
 // Fixes scope=Scope for Setting (core defined in collectionProj) to define the settings system used in build definitions
 lazy val mainSettingsProj = (project in file("main-settings"))
-  .dependsOn(commandProj, stdTaskProj)
+  .dependsOn(commandProj, stdTaskProj, coreMacrosProj)
   .settings(
     testedBaseSettings,
     name := "Main Settings"
   )
   .configure(
     addSbtUtilCache,
-    addSbtUtilApplyMacro,
     addSbtCompilerInterface,
     addSbtUtilRelation,
     addSbtUtilLogging,
diff --git a/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala b/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
similarity index 100%
rename from internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
rename to core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
diff --git a/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/Convert.scala b/core-macros/src/main/scala/sbt/internal/util/appmacro/Convert.scala
similarity index 100%
rename from internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/Convert.scala
rename to core-macros/src/main/scala/sbt/internal/util/appmacro/Convert.scala
diff --git a/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/Instance.scala b/core-macros/src/main/scala/sbt/internal/util/appmacro/Instance.scala
similarity index 100%
rename from internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/Instance.scala
rename to core-macros/src/main/scala/sbt/internal/util/appmacro/Instance.scala
diff --git a/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/KListBuilder.scala b/core-macros/src/main/scala/sbt/internal/util/appmacro/KListBuilder.scala
similarity index 100%
rename from internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/KListBuilder.scala
rename to core-macros/src/main/scala/sbt/internal/util/appmacro/KListBuilder.scala
diff --git a/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/MixedBuilder.scala b/core-macros/src/main/scala/sbt/internal/util/appmacro/MixedBuilder.scala
similarity index 100%
rename from internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/MixedBuilder.scala
rename to core-macros/src/main/scala/sbt/internal/util/appmacro/MixedBuilder.scala
diff --git a/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/TupleBuilder.scala b/core-macros/src/main/scala/sbt/internal/util/appmacro/TupleBuilder.scala
similarity index 100%
rename from internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/TupleBuilder.scala
rename to core-macros/src/main/scala/sbt/internal/util/appmacro/TupleBuilder.scala
diff --git a/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/TupleNBuilder.scala b/core-macros/src/main/scala/sbt/internal/util/appmacro/TupleNBuilder.scala
similarity index 100%
rename from internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/TupleNBuilder.scala
rename to core-macros/src/main/scala/sbt/internal/util/appmacro/TupleNBuilder.scala