From e3c68e0992bdba0be8581ff44f08437d49717093 Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Fri, 23 Feb 2024 19:28:13 +0800
Subject: [PATCH] Use Java 21 (#4235)

---
 .github/workflows/ci.yml                          | 2 +-
 .github/workflows/populate-gradle-build-cache.yml | 2 +-
 bitrise.yml                                       | 2 +-
 build.gradle                                      | 2 +-
 settings.gradle                                   | 4 ++++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 63afec2db..a53482dc8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Gradle Wrapper Validation
diff --git a/.github/workflows/populate-gradle-build-cache.yml b/.github/workflows/populate-gradle-build-cache.yml
index 4eeb8dd0c..d6c47ded9 100644
--- a/.github/workflows/populate-gradle-build-cache.yml
+++ b/.github/workflows/populate-gradle-build-cache.yml
@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Gradle Wrapper Validation
diff --git a/bitrise.yml b/bitrise.yml
index a7627ac6f..14ecd83b3 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -13,7 +13,7 @@ workflows:
     steps:
     - set-java-version@1:
         inputs:
-          - set_java_version: '17'
+          - set_java_version: '21'
     - activate-ssh-key:
         run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
     - git-clone@8.0: {}
diff --git a/build.gradle b/build.gradle
index 0bdfaa662..cf2798f38 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ allprojects {
 
     plugins.withType(JavaBasePlugin).configureEach {
         java {
-            toolchain.languageVersion = JavaLanguageVersion.of(17)
+            toolchain.languageVersion = JavaLanguageVersion.of(21)
         }
     }
 }
diff --git a/settings.gradle b/settings.gradle
index c175391ee..bee09a950 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,6 +10,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {