This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit 37a6fb81ee3aaf2edd4e3a8be981800ec2b34986 Author: Jaroslav Tulach <[email protected]> AuthorDate: Tue Dec 31 06:22:49 2024 +0100 Give up on -source 1.7 in order to run on JDK 21 easily --- .github/workflows/linux.yml | 2 +- .github/workflows/mac.yml | 2 +- .github/workflows/windows.yml | 2 +- boot/src/test/java/org/netbeans/html/boot/impl/Compile.java | 4 ++-- geo/src/test/java/org/netbeans/html/geo/impl/Compile.java | 4 ++-- json/src/test/java/net/java/html/json/Compile.java | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d32641eb..3bb5a022 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [ '8', '11', '17' ] + java: [ '8', '11', '17', '21' ] os: [ ubuntu-20.04 ] steps: diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index f61f742d..4d78c435 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [ '8', '11', '17' ] + java: [ '8', '11', '17', '21' ] os: [ macos-10.15 ] steps: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 90723fae..bdde66a9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [ '8', '11', '17' ] + java: [ '8', '11', '17', '21' ] os: [ windows-2019 ] steps: diff --git a/boot/src/test/java/org/netbeans/html/boot/impl/Compile.java b/boot/src/test/java/org/netbeans/html/boot/impl/Compile.java index 849a1eb4..a5584793 100644 --- a/boot/src/test/java/org/netbeans/html/boot/impl/Compile.java +++ b/boot/src/test/java/org/netbeans/html/boot/impl/Compile.java @@ -71,7 +71,7 @@ final class Compile implements DiagnosticListener<JavaFileObject> { /** Performs compilation of given HTML page and associated Java code */ public static Compile create(String html, String code) throws IOException { - return create(html, code, "1.7"); + return create(html, code, "8"); } static Compile create(String html, String code, String sourceLevel) throws IOException { return new Compile(html, code, sourceLevel); @@ -210,7 +210,7 @@ final class Compile implements DiagnosticListener<JavaFileObject> { } }; - ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", "1.7"), null, Arrays.asList(file)).call(); + ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", sourceLevel), null, Arrays.asList(file)).call(); Map<String, byte[]> result = new HashMap<>(); diff --git a/geo/src/test/java/org/netbeans/html/geo/impl/Compile.java b/geo/src/test/java/org/netbeans/html/geo/impl/Compile.java index b2d19f41..6f207a5c 100644 --- a/geo/src/test/java/org/netbeans/html/geo/impl/Compile.java +++ b/geo/src/test/java/org/netbeans/html/geo/impl/Compile.java @@ -70,7 +70,7 @@ final class Compile implements DiagnosticListener<JavaFileObject> { /** Performs compilation of given HTML page and associated Java code */ public static Compile create(String html, String code) throws IOException { - return create(html, code, "1.7"); + return create(html, code, "8"); } static Compile create(String html, String code, String sourceLevel) throws IOException { return new Compile(html, code, sourceLevel); @@ -202,7 +202,7 @@ final class Compile implements DiagnosticListener<JavaFileObject> { } }; - ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", "1.7"), null, Arrays.asList(file)).call(); + ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", sourceLevel), null, Arrays.asList(file)).call(); Map<String, byte[]> result = new HashMap<String, byte[]>(); diff --git a/json/src/test/java/net/java/html/json/Compile.java b/json/src/test/java/net/java/html/json/Compile.java index c759e8e2..7ca2c4d6 100644 --- a/json/src/test/java/net/java/html/json/Compile.java +++ b/json/src/test/java/net/java/html/json/Compile.java @@ -70,7 +70,7 @@ final class Compile implements DiagnosticListener<JavaFileObject> { /** Performs compilation of given HTML page and associated Java code */ public static Compile create(String html, String code) throws IOException { - return create(html, code, "1.7"); + return create(html, code, "8"); } static Compile create(String html, String code, String sourceLevel) throws IOException { return new Compile(html, code, sourceLevel); @@ -225,7 +225,7 @@ final class Compile implements DiagnosticListener<JavaFileObject> { } }; - ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", "1.7"), null, Arrays.asList(file)).call(); + ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", sourceLevel), null, Arrays.asList(file)).call(); Map<String, byte[]> result = new HashMap<String, byte[]>(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
