Disambiguate old-style/new-style macro compiler plugin builds

3 files changed, 32 insertions, 34 deletions

diff --git a/stage2/plugins/Macroparadise.scala b/stage2/plugins/Macroparadise.scala
deleted file mode 100644
index 2b05c92..0000000
--- a/stage2/plugins/Macroparadise.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-package cbt
-import java.io.File
-
-trait Macroparadise extends BaseBuild{
-  def macroParadiseVersion = "3.0.0-M9"
-
-  override def scalacOptions = super.scalacOptions ++ Macroparadise.scalacOptions(
-    Macroparadise.dependencies( scalaVersion, macroParadiseVersion, context.cbtLastModified, context.paths.mavenCache ).jar
-  )
-}
-
-object Macroparadise{
-  def dependencies(
-    scalaVersion: String, macroParadiseVersion: String, cbtLastModified: Long, mavenCache: java.io.File
-  )(
-    implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache
-  ) =
-    MavenResolver( cbtLastModified, mavenCache, mavenCentral ).bindOne(
-      MavenDependency(
-        "org.scalameta", "paradise_"+scalaVersion, macroParadiseVersion
-      )
-    )
-
-  def scalacOptions( jarPath: File ) =
-    Seq(
-      "-Xplugin:" ++ jarPath.string,
-      "-Yrangepos",
-      "-Xplugin-require:macroparadise"
-    )
-}
-
diff --git a/stage2/plugins/NewStyleMacros.scala b/stage2/plugins/NewStyleMacros.scala
new file mode 100644
index 0000000..42b3287
--- /dev/null
+++ b/stage2/plugins/NewStyleMacros.scala
@@ -0,0 +1,29 @@
+package cbt
+import java.io.File
+
+trait NewStyleMacros extends BaseBuild{
+  def newStyleMacrosVersion = "3.0.0-M9"
+
+  override def scalacOptions = super.scalacOptions ++ NewStyleMacros.scalacOptions(
+    NewStyleMacros.dependencies( scalaVersion, newStyleMacrosVersion, context.cbtLastModified, context.paths.mavenCache ).jar
+  )
+}
+
+object NewStyleMacros{
+  def dependencies(
+    scalaVersion: String, newStyleMacrosVersion: String, cbtLastModified: Long, mavenCache: java.io.File
+  )(
+    implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache
+  ) =
+    MavenResolver( cbtLastModified, mavenCache, mavenCentral ).bindOne(
+      MavenDependency( "org.scalameta", "paradise_"+scalaVersion, newStyleMacrosVersion )
+    )
+
+  def scalacOptions( jarPath: File ) =
+    Seq(
+      "-Xplugin:" ++ jarPath.string,
+      "-Yrangepos",
+      "-Xplugin-require:macroparadise"
+    )
+}
+
diff --git a/stage2/plugins/ScalaParadise.scala b/stage2/plugins/OldStyleMacros.scala
index 28ee934..42719ea 100644
--- a/stage2/plugins/ScalaParadise.scala
+++ b/stage2/plugins/OldStyleMacros.scala
@@ -1,10 +1,10 @@
 package cbt
-trait ScalaParadise extends BaseBuild{
-  def scalaParadiseVersion = "2.1.0"
+trait OldStyleMacros extends BaseBuild{
+  def oldStyleMacrosVersion = "2.1.0"
 
   private def scalaParadiseDependency =
     Resolver( mavenCentral ).bindOne(
-      "org.scalamacros" % ("paradise_" ++ scalaVersion) % scalaParadiseVersion
+      "org.scalamacros" % ("paradise_" ++ scalaVersion) % oldStyleMacrosVersion
     )
 
   override def dependencies = (