diff options
author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-06-13 11:24:39 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-13 11:24:39 -0400 |
commit | 00840fe6888b231c70e95ecf6feaeba89b42e218 (patch) | |
tree | 7a0cdec601addcfe487d299dcad25dc85c3dd7e8 /stage2 | |
parent | ace672254b31d7e6203b0c5a22f1c4e6dfe13f42 (diff) | |
parent | 38c7dc3bb8b81bebd7dc6a9e092cec0c10d30a9f (diff) | |
download | cbt-00840fe6888b231c70e95ecf6feaeba89b42e218.tar.gz cbt-00840fe6888b231c70e95ecf6feaeba89b42e218.tar.bz2 cbt-00840fe6888b231c70e95ecf6feaeba89b42e218.zip |
Merge pull request #515 from megri/master
Rudimentary Macroparadise plugin
Diffstat (limited to 'stage2')
-rw-r--r-- | stage2/plugins/NewStyleMacros.scala | 29 | ||||
-rw-r--r-- | stage2/plugins/OldStyleMacros.scala (renamed from stage2/plugins/ScalaParadise.scala) | 6 |
2 files changed, 32 insertions, 3 deletions
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 = ( |