aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorMartin Egri <meg@speedledger.se>2017-06-13 15:09:37 +0200
committerMartin Egri <meg@speedledger.se>2017-06-13 15:09:37 +0200
commit38c7dc3bb8b81bebd7dc6a9e092cec0c10d30a9f (patch)
tree7a0cdec601addcfe487d299dcad25dc85c3dd7e8 /examples
parent7d8d01dfb5dc934dc57f08d9e24be38c67270ea3 (diff)
downloadcbt-38c7dc3bb8b81bebd7dc6a9e092cec0c10d30a9f.tar.gz
cbt-38c7dc3bb8b81bebd7dc6a9e092cec0c10d30a9f.tar.bz2
cbt-38c7dc3bb8b81bebd7dc6a9e092cec0c10d30a9f.zip
Disambiguate old-style/new-style macro compiler plugin builds
Diffstat (limited to 'examples')
-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
3 files changed, 1 insertions, 1 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