From 38c7dc3bb8b81bebd7dc6a9e092cec0c10d30a9f Mon Sep 17 00:00:00 2001
From: Martin Egri <meg@speedledger.se>
Date: Tue, 13 Jun 2017 15:09:37 +0200
Subject: Disambiguate old-style/new-style macro compiler plugin builds

---
 stage2/plugins/Macroparadise.scala  | 31 -------------------------------
 stage2/plugins/NewStyleMacros.scala | 29 +++++++++++++++++++++++++++++
 stage2/plugins/OldStyleMacros.scala | 29 +++++++++++++++++++++++++++++
 stage2/plugins/ScalaParadise.scala  | 29 -----------------------------
 4 files changed, 58 insertions(+), 60 deletions(-)
 delete mode 100644 stage2/plugins/Macroparadise.scala
 create mode 100644 stage2/plugins/NewStyleMacros.scala
 create mode 100644 stage2/plugins/OldStyleMacros.scala
 delete mode 100644 stage2/plugins/ScalaParadise.scala

(limited to 'stage2/plugins')

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/OldStyleMacros.scala b/stage2/plugins/OldStyleMacros.scala
new file mode 100644
index 0000000..42719ea
--- /dev/null
+++ b/stage2/plugins/OldStyleMacros.scala
@@ -0,0 +1,29 @@
+package cbt
+trait OldStyleMacros extends BaseBuild{
+  def oldStyleMacrosVersion = "2.1.0"
+
+  private def scalaParadiseDependency =
+    Resolver( mavenCentral ).bindOne(
+      "org.scalamacros" % ("paradise_" ++ scalaVersion) % oldStyleMacrosVersion
+    )
+
+  override def dependencies = (
+    super.dependencies // don't forget super.dependencies here
+    ++ (
+      if(scalaVersion.startsWith("2.10."))
+        Seq(scalaParadiseDependency)
+      else
+        Seq()
+    )
+  )
+
+  override def scalacOptions = (
+    super.scalacOptions
+    ++ (
+      if(scalaVersion.startsWith("2.10."))
+        Seq("-Xplugin:"++scalaParadiseDependency.jar.string)
+      else
+        Seq()
+    )
+  )
+}
diff --git a/stage2/plugins/ScalaParadise.scala b/stage2/plugins/ScalaParadise.scala
deleted file mode 100644
index 28ee934..0000000
--- a/stage2/plugins/ScalaParadise.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-package cbt
-trait ScalaParadise extends BaseBuild{
-  def scalaParadiseVersion = "2.1.0"
-
-  private def scalaParadiseDependency =
-    Resolver( mavenCentral ).bindOne(
-      "org.scalamacros" % ("paradise_" ++ scalaVersion) % scalaParadiseVersion
-    )
-
-  override def dependencies = (
-    super.dependencies // don't forget super.dependencies here
-    ++ (
-      if(scalaVersion.startsWith("2.10."))
-        Seq(scalaParadiseDependency)
-      else
-        Seq()
-    )
-  )
-
-  override def scalacOptions = (
-    super.scalacOptions
-    ++ (
-      if(scalaVersion.startsWith("2.10."))
-        Seq("-Xplugin:"++scalaParadiseDependency.jar.string)
-      else
-        Seq()
-    )
-  )
-}
-- 
cgit v1.2.3