From 06e241af6fcbe1a1d4f12448c1c56ef9de12ab0d Mon Sep 17 00:00:00 2001 From: Kamyar Mohajerani Date: Fri, 13 Dec 2019 09:52:30 -0500 Subject: Modifications required for successful build - publish macros subproject using same scalaVersions as everything else - fixed static method call on SearchPath interface - remove unused imports --- build.sbt | 1 - plugin/src/main/java/ch/jodersky/sbt/jni/javah/ClassPath.java | 4 ++-- plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniJavah.scala | 3 +-- 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._ -- cgit v1.2.3