diff --git a/build.gradle.kts b/build.gradle.kts
index 82a5674ab55..e242b0f99da 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.3.2")
+        classpath("com.android.tools.build:gradle:8.4.0")
         classpath("com.google.gms:google-services:4.4.1")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
 
@@ -58,5 +58,5 @@ allprojects {
 apply(from = "jacoco_aggregation.gradle.kts")
 
 tasks.register<Delete>("clean").configure {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 820abdc2545..c0c3eadb253 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,7 +1,7 @@
 object KtsBuildVersions {
 
-    const val gradle = "8.2.0"
-    const val kotlin = "1.9.22"
+    const val gradle = "8.4.0"
+    const val kotlin = "1.9.23"
 }
 
 plugins {
diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
index 0c30543cb8f..0bf141f13d9 100644
--- a/buildSrc/src/main/kotlin/Libs.kt
+++ b/buildSrc/src/main/kotlin/Libs.kt
@@ -3,7 +3,7 @@ object Libs {
 
     object Kotlin {
 
-        const val kotlin = "1.9.22"
+        const val kotlin = "1.9.23"
 
         const val stdlibJdk8 = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin"
         const val reflect = "org.jetbrains.kotlin:kotlin-reflect:$kotlin"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 558acbc50a5..1f33f874378 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Sep 18 18:21:09 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/jacoco_aggregation.gradle.kts b/jacoco_aggregation.gradle.kts
index 23a2da05317..9c0e3550fab 100644
--- a/jacoco_aggregation.gradle.kts
+++ b/jacoco_aggregation.gradle.kts
@@ -42,8 +42,8 @@ project.afterEvaluate {
         val classesDirectories = mutableListOf<String>().also {
             subprojects.forEach { proj ->
                 variants.forEach { variant ->
-                    it.add("${proj.buildDir}/intermediates/javac/$variant/classes")
-                    it.add("${proj.buildDir}/tmp/kotlin-classes/$variant")
+                    it.add("${proj.layout.buildDirectory}/intermediates/javac/$variant/classes")
+                    it.add("${proj.layout.buildDirectory}/tmp/kotlin-classes/$variant")
                 }
             }
         }
@@ -71,12 +71,12 @@ project.afterEvaluate {
         val executions = mutableListOf<String>().also {
             subprojects.forEach { proj ->
                 variants.forEach { variant ->
-                    val path = "${proj.buildDir}/outputs/unit_test_code_coverage/${variant}UnitTest/test${variant.replaceFirstChar(Char::titlecase)}UnitTest.exec"
+                    val path = "${proj.layout.buildDirectory}/outputs/unit_test_code_coverage/${variant}UnitTest/test${variant.replaceFirstChar(Char::titlecase)}UnitTest.exec"
                     if ((File(path)).exists()) {
                         it.add(path)
                         println("Collecting execution data from: $path")
                     }
-                    val androidPath = "${proj.buildDir}/outputs/code_coverage/${variant}AndroidTest/connected/"
+                    val androidPath = "${proj.layout.buildDirectory}/outputs/code_coverage/${variant}AndroidTest/connected/"
                     val androidFiles = fileTree(androidPath)
                     androidFiles.forEach { file ->
                         it.add(file.path)