Skip to content

Commit

Permalink
support Java 22 (#144)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
isaacbrodsky authored Aug 12, 2024
1 parent 2b6a6ca commit d31c16d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
matrix:
os: [ubuntu-latest]
java-distribution: [adopt]
java-version: [8, 11, 15, 17]
java-version: [8, 11, 17, 21, 22]

steps:
- uses: actions/checkout@v2.1.1
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
matrix:
os: [ubuntu-latest]
java-distribution: [adopt]
java-version: [17]
java-version: [21]
dockcross-tag: ["20230116-670f7f7", "20240418-88c04a4", "latest"]
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"]

Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
# TODO: Windows pinned back
os: [macos-latest, windows-2019]
java-distribution: [adopt]
java-version: [8, 11, 15, 17]
java-version: [8, 11, 17, 21, 22]

steps:
- uses: actions/checkout@v2.1.1
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.5.3.0</version>
<version>4.8.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
6 changes: 3 additions & 3 deletions src/main/c/h3-java/build-h3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ for image in $DOCKCROSS_IMAGES; do
if [ -e $BUILD_ROOT/lib/libh3-java.dll ]; then cp $BUILD_ROOT/lib/libh3-java.dll $OUTPUT_ROOT ; fi

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

0 comments on commit d31c16d

Please sign in to comment.