diff options
| author | Jakob Odersky <jakob@odersky.com> | 2019-06-15 15:36:47 +0200 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2019-06-15 17:10:12 +0200 |
| commit | 0be325d533af3c5d4f9af70bce495da6047f6c3a (patch) | |
| tree | 9257057a8553285daaeb24130c37c29965f96e4d /plugin | |
| parent | 7807a34943927fd94b51d15d9452af88330d3e99 (diff) | |
| download | sbt-jni-0be325d533af3c5d4f9af70bce495da6047f6c3a.tar.gz sbt-jni-0be325d533af3c5d4f9af70bce495da6047f6c3a.tar.bz2 sbt-jni-0be325d533af3c5d4f9af70bce495da6047f6c3a.zip | |
Add support for Scala 2.13 and drop support for 2.10
Diffstat (limited to 'plugin')
4 files changed, 17 insertions, 6 deletions
diff --git a/plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniLoad.scala b/plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniLoad.scala index 9f88dbb..0518024 100644 --- a/plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniLoad.scala +++ b/plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniLoad.scala @@ -13,9 +13,20 @@ object JniLoad extends AutoPlugin { // Macro Paradise plugin and dependencies are needed to expand annotation macros. // Once expanded however, downstream projects don't need these dependencies anymore // (hence the "Provided" configuration). - addCompilerPlugin( - "org.scalamacros" % "paradise" % ProjectVersion.MacrosParadise cross CrossVersion.full - ), + libraryDependencies ++= { + CrossVersion.partialVersion(scalaVersion.value) match { + case Some((2, n)) if n >= 13 => Seq() + case _ => Seq( + compilerPlugin("org.scalamacros" % "paradise" % ProjectVersion.MacrosParadise cross CrossVersion.full) + ) + } + }, + Compile / scalacOptions ++= { + CrossVersion.partialVersion(scalaVersion.value) match { + case Some((2, n)) if n >= 13 => Seq("-Ymacro-annotations") + case _ => Seq() + } + }, resolvers += Resolver.jcenterRepo, libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided, libraryDependencies += "ch.jodersky" %% "sbt-jni-macros" % ProjectVersion.Macros % Provided diff --git a/plugin/src/sbt-test/sbt-jni/simple/build.sbt b/plugin/src/sbt-test/sbt-jni/simple/build.sbt index b6ee91b..e2d73d0 100644 --- a/plugin/src/sbt-test/sbt-jni/simple/build.sbt +++ b/plugin/src/sbt-test/sbt-jni/simple/build.sbt @@ -4,7 +4,7 @@ lazy val root = (project in file(".")). aggregate(core, native) lazy val core = (project in file("core")). - settings(libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.2" % "test"). + settings(libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % "test"). settings(target in javah := (sourceDirectory in nativeCompile in native).value / "include"). dependsOn(native % Runtime) diff --git a/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala b/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala index b3d7c70..d5d1d6e 100644 --- a/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala +++ b/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala @@ -8,7 +8,7 @@ object ScriptedHelper extends AutoPlugin { override def projectSettings = Seq( scalacOptions ++= Seq("-feature", "-deprecation"), - crossScalaVersions := Seq("2.12.4", "2.11.12", "2.10.6"), + crossScalaVersions := Seq("2.13.0", "2.12.8", "2.11.12"), scalaVersion := crossScalaVersions.value.head ) diff --git a/plugin/src/sbt-test/sbt-jni/simple/project/build.properties b/plugin/src/sbt-test/sbt-jni/simple/project/build.properties index 31334bb..d6e3507 100644 --- a/plugin/src/sbt-test/sbt-jni/simple/project/build.properties +++ b/plugin/src/sbt-test/sbt-jni/simple/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.1 +sbt.version=1.1.6 |