aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamyar Mohajerani <kammoh@gmail.com>2019-12-13 09:52:30 -0500
committerKamyar Mohajerani <kammoh@gmail.com>2019-12-13 09:52:30 -0500
commit06e241af6fcbe1a1d4f12448c1c56ef9de12ab0d (patch)
tree562c025a940eb85d7db657ec7d9d2308f0b96e40
parentdee5c2e4b22f9693547f538b72a0dfd2cc052209 (diff)
downloadsbt-jni-06e241af6fcbe1a1d4f12448c1c56ef9de12ab0d.tar.gz
sbt-jni-06e241af6fcbe1a1d4f12448c1c56ef9de12ab0d.tar.bz2
sbt-jni-06e241af6fcbe1a1d4f12448c1c56ef9de12ab0d.zip
Modifications required for successful build
- publish macros subproject using same scalaVersions as everything else - fixed static method call on SearchPath interface - remove unused imports
-rw-r--r--build.sbt1
-rw-r--r--plugin/src/main/java/ch/jodersky/sbt/jni/javah/ClassPath.java4
-rw-r--r--plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniJavah.scala3
3 files changed, 3 insertions, 5 deletions
diff --git a/build.sbt b/build.sbt
index 7563831..c1a5c59 100644
--- a/build.sbt
+++ b/build.sbt
@@ -28,7 +28,6 @@ lazy val macros = (project in file("macros"))
.disablePlugins(ScriptedPlugin)
.settings(
name := "sbt-jni-macros",
- scalaVersion := scalaVersions.head,
crossScalaVersions := scalaVersions,
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided,
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
diff --git a/plugin/src/main/java/ch/jodersky/sbt/jni/javah/ClassPath.java b/plugin/src/main/java/ch/jodersky/sbt/jni/javah/ClassPath.java
index 47de2ee..22868ef 100644
--- a/plugin/src/main/java/ch/jodersky/sbt/jni/javah/ClassPath.java
+++ b/plugin/src/main/java/ch/jodersky/sbt/jni/javah/ClassPath.java
@@ -14,13 +14,13 @@ public class ClassPath implements SearchPath {
this.path = path.toAbsolutePath();
Path root = Utils.classPathRoot(path);
- roots = root == null ? Collections.emptyList() : multiReleaseRoots(root);
+ roots = root == null ? Collections.emptyList() : SearchPath.multiReleaseRoots(root);
}
@Override
public Path search(ClassName name) {
Objects.requireNonNull(name);
- return searchFromRoots(roots, name);
+ return SearchPath.searchFromRoots(roots, name);
}
@Override
diff --git a/plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniJavah.scala b/plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniJavah.scala
index 0c068ed..c7e9904 100644
--- a/plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniJavah.scala
+++ b/plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniJavah.scala
@@ -1,11 +1,10 @@
package ch.jodersky.sbt.jni
package plugins
-import java.nio.file.{Path, Paths}
+import java.nio.file.Paths
import collection.JavaConverters._
import util.BytecodeUtil
-import java.util
import sbt._
import sbt.Keys._