Skip to content

Commit 0bc0ff5

Browse files
fmeumcopybara-github
authored andcommitted
Make Java runfiles library compilable with JDK 8
The `FileReader(String,Charset)` constructor is not available in Java 8. Fixes bazelbuild#16849 Work towards bazelbuild#16124 Closes bazelbuild#16851. PiperOrigin-RevId: 491310720 Change-Id: I26f7bce346038d10285b0a1ee7b29216ba151010
1 parent 3b4e5ec commit 0bc0ff5

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

tools/java/runfiles/Runfiles.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import java.io.BufferedReader;
1818
import java.io.File;
1919
import java.io.FileInputStream;
20-
import java.io.FileReader;
2120
import java.io.IOException;
2221
import java.io.InputStreamReader;
2322
import java.lang.ref.SoftReference;
@@ -410,7 +409,9 @@ private static Map<Preloaded.RepoMappingKey, String> loadRepositoryMapping(Strin
410409
return Collections.emptyMap();
411410
}
412411

413-
try (BufferedReader r = new BufferedReader(new FileReader(path, StandardCharsets.UTF_8))) {
412+
try (BufferedReader r =
413+
new BufferedReader(
414+
new InputStreamReader(new FileInputStream(path), StandardCharsets.UTF_8))) {
414415
return Collections.unmodifiableMap(
415416
r.lines()
416417
.filter(line -> !line.isEmpty())

0 commit comments

Comments
 (0)