diff --git a/app/build.gradle b/app/build.gradle
index 85ae032..32bed4d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,12 +27,12 @@ android {
         warning 'MissingTranslation'
     }
     compileOptions {
-        // Sets Java compatibility to Java 17
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        // Sets Java compatibility to Java 21
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
     kotlin {
-        jvmToolchain(17)
+        jvmToolchain(21)
     }
 }
 
diff --git a/build.gradle b/build.gradle
index 3e8cfeb..72dad61 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
@@ -31,14 +33,3 @@ repositories {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 }
-
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-}
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-}
diff --git a/settings.gradle b/settings.gradle
index e7b4def..ddbe5b5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,5 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 include ':app'