diff --git a/gradle.properties b/gradle.properties
index 9955f851..696af403 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,6 +3,9 @@ org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\=
 org.gradle.caching=true
 org.gradle.parallel=true
 
+org.gradle.java.installations.auto-detect=true
+org.gradle.java.installations.auto-download=true
+
 #Kotlin
 kotlin.code.style=official
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 359d0d6d..2ed299c5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.1.0"
+agp = "8.2.2"
 kotlin = "1.9.21"
 compose = "1.5.11"
 dokka = "1.9.0"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1c8db555..817bd10e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,6 +18,9 @@ dependencyResolutionManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
+}
 
 rootProject.name = "compose-richeditor"