bump jdk and gradle.

comodal · Aug 9, 2024 · 4b55c65 · 4b55c65
1 parent 26eb0d0
commit 4b55c65
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 482 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -15,23 +15,23 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/actions/wrapper-validation@v3
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 20
+          java-version: 21
           java-package: jre
           cache: 'gradle'
       - run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 21
+          java-version: 22
           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 --stacktrace --no-daemon
+        run: ./gradlew -PtargetJava=22 check --stacktrace --no-daemon
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,28 +15,28 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/actions/wrapper-validation@v3
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 20
+          java-version: 21
           java-package: jre
           cache: 'gradle'
       - run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 21
+          java-version: 22
           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=21 --stacktrace
+        run: ./gradlew check -PtargetJava=22 --stacktrace
 
       - name: Github Packages
-        run: ./gradlew -PtargetJava=21 :json-iterator:publish
+        run: ./gradlew -PtargetJava=22 :json-iterator:publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git 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 ?: 21)
+    languageVersion = JavaLanguageVersion.of(project.findProperty('targetJava') as Integer ?: 22)
   }
 }
 

diff --git a/...mh/java/systems/comodal/jsoniter/jmh/styles/IocLoopCompareStringFieldToCharsIfNHashN.java b/...mh/java/systems/comodal/jsoniter/jmh/styles/IocLoopCompareStringFieldToCharsIfNHashN.java