Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable CI builds on JDK 21. #52

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable CI builds on JDK 21. #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11', '17' ]
java: [ '8', '11', '17', '21' ]
os: [ windows-2019 ]

steps:
Expand Down
4 changes: 2 additions & 2 deletions boot/src/test/java/org/netbeans/html/boot/impl/Compile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private Compile(String html, String code, String sl) throws IOException {
/** 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);
Expand Down Expand Up @@ -210,7 +210,7 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
}
};

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<>();

Expand Down
4 changes: 2 additions & 2 deletions geo/src/test/java/org/netbeans/html/geo/impl/Compile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private Compile(String html, String code, String sl) throws IOException {
/** 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);
Expand Down Expand Up @@ -202,7 +202,7 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
}
};

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[]>();

Expand Down
4 changes: 2 additions & 2 deletions json/src/test/java/net/java/html/json/Compile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private Compile(String html, String code, String sl) throws IOException {
/** 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);
Expand Down Expand Up @@ -225,7 +225,7 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
}
};

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[]>();

Expand Down
Loading