Skip to content

Prepare build for JDK24+ #1666

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

Merged
merged 2 commits into from
Apr 23, 2025
Merged

Prepare build for JDK24+ #1666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
803326c
Prepare build for JDK24+
matthiasblaesing Apr 22, 2025
d16df9c
Update test matrix:
matthiasblaesing Apr 23, 2025
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
7 changes: 2 additions & 5 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [8, 11, 17, 21, 23]
java: [8, 21, 24]
# macos-13 is x86, macos-latest is aarch64
os: [ubuntu-latest, macos-13, macos-latest]
include:
- java: 17
os: 'ubuntu-24.04-arm'
os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, macos-13]
# Run all tests even if one fails
fail-fast: false
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
Expand Down
4 changes: 4 additions & 0 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,6 +1235,10 @@ cd ..
<propertyref prefix="java.awt.headless"/>
</propertyset>
<junit fork="${test.fork}" forkmode="${test.forkmode}" failureproperty="testfailure" tempdir="${build}">
<!-- let JVM ignore unknown flags -->
<jvmarg value="-XX:+IgnoreUnrecognizedVMOptions" />
<!-- enable JNI on JDK 24+ -->
<jvmarg value="--enable-native-access=ALL-UNNAMED" />
<jvmarg if:set="test.jdwp" value="${test.jdwp}" />
<!-- optionally run headless -->
<syspropertyset refid="headless"/>
Expand Down
4 changes: 4 additions & 0 deletions contrib/platform/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,10 @@ com.sun.jna.platform.wince;version=&quot;${osgi.version}&quot;;uses:=&quot;com.s
<propertyref name="w32.ascii"/>
</propertyset>
<junit fork="${test.fork}" failureproperty="testfailure" tempdir="${build}">
<!-- let JVM ignore unknown flags -->
<jvmarg value="-XX:+IgnoreUnrecognizedVMOptions" />
<!-- enable JNI on JDK 24+ -->
<jvmarg value="--enable-native-access=ALL-UNNAMED" />
<jvmarg if:set="test.jdwp" value="${test.jdwp}" />
<!-- optionally run headless -->
<syspropertyset refid="headless"/>
Expand Down
Loading