diff options
| author |  cushon <cushon@google.com> | 2017-04-04 16:52:04 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-04-05 15:17:15 +0200 |
| commit | 3ac77cb94a4cf1bd1993a97fe79f2005b2b1a711 (patch) | |
| tree | 11c80877c04e9e1d18817436f8b7a9f42a205ef7 /src/java_tools/buildjar | |
| parent | c3286110c1b8b76c3605c557f58549bb93ad820e (diff) | |
Avoid `Iterable<Path>`
The signature of setLocationFromPaths changes in JDK 9, see:
https://bugs.openjdk.java.net/browse/JDK-8150111
PiperOrigin-RevId: 152143259
Diffstat (limited to 'src/java_tools/buildjar')
| -rw-r--r-- | src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java index 1cd5584656..95f42ed6e1 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java @@ -19,7 +19,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.devtools.build.buildjar.InvalidCommandLineException; import com.google.devtools.build.buildjar.javac.FormattedDiagnostic.Listener; import com.google.devtools.build.buildjar.javac.plugins.BlazeJavaCompilerPlugin; @@ -37,6 +36,7 @@ import java.io.StringWriter; import java.net.URL; import java.net.URLClassLoader; import java.nio.file.Path; +import java.util.Collection; import java.util.List; import javax.tools.StandardLocation; @@ -170,8 +170,8 @@ public class BlazeJavacMain { StandardLocation.CLASS_OUTPUT, ImmutableList.of(arguments.classOutput())); fileManager.setLocationFromPaths(StandardLocation.SOURCE_PATH, arguments.sourcePath()); // TODO(cushon): require an explicit bootclasspath - Iterable<Path> bootClassPath = arguments.bootClassPath(); - if (!Iterables.isEmpty(bootClassPath)) { + Collection<Path> bootClassPath = arguments.bootClassPath(); + if (!bootClassPath.isEmpty()) { fileManager.setLocationFromPaths(StandardLocation.PLATFORM_CLASS_PATH, bootClassPath); } fileManager.setLocationFromPaths( |