From 7c09dcef1327a0676d672df2c28aa375bd815b92 Mon Sep 17 00:00:00 2001
From: Thomas Kioko <kiokotomas@gmail.com>
Date: Thu, 24 Oct 2024 16:41:37 +0200
Subject: [PATCH] Bump up Jdk version to 21 & remove plugin

---
 .github/workflows/build.yml | 4 ++--
 Gemfile                     | 1 -
 Gemfile.lock                | 4 ----
 gradle/libs.versions.toml   | 4 ++--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f652c5801..67e21957d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  JDK_VERSION: 17
+  JDK_VERSION: 21
   DISTRIBUTION: 'zulu'
   FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 120
 
@@ -250,7 +250,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
 
       - name: Create release
diff --git a/Gemfile b/Gemfile
index 866ec9e67..cdd3a6b34 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
 gem "fastlane"
-gem "xcode-install"
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
index e57595460..04964debb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -206,9 +206,6 @@ GEM
     uber (0.1.0)
     unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcode-install (2.8.1)
-      claide (>= 0.9.1)
-      fastlane (>= 2.1.0, < 3.0.0)
     xcodeproj (1.25.1)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
@@ -229,7 +226,6 @@ PLATFORMS
 DEPENDENCIES
   fastlane
   fastlane-plugin-test_center
-  xcode-install
 
 BUNDLED WITH
    2.5.14
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 833a0dc27..fd0aa5525 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,8 +26,8 @@ dependency-analysis = "2.1.4"
 essenty = "2.1.0"
 desugar = "2.1.2"
 gradle-doctor = "0.10.0"
-java-jdk = "17"
-java-target = "17"
+java-jdk = "21"
+java-target = "21"
 kenburns = "1.0.7"
 kermit = "2.0.4"
 kotest = "5.9.1"