From d31c16dc441b9a5f6961fba88e0dfae4e12aa808 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@isaacbrodsky.com>
Date: Sun, 11 Aug 2024 17:05:18 -0700
Subject: [PATCH] support Java 22 (#144)

* support Java 22

* drop non-LTS Java versions from matrix

* revert windows image

* Revert "revert windows image"

This reverts commit 11394f3b234634d90802cc22c0b6413e2cc24ae0.

* update spotbugs

* pin windows back
---
 .github/workflows/tests.yml    | 6 +++---
 pom.xml                        | 2 +-
 src/main/c/h3-java/build-h3.sh | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f77a083..b281759 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -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
@@ -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"]
 
@@ -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
diff --git a/pom.xml b/pom.xml
index 7ec1d13..3c4b373 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/c/h3-java/build-h3.sh b/src/main/c/h3-java/build-h3.sh
index 883b60d..0d56cc4 100755
--- a/src/main/c/h3-java/build-h3.sh
+++ b/src/main/c/h3-java/build-h3.sh
@@ -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