From 90ad8f0c536acb966478a937bb1784d2ab1e3bb6 Mon Sep 17 00:00:00 2001
From: Matthew Haughton <3flex@users.noreply.github.com>
Date: Fri, 15 Sep 2023 00:06:43 +1000
Subject: [PATCH 1/2] Run CI using current LTS Java versions (8, 11, 17)

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c940420f..43efbf3e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     if: ${{ needs.check_duplicate_workflows.outputs.should_skip != 'true' }}
     strategy:
       matrix:
-        java: [ '8', '11', '16' ]
+        java: [ '8', '11', '17' ]
         platform: ['windows-latest', 'ubuntu-latest']
     steps:
     - uses: actions/checkout@v3
@@ -54,7 +54,7 @@ jobs:
     needs: [build]
     strategy:
       matrix:
-        java: [ '8', '11', '16' ]
+        java: [ '8', '11', '17' ]
         platform: ['windows-latest', 'ubuntu-latest']
     steps:
       - uses: actions/checkout@v3

From 81cb8fc9d13dc994ba7dd304624c932ad28c6975 Mon Sep 17 00:00:00 2001
From: Matthew Haughton <3flex@users.noreply.github.com>
Date: Fri, 15 Sep 2023 00:07:28 +1000
Subject: [PATCH 2/2] Stop setting unnecessary JVM arguments

---
 .github/workflows/ci.yml | 20 --------------------
 build.gradle             | 16 ----------------
 2 files changed, 36 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43efbf3e..d8e5bb6f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,16 +35,6 @@ jobs:
         cache: 'gradle'
     - name: print Java version
       run: java -version
-    - name: Set JVM options for JDK 16
-      if: ${{ matrix.java == 16 }}
-      run: echo org.gradle.jvmargs="--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" >> gradle.properties
     - name: Run build
       run: ./gradlew clean assemble --info
 
@@ -68,16 +58,6 @@ jobs:
           cache: 'gradle'
       - name: print Java version
         run: java -version
-      - name: Set JVM options for JDK 16
-        if: ${{ matrix.java == 16 }}
-        run: echo org.gradle.jvmargs="--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" >> gradle.properties
       - name: Run test
         run: ./gradlew check --info
 
diff --git a/build.gradle b/build.gradle
index d1699357..04bbe754 100644
--- a/build.gradle
+++ b/build.gradle
@@ -156,20 +156,4 @@ subprojects {
     }
 
     sourceCompatibility = 1.8
-
-    if (JavaVersion.current() >= JavaVersion.VERSION_16) {
-        test {
-            jvmArgs = [
-                    "--illegal-access=permit",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
-            ]
-        }
-    }
 }