Skip to content

Commit d31c16d

Browse files
authored
support Java 22 (#144)
* support Java 22 * drop non-LTS Java versions from matrix * revert windows image * Revert "revert windows image" This reverts commit 11394f3. * update spotbugs * pin windows back
1 parent 2b6a6ca commit d31c16d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
matrix:
1919
os: [ubuntu-latest]
2020
java-distribution: [adopt]
21-
java-version: [8, 11, 15, 17]
21+
java-version: [8, 11, 17, 21, 22]
2222

2323
steps:
2424
- uses: actions/[email protected]
@@ -66,7 +66,7 @@ jobs:
6666
matrix:
6767
os: [ubuntu-latest]
6868
java-distribution: [adopt]
69-
java-version: [17]
69+
java-version: [21]
7070
dockcross-tag: ["20230116-670f7f7", "20240418-88c04a4", "latest"]
7171
dockcross-only: ["android-arm", "android-arm64", "linux-arm64", "linux-armv5", "linux-armv7", "linux-s390x", "linux-ppc64le", "linux-x64", "linux-x86", "windows-static-x64", "windows-static-x86"]
7272

@@ -101,7 +101,7 @@ jobs:
101101
# TODO: Windows pinned back
102102
os: [macos-latest, windows-2019]
103103
java-distribution: [adopt]
104-
java-version: [8, 11, 15, 17]
104+
java-version: [8, 11, 17, 21, 22]
105105

106106
steps:
107107
- uses: actions/[email protected]

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@
374374
<plugin>
375375
<groupId>com.github.spotbugs</groupId>
376376
<artifactId>spotbugs-maven-plugin</artifactId>
377-
<version>4.5.3.0</version>
377+
<version>4.8.5.0</version>
378378
</plugin>
379379
<plugin>
380380
<groupId>org.apache.maven.plugins</groupId>

src/main/c/h3-java/build-h3.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,9 @@ for image in $DOCKCROSS_IMAGES; do
217217
if [ -e $BUILD_ROOT/lib/libh3-java.dll ]; then cp $BUILD_ROOT/lib/libh3-java.dll $OUTPUT_ROOT ; fi
218218

219219
if $SYSTEM_PRUNE; then
220-
# Remove the image we just ran
221-
docker rmi dockcross/$image:$DOCKCROSS_TAG
222-
# Aggressively try to free more disk space
220+
# Aggressively try to free more disk space.
221+
# If this turns out to be more trouble, split running for different architectures
222+
# into different jobs.
223223
docker system prune --force --all
224224
docker system df
225225
rm $BUILD_ROOT/dockcross

0 commit comments

Comments
 (0)