diff options
-rw-r--r-- | examples/new-style-macros-example/Hello.scala (renamed from examples/macroparadise-example/Hello.scala) | 0 | ||||
-rw-r--r-- | examples/new-style-macros-example/build/build.scala (renamed from examples/macroparadise-example/build/build.scala) | 2 | ||||
-rw-r--r-- | examples/new-style-macros-example/macros/Main.scala (renamed from examples/macroparadise-example/macros/Main.scala) | 0 | ||||
-rw-r--r-- | stage2/plugins/Macroparadise.scala | 31 | ||||
-rw-r--r-- | stage2/plugins/NewStyleMacros.scala | 29 | ||||
-rw-r--r-- | stage2/plugins/OldStyleMacros.scala (renamed from stage2/plugins/ScalaParadise.scala) | 6 | ||||
-rw-r--r-- | test/test.scala | 2 |
7 files changed, 34 insertions, 36 deletions
diff --git a/examples/macroparadise-example/Hello.scala b/examples/new-style-macros-example/Hello.scala index 7e04dcb..7e04dcb 100644 --- a/examples/macroparadise-example/Hello.scala +++ b/examples/new-style-macros-example/Hello.scala diff --git a/examples/macroparadise-example/build/build.scala b/examples/new-style-macros-example/build/build.scala index 28fb206..2054aba 100644 --- a/examples/macroparadise-example/build/build.scala +++ b/examples/new-style-macros-example/build/build.scala @@ -1,7 +1,7 @@ package macroparadise_example_build import cbt._ -trait SharedSettings extends Macroparadise{ +trait SharedSettings extends NewStyleMacros{ override def defaultScalaVersion = "2.12.2" } diff --git a/examples/macroparadise-example/macros/Main.scala b/examples/new-style-macros-example/macros/Main.scala index ecdce34..ecdce34 100644 --- a/examples/macroparadise-example/macros/Main.scala +++ b/examples/new-style-macros-example/macros/Main.scala 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 = ( diff --git a/test/test.scala b/test/test.scala index 087bbd9..376d6bf 100644 --- a/test/test.scala +++ b/test/test.scala @@ -422,7 +422,7 @@ object Main{ } { - val res = runCbt("../examples/macroparadise-example", Seq("run")) + val res = runCbt("../examples/new-style-macros-example", Seq("run")) assert(res.exit0) assert(res.out.contains("hello, world!"), res.out) } |