From 89eada07c61c3b75eb7fe59fbf06da93536f25db Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Thu, 22 Jan 2026 13:41:51 -0500
Subject: [PATCH 1/5] chore: survey behavior of units with Java 17

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

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 9d3d9eccf4..4d125693bf 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11]
+        java: [8, 11, 17]
     env:
       # for gradle
       TERM: dumb

From 1328899fa0f131589578ff87c5ad72041c5bc692 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Thu, 22 Jan 2026 13:51:38 -0500
Subject: [PATCH 2/5] chore: try using gradle 9 only for java 17

---
 .github/workflows/unit-tests.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 4d125693bf..7390fa9df4 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -12,7 +12,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11, 17]
+        include:
+          - java: 8
+          - java: 11
+          - java: 17
+            gradle-version: 9.0
     env:
       # for gradle
       TERM: dumb
@@ -24,15 +28,10 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: ${{ matrix.java }}
-      - uses: actions/cache@v4
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
         with:
-          path: |
-            ~/.m2/repository
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          gradle-version: ${{ matrix.gradle-version || 'wrapper' }}
       - name: Run tests
         run: |
-          ./gradlew clean build jacocoTestReport --stacktrace
+          gradle clean build jacocoTestReport --stacktrace

From 9dea26adf837f873e3d338ac88b0d26219e33d9f Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Thu, 22 Jan 2026 13:52:46 -0500
Subject: [PATCH 3/5] chore: restore cache for maven

---
 .github/workflows/unit-tests.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 7390fa9df4..6d7eae3991 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -28,6 +28,13 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: ${{ matrix.java }}
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-m2-
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
         with:

From 9241c8b473a84e9db306540c7cc7ef11258bff21 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Thu, 22 Jan 2026 13:55:20 -0500
Subject: [PATCH 4/5] chore: use specific gradle versions

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

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 6d7eae3991..5d8c5e5feb 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -14,9 +14,11 @@ jobs:
       matrix:
         include:
           - java: 8
+            gradle-version: 6.9.2
           - java: 11
+            gradle-version: 6.9.2
           - java: 17
-            gradle-version: 9.0
+            gradle-version: 9.2.1
     env:
       # for gradle
       TERM: dumb
@@ -38,7 +40,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: ${{ matrix.gradle-version || 'wrapper' }}
+          gradle-version: ${{ matrix.gradle-version }}
       - name: Run tests
         run: |
           gradle clean build jacocoTestReport --stacktrace

From 801612e998598f213bc184d5b869aaab31f559fe Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Thu, 22 Jan 2026 14:13:29 -0500
Subject: [PATCH 5/5] chore: enable debug mode for gradle test execution

Added --debug flag to gradle test command for detailed output.
---
 .github/workflows/unit-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 5d8c5e5feb..fc290befc3 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -43,4 +43,4 @@ jobs:
           gradle-version: ${{ matrix.gradle-version }}
       - name: Run tests
         run: |
-          gradle clean build jacocoTestReport --stacktrace
+          gradle clean build jacocoTestReport --stacktrace --debug