aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Bo <atryyang@thoughtworks.com>2016-06-16 16:41:24 +0800
committerYang Bo <atryyang@thoughtworks.com>2016-06-16 16:41:24 +0800
commit367bd323bc28a051f26559f82c5f94f0c40a1d83 (patch)
tree5f63ddb9eb7a4cb5aebbd6cb049a9953209f14a2
parente381a1c885cff05f93dadc89a182b81b02c63ff7 (diff)
downloadsbt-jni-367bd323bc28a051f26559f82c5f94f0c40a1d83.tar.gz
sbt-jni-367bd323bc28a051f26559f82c5f94f0c40a1d83.tar.bz2
sbt-jni-367bd323bc28a051f26559f82c5f94f0c40a1d83.zip
Backport to Scala 2.10
-rw-r--r--macros/src/main/scala/ch/jodersky/jni/annotations.scala7
-rw-r--r--project/SbtJniBuild.scala4
2 files changed, 7 insertions, 4 deletions
diff --git a/macros/src/main/scala/ch/jodersky/jni/annotations.scala b/macros/src/main/scala/ch/jodersky/jni/annotations.scala
index ffc262e..c1caa48 100644
--- a/macros/src/main/scala/ch/jodersky/jni/annotations.scala
+++ b/macros/src/main/scala/ch/jodersky/jni/annotations.scala
@@ -1,16 +1,17 @@
package ch.jodersky.jni
+import macrocompat.bundle
import util.PlatformMacros
import scala.language.experimental.macros
-
import scala.reflect.macros.whitebox.Context
import scala.annotation.StaticAnnotation
import scala.annotation.compileTimeOnly
-object nativeLoaderMacro {
+@bundle
+class nativeLoaderMacro(val c: Context) {
- def impl(c: Context)(annottees: c.Expr[Any]*): c.Expr[Any] = {
+ def impl(annottees: c.Expr[Any]*): c.Expr[Any] = {
import c.universe._
val nativeLibrary: String = c.prefix.tree match {
diff --git a/project/SbtJniBuild.scala b/project/SbtJniBuild.scala
index ee71b3c..0d72497 100644
--- a/project/SbtJniBuild.scala
+++ b/project/SbtJniBuild.scala
@@ -10,7 +10,7 @@ import com.typesafe.sbt.SbtScalariform.ScalariformKeys
object SbtJniBuild extends Build {
- val scalaVersions: Seq[String] = List("2.11.8", "2.12.0-M4")
+ val scalaVersions: Seq[String] = List("2.10.6", "2.11.8", "2.12.0-M4")
val macrosParadiseVersion = "2.1.0"
val commonSettings = Seq(
@@ -47,6 +47,8 @@ object SbtJniBuild extends Build {
scalaVersion := scalaVersions.head,
crossScalaVersions := scalaVersions,
addCompilerPlugin("org.scalamacros" % "paradise" % macrosParadiseVersion cross CrossVersion.full),
+ libraryDependencies += "org.typelevel" %% "macro-compat" % "1.1.1",
+ libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided,
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
)
)