From 7f8b2b75c50859bf5f34923ec379c365efa1b6af Mon Sep 17 00:00:00 2001
From: JasperGeurtz <jcgeurtz@gmail.com>
Date: Fri, 3 Oct 2025 14:29:14 +0200
Subject: [PATCH 1/2] add support for java17+

---
 .github/workflows/maven.yml                  |  8 ++--
 pom.xml                                      | 45 ++++++++++++++++----
 src/main/java/bwapi/UnsafeTools.java         |  4 +-
 src/test/java/bwapi/ClientDataBenchmark.java | 11 +++--
 4 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 81e8782f..dfe66114 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -13,9 +13,11 @@ jobs:
     strategy:
       matrix:
         java:
-         - '8'
-         - '11'
-         #- '17'
+         # Java LTS versions
+         - '8'  # 2030/12
+         - '11' # 2032/01
+         - '17' # 2029/09
+         - '21' # 2031/09
     name: Java ${{ matrix.Java }} sample
     steps:
       - uses: actions/checkout@v2
diff --git a/pom.xml b/pom.xml
index 57fe027e..e8d38ca3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,8 +61,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
                 <configuration>
-<!--                    <parallel>all</parallel> &lt;!&ndash; Run tests in parallel&ndash;&gt;-->
-<!--                    <useUnlimitedThreads>true</useUnlimitedThreads>-->
                     <rerunFailingTestsCount>10</rerunFailingTestsCount>
                     <argLine>-Xms1g -Xmx1g</argLine>
                 </configuration>
@@ -107,6 +105,43 @@
         </plugins>
     </reporting>
 
+    <profiles>
+        <profile>
+            <id>java-12-plus-reflection</id>
+            <activation>
+                <jdk>[12,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <argLine> --add-opens java.base/java.nio=ALL-UNNAMED </argLine>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>run-benchmarks</id>
+                                <configuration>
+                                    <arguments>
+                                        <argument>--add-opens=java.base/java.nio=ALL-UNNAMED</argument>
+                                        <argument>-classpath</argument>
+                                        <classpath/>
+                                        <argument>org.openjdk.jmh.Main</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
     <dependencies>
         <dependency>
             <groupId>no.fiken.oss.junixsocket</groupId>
@@ -119,21 +154,18 @@
             <version>1.0.2</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna -->
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
             <version>5.12.1</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform -->
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna-platform</artifactId>
             <version>5.12.1</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/junit/junit -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -141,7 +173,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -149,7 +180,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -157,7 +187,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.openjdk.jmh -->
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
diff --git a/src/main/java/bwapi/UnsafeTools.java b/src/main/java/bwapi/UnsafeTools.java
index ec04219c..cd3e73a7 100644
--- a/src/main/java/bwapi/UnsafeTools.java
+++ b/src/main/java/bwapi/UnsafeTools.java
@@ -21,9 +21,7 @@ private static Object getOrCrash(final Class<?> className, final Object object,
             return result;
 
         } catch (final Exception e) { // or crash...
-            e.printStackTrace();
-            System.exit(-1);
-            return null;
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/src/test/java/bwapi/ClientDataBenchmark.java b/src/test/java/bwapi/ClientDataBenchmark.java
index 2734b4e6..52c98590 100644
--- a/src/test/java/bwapi/ClientDataBenchmark.java
+++ b/src/test/java/bwapi/ClientDataBenchmark.java
@@ -18,11 +18,12 @@ public static class EmptyState {
 
         @Setup(Level.Invocation)
         public void setup() {
+            WrappedBuffer wrappedBuffer = new WrappedBuffer(ClientData.GameData.SIZE);
             game = new Game();
-            game.botClientData().setBuffer(new WrappedBuffer(ClientData.GameData.SIZE));
+            game.botClientData().setBuffer(wrappedBuffer);
+            client = new Client(wrappedBuffer);
             strings = buildStrings();
         }
-
     }
 
     @State(Scope.Thread)
@@ -33,9 +34,11 @@ public static class FilledWithStrings {
 
         @Setup(Level.Invocation)
         public void setup() {
-            data = client.liveClientData().gameData();
+            WrappedBuffer wrappedBuffer = new WrappedBuffer(ClientData.GameData.SIZE);
             game = new Game();
-            game.botClientData().setBuffer(new WrappedBuffer(ClientData.GameData.SIZE));
+            game.botClientData().setBuffer(wrappedBuffer);
+            client = new Client(wrappedBuffer);
+            data = game.botClientData().gameData();
             String[] strings = buildStrings();
             for (String s : strings) {
                 GameDataUtils.addString(client.liveClientData().gameData(), s);

From ad6b4d893212fea5c5eecbdf075d493bb33ee778 Mon Sep 17 00:00:00 2001
From: JasperGeurtz <jcgeurtz@gmail.com>
Date: Fri, 3 Oct 2025 16:40:45 +0200
Subject: [PATCH 2/2] update dependency version

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index e8d38ca3..bf1e9928 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jmh.version>1.35</jmh.version>
+        <jmh.version>1.37</jmh.version>
     </properties>
 
     <build>
@@ -157,13 +157,13 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
-            <version>5.12.1</version>
+            <version>5.18.1</version>
         </dependency>
 
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna-platform</artifactId>
-            <version>5.12.1</version>
+            <version>5.18.1</version>
         </dependency>
 
         <dependency>
@@ -176,14 +176,14 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.12.4</version>
+            <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.23.1</version>
+            <version>3.27.6</version>
             <scope>test</scope>
         </dependency>