From de23d8f21f49e4d7a5b5572ac1416d13f2ddc5e8 Mon Sep 17 00:00:00 2001
From: tanya732 <sinha.tanya26@gmail.com>
Date: Fri, 3 Jan 2025 18:21:41 +0530
Subject: [PATCH 1/4] add java 21 in CI

---
 .github/workflows/build-and-test.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index f86ed60e..32886d68 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -9,12 +9,17 @@ on:
 jobs:
   gradle:
     runs-on:  ubuntu-latest
+
+    strategy:
+      matrix:
+        java-version: [11, 17, 21]
+
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: ${{ matrix.java-version }}
       - uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c
         with:
           arguments: assemble apiDiff check jacocoTestReport --continue --console=plain

From 9e04f118db4f3356e673aa981be95a56f8ddf84d Mon Sep 17 00:00:00 2001
From: tanya732 <sinha.tanya26@gmail.com>
Date: Fri, 3 Jan 2025 18:25:53 +0530
Subject: [PATCH 2/4] added java 21

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

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 32886d68..5ca24522 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [11, 17, 21]
+        java-version: [11, 21]
 
     steps:
       - uses: actions/checkout@v3

From cc705395f5099d09a8a33a0ea35c87915e38aa66 Mon Sep 17 00:00:00 2001
From: tanya732 <sinha.tanya26@gmail.com>
Date: Fri, 17 Jan 2025 10:27:38 +0530
Subject: [PATCH 3/4] added java 21 tests

---
 .github/workflows/build-and-test.yml |  7 +------
 lib/build.gradle                     | 11 +++++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 5ca24522..f86ed60e 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -9,17 +9,12 @@ on:
 jobs:
   gradle:
     runs-on:  ubuntu-latest
-
-    strategy:
-      matrix:
-        java-version: [11, 21]
-
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: ${{ matrix.java-version }}
+          java-version: 11
       - uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c
         with:
           arguments: assemble apiDiff check jacocoTestReport --continue --console=plain
diff --git a/lib/build.gradle b/lib/build.gradle
index aa134c32..77de85a7 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -154,9 +154,20 @@ def testJava17 = tasks.register('testJava17', Test) {
     shouldRunAfter(tasks.named('test'))
 }
 
+def testJava21 = tasks.register('testJava21', Test) {
+    description = 'Runs unit tests on Java 21.'
+    group = 'verification'
+
+    javaLauncher.set(javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(21)
+    })
+    shouldRunAfter(tasks.named('test'))
+}
+
 tasks.named('check') {
     dependsOn(testJava8)
     dependsOn(testJava17)
+    dependsOn(testJava21)
 }
 
 jar {

From d20aec6d58cd37ab518b987cd811bb6480a2ff97 Mon Sep 17 00:00:00 2001
From: tanya732 <sinha.tanya26@gmail.com>
Date: Fri, 17 Jan 2025 10:35:41 +0530
Subject: [PATCH 4/4] updated jacoco toll version

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 77de85a7..bff7bb9c 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -94,7 +94,7 @@ dependencies {
 }
 
 jacoco {
-    toolVersion = "0.8.7"
+    toolVersion = "0.8.10"
 }
 
 jacocoTestReport {