From ab93910a04764846ffb8953d42446f44b3f3d71c Mon Sep 17 00:00:00 2001
From: jim <james.p.edwards@protonmail.com>
Date: Thu, 21 Sep 2023 13:16:52 -0500
Subject: [PATCH] Update build to target JDK 21.

---
 .github/workflows/gradle-nightly.yml       | 4 ++--
 .github/workflows/gradle.yml               | 6 +++---
 .github/workflows/release.yml              | 8 ++++----
 systems.comodal.json_iterator/build.gradle | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/gradle-nightly.yml b/.github/workflows/gradle-nightly.yml
index c6d97a4..3662944 100644
--- a/.github/workflows/gradle-nightly.yml
+++ b/.github/workflows/gradle-nightly.yml
@@ -29,11 +29,11 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 21-ea
+          java-version: 22-ea
           check-latest: true
       - run: printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
       - run: java --version
 
       - name: Gradle Check
-        run: ./gradlew -PtargetJava=21 check --warning-mode=all --stacktrace --no-daemon
+        run: ./gradlew -PtargetJava=22 check --warning-mode=all --stacktrace --no-daemon
 
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index b767456..1616dff 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 19
+          java-version: 20
           java-package: jre
           cache: 'gradle'
       - run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
@@ -30,10 +30,10 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 20
+          java-version: 21
           check-latest: true
       - run: printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
       - run: java --version
 
       - name: Gradle Check
-        run: ./gradlew -PtargetJava=20 check --stacktrace --no-daemon
+        run: ./gradlew -PtargetJava=21 check --stacktrace --no-daemon
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 81b7417..e6e4c44 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 19
+          java-version: 20
           java-package: jre
           cache: 'gradle'
       - run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
@@ -28,15 +28,15 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 20
+          java-version: 21
           check-latest: true
       - run: printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
       - run: java --version
 
       - name: Gradle Check
-        run: ./gradlew check -PtargetJava=20 --stacktrace
+        run: ./gradlew check -PtargetJava=21 --stacktrace
 
       - name: Github Packages
-        run: ./gradlew -PtargetJava=20 :json-iterator:publish
+        run: ./gradlew -PtargetJava=21 :json-iterator:publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/systems.comodal.json_iterator/build.gradle b/systems.comodal.json_iterator/build.gradle
index b1bf539..e498d01 100644
--- a/systems.comodal.json_iterator/build.gradle
+++ b/systems.comodal.json_iterator/build.gradle
@@ -14,7 +14,7 @@ ext {
 
 java {
   toolchain {
-    languageVersion = JavaLanguageVersion.of(project.findProperty('targetJava') as Integer ?: 20)
+    languageVersion = JavaLanguageVersion.of(project.findProperty('targetJava') as Integer ?: 21)
   }
 }
 
@@ -83,12 +83,12 @@ test {
   }
 }
 
-task sourcesJar(type: Jar) {
+tasks.register('sourcesJar', Jar) {
   from sourceSets.main.allJava
   archiveClassifier.set('sources')
 }
 
-task javadocJar(type: Jar) {
+tasks.register('javadocJar', Jar) {
   from javadoc
   archiveClassifier.set('javadoc')
 }
@@ -137,7 +137,7 @@ publishing {
 
 // ./gradlew :json-iterator:genParser --args='<style>[ifelse, nlogn, nhashn] <unexpected_field_behavior>[throw, skip] <tab_size>[2, 4, etc.] <camelCaseRootName> <file_or_url>(asdf.json, https://)'
 // ./gradlew :json-iterator:genParser --args='ifelse skip 2 assets gen.json'
-task genParser(type: JavaExec) {
+tasks.register('genParser', JavaExec) {
   workingDir = project.getRootDir()
   classpath = sourceSets.jmh.getRuntimeClasspath()
   mainClass = 'systems.comodal.jsoniter.generate.JIParserGeneratorEntryPoint'