From 43521b79faaf2686b89274a9b0a94bf763aa989c Mon Sep 17 00:00:00 2001
From: Craig Macdonald <craig.macdonald@glasgow.ac.uk>
Date: Tue, 19 Sep 2023 11:32:44 +0800
Subject: [PATCH 1/6] adding java 20 to build matrix

---
 .github/workflows/push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index fc26969c..6e00daa9 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -18,7 +18,7 @@ jobs:
         java:
           - '8'
           - '11'
-          - '17'
+          - '20'
         os:
           - 'ubuntu-latest'
           - 'windows-latest'

From 1ccb9ef43dd28856789c07d9804768355e1d15e7 Mon Sep 17 00:00:00 2001
From: Craig Macdonald <craig.macdonald@glasgow.ac.uk>
Date: Tue, 19 Sep 2023 11:58:18 +0800
Subject: [PATCH 2/6] change to zulu which has JDK20 available

---
 .github/workflows/push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 6e00daa9..c033caaa 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -60,7 +60,7 @@ jobs:
       uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java }}
-        distribution: 'temurin'
+        distribution: 'zulu'
         architecture: ${{ matrix.architecture }}
 
     - name: (macOS) Setup test dependencies

From aca2d699f21d67f28d2b70441c3fae2f93dce242 Mon Sep 17 00:00:00 2001
From: Craig Macdonald <craig.macdonald@glasgow.ac.uk>
Date: Tue, 19 Sep 2023 12:12:46 +0800
Subject: [PATCH 3/6] building class files for version 8 is the oldest now
 supported by JDJ > 17

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 723783d1..43c24665 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <project>
-    <property name="ant.build.javac.source" value="1.7" />
-    <property name="ant.build.javac.target" value="1.7" />
+    <property name="ant.build.javac.source" value="8" />
+    <property name="ant.build.javac.target" value="8" />
 
     <target name="clean">
       <delete dir="build/classes"/>

From 2068ddb4962485f7ce632a811764f8d609279820 Mon Sep 17 00:00:00 2001
From: Craig Macdonald <craig.macdonald@glasgow.ac.uk>
Date: Tue, 19 Sep 2023 12:26:50 +0800
Subject: [PATCH 4/6] upgrade setup.py to java 8 too

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index d6e94494..012735b2 100644
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@ def getenv(key):
 def compile_native_invocation_handler(java):
     '''Find javac and compile NativeInvocationHandler.java.'''
     javac = java.get_javac()
-    source_level = '1.7'
+    source_level = '8'
     try:
         subprocess.check_call([
             javac, '-target', source_level, '-source', source_level,

From cdd361b5aa6059c4f769d65ee023c38db33382fe Mon Sep 17 00:00:00 2001
From: Craig Macdonald <craig.macdonald@glasgow.ac.uk>
Date: Tue, 19 Sep 2023 14:01:35 +0800
Subject: [PATCH 5/6] Exclude Java 20 for windows

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

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index c033caaa..a3d2c0fd 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -45,6 +45,8 @@ jobs:
         - os: windows-latest
           architecture: 'x86'
           python: 'pypy-3.9'
+        - os: windows-latest
+          java: '20'
 
     runs-on: ${{ matrix.os }}
     steps:

From d77371ab23d2d066cca7276fce76d16bf522ec8b Mon Sep 17 00:00:00 2001
From: Mirko Galimberti <me@mirkogalimberti.com>
Date: Sat, 23 Sep 2023 17:35:44 +0200
Subject: [PATCH 6/6] Switch back to temurin and skip windows-latest x86 java
 20

---
 .github/workflows/push.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index a3d2c0fd..e9a1467f 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -46,6 +46,7 @@ jobs:
           architecture: 'x86'
           python: 'pypy-3.9'
         - os: windows-latest
+          architecture: 'x86'
           java: '20'
 
     runs-on: ${{ matrix.os }}
@@ -62,7 +63,7 @@ jobs:
       uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java }}
-        distribution: 'zulu'
+        distribution: 'temurin'
         architecture: ${{ matrix.architecture }}
 
     - name: (macOS) Setup test dependencies