From a15f50a22b0002016f88a0bf26b529a989ce1969 Mon Sep 17 00:00:00 2001
From: Olivia Appleton <olivia.kay.appleton@gmail.com>
Date: Tue, 13 Aug 2024 00:45:05 -0500
Subject: [PATCH] More java versions (will prune later)

---
 .github/workflows/java.yml | 49 +++++++++++++++++++++++++++++---------
 java/Makefile              |  3 +--
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 4fc3e1ce..becf02b0 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -15,31 +15,58 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest']
-        java-version: [8, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21]
+        version:
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
+        - 14
+        - 15
+        - 16
+        - 17
+        - 18
+        - 19
+        - 20
+        - 21
+        distribution:
+        - temurin
+        - zulu
+        - liberica
+        - microsoft
+        - corretto
+        - semeru
+        - oracle
+        - dragonwell
         include:
-          - os: windows-latest
-            java-version: 21
-          - os: macos-latest
-            java-version: 21
+        - os: windows-latest
+          version: 21
+          distribution: temurin
+        - os: macos-latest
+          version: 21
+          distribution: temurin
 
     runs-on: ${{ matrix.os }}
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
-        java-version: ${{ matrix.java-version }}
-        distribution: 'adopt'
+        java-version: ${{ matrix.version }}
+        distribution: ${{ matrix.distribution }}
+        cache: maven
+        cache-dependency-path: "java/pom.xml"
 
     - name: Run tests (serially)
-      if: ${{ matrix.java-version == 21 && matrix.os == 'ubuntu-latest' }}
+      if: ${{ matrix.version == 21 && matrix.os == 'ubuntu-latest' }}
       run: make ja_test
 
     - name: Run tests (in parallel)
-      if: ${{ matrix.java-version != 21 || matrix.os != 'ubuntu-latest' }}
+      if: ${{ matrix.version != 21 || matrix.os != 'ubuntu-latest' }}
       run: make ja_test_auto
 
     - name: Upload code coverage to Codecov
diff --git a/java/Makefile b/java/Makefile
index 396b2d21..7f88138d 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -21,8 +21,7 @@ target/jacoco.exec: ../LICENSE
 test: target/jacoco.exec
 	@$(MVN) $(MVN_FLAGS) test -Dtest.single
 
-test_auto: target/jacoco.exec
-	@$(MVN) $(MVN_FLAGS) test -T 1C
+test_auto: test_1C
 
 .PHONY: test_%
 test_%: target/jacoco.exec