starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-06-29 08:46:22 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Support building with JDK 21 (#234)

Browse Source 
- Update google-java-format to a version compatible with JDK 21 and run "gw spotlessApply".
- Fix wrong test assumption
  JavaCodeGenerator writes a properties file using java.util.Properties,
  which doesn't guarantee order of entries.
- Fix most deprecation warnings
- Add CI job for JDK 21
This commit is contained in:
translatenix
2024-04-12 13:38:31 -07:00
committed by GitHub
parent f71323024c
commit 90b461aa58
13 changed files with 69 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkl-core/src/main/java/org/pkl/core/resource/ResourceReaders.java
+1 -2
View File
@@ -304,8 +304,7 @@ public final class ResourceReaders {
}
try {
var url = IoUtils.toUrl(uri);
var content = IoUtils.readBytes(url);
var content = IoUtils.readBytes(uri);
return Optional.of(new Resource(uri, content));
} catch (FileNotFoundException e) {
return Optional.empty();
pkl-core/src/main/java/org/pkl/core/util/IoUtils.java
+4 -4
View File
@@ -111,11 +111,11 @@ public final class IoUtils {
return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
}
public static byte[] readBytes(URL url) throws IOException {
if (HttpUtils.isHttpUrl(url)) {
throw new IllegalArgumentException("Should use HTTP client to GET " + url);
public static byte[] readBytes(URI uri) throws IOException {
if (HttpUtils.isHttpUrl(uri)) {
throw new IllegalArgumentException("Should use HTTP client to GET " + uri);
}
try (var stream = url.openStream()) {
try (var stream = IoUtils.toUrl(uri).openStream()) {
return stream.readAllBytes();
}
}