Skip to content

Commit

Permalink
Modifications required for successful build
Browse files Browse the repository at this point in the history
- publish macros subproject using same scalaVersions as everything else
- fixed static method call on SearchPath interface
- remove unused imports
  • Loading branch information
kammoh committed Dec 13, 2019
1 parent dee5c2e commit 06e241a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/main/java/ch/jodersky/sbt/jni/javah/ClassPath.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ public ClassPath(Path path) {
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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._
Expand Down

0 comments on commit 06e241a

Please sign in to comment.