From 6d0225534833abbb03803d437087ea2de2dd436f Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Sun, 17 Nov 2024 22:30:55 +1100
Subject: [PATCH 1/2] jvmToolchain 21 Android Studio is (or will very soon be)
 bundling Java 21, which means jvmToolchain(17) is an error. Merge this when
 you update your IDE

---
 api/anilist/build.gradle.kts              | 2 +-
 api/preferences/build.gradle.kts          | 2 +-
 app/build.gradle.kts                      | 2 +-
 core/build.gradle.kts                     | 2 +-
 material-color-utilities/build.gradle.kts | 2 +-
 navigation/build.gradle.kts               | 2 +-
 profile/build.gradle.kts                  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/api/anilist/build.gradle.kts b/api/anilist/build.gradle.kts
index 8377bbde..a325b565 100644
--- a/api/anilist/build.gradle.kts
+++ b/api/anilist/build.gradle.kts
@@ -19,7 +19,7 @@ android {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 dependencies {
diff --git a/api/preferences/build.gradle.kts b/api/preferences/build.gradle.kts
index dac50d6f..c27c9a30 100644
--- a/api/preferences/build.gradle.kts
+++ b/api/preferences/build.gradle.kts
@@ -18,7 +18,7 @@ android {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 dependencies {
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 25718c62..9888aca5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -53,7 +53,7 @@ android {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 dependencies {
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index f49224ce..7abfe6ff 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -22,7 +22,7 @@ android {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 dependencies {
diff --git a/material-color-utilities/build.gradle.kts b/material-color-utilities/build.gradle.kts
index 4b0c9932..70c9ff49 100644
--- a/material-color-utilities/build.gradle.kts
+++ b/material-color-utilities/build.gradle.kts
@@ -15,5 +15,5 @@ android {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
diff --git a/navigation/build.gradle.kts b/navigation/build.gradle.kts
index 18edb835..6904ab57 100644
--- a/navigation/build.gradle.kts
+++ b/navigation/build.gradle.kts
@@ -23,7 +23,7 @@ android {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 dependencies {
diff --git a/profile/build.gradle.kts b/profile/build.gradle.kts
index 9a31edc2..6e40b448 100644
--- a/profile/build.gradle.kts
+++ b/profile/build.gradle.kts
@@ -24,7 +24,7 @@ android {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 dependencies {

From 67552d802f980e5b02dd2d09f1794fb5bfd1dcd2 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Sun, 17 Nov 2024 23:04:02 +1100
Subject: [PATCH 2/2] 21 in pipelines

---
 .github/workflows/build-debug.yaml         | 2 +-
 .github/workflows/create-release.yaml      | 2 +-
 .github/workflows/pull-request-checks.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-debug.yaml b/.github/workflows/build-debug.yaml
index a5867aa0..967f2ead 100644
--- a/.github/workflows/build-debug.yaml
+++ b/.github/workflows/build-debug.yaml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
 
       - name: Assemble Debug
diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml
index 99c62f99..32c9a0a9 100644
--- a/.github/workflows/create-release.yaml
+++ b/.github/workflows/create-release.yaml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
 
       - name: Prepare signing keystore
diff --git a/.github/workflows/pull-request-checks.yaml b/.github/workflows/pull-request-checks.yaml
index b8ab8d62..bc873992 100644
--- a/.github/workflows/pull-request-checks.yaml
+++ b/.github/workflows/pull-request-checks.yaml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
 
       - name: Assemble Debug