diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
index 4628148b6..f17a51587 100644
--- a/AccessibilityCodelab/build.gradle
+++ b/AccessibilityCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.6.1'
+        classpath 'com.android.tools.build:gradle:8.7.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
     }
 }
diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
index 0aaefbcaf..df97d72b8 100644
--- a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml
index f73009fee..c86ee7d7b 100644
--- a/AdaptiveUiCodelab/gradle/libs.versions.toml
+++ b/AdaptiveUiCodelab/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-androidGradlePlugin = "8.6.1"
+androidGradlePlugin = "8.7.0"
 composeBom = "2024.09.02"
 coreKtx = "1.13.1"
 activityCompose = "1.9.2"
diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
index 0aaefbcaf..df97d72b8 100644
--- a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
index 8a5144420..ff2165495 100644
--- a/AdvancedStateAndSideEffectsCodelab/build.gradle
+++ b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.6.1"
+        classpath "com.android.tools.build:gradle:8.7.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.52"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
index 0aaefbcaf..df97d72b8 100644
--- a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
index 1b9f29085..0ec1fc8bc 100644
--- a/BasicLayoutsCodelab/build.gradle
+++ b/BasicLayoutsCodelab/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.6.1"
+        classpath "com.android.tools.build:gradle:8.7.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
     }
diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
index 0aaefbcaf..df97d72b8 100644
--- a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
index dc930ba1e..dac14b4a5 100644
--- a/MigrationCodelab/build.gradle
+++ b/MigrationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.6.1"
+        classpath "com.android.tools.build:gradle:8.7.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.1"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
index 0aaefbcaf..df97d72b8 100644
--- a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
index 8dc425e39..cd40c3628 100644
--- a/NavigationCodelab/build.gradle
+++ b/NavigationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.6.1"
+        classpath "com.android.tools.build:gradle:8.7.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
     }
diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
index 0aaefbcaf..df97d72b8 100644
--- a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml
index 625bbc669..0100f0f56 100644
--- a/PerformanceCodelab/gradle/libs.versions.toml
+++ b/PerformanceCodelab/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 coil = "2.7.0"
-com-android-application = "8.6.1"
+com-android-application = "8.7.0"
 desugar_jdk_libs = "2.1.2"
 kotlinx-datetime = "0.6.1"
 lifecycle-viewmodel-compose = "2.8.6"
diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties
index 0aaefbcaf..df97d72b8 100644
--- a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
index 1491ae31f..13348f804 100644
--- a/TestingCodelab/build.gradle
+++ b/TestingCodelab/build.gradle
@@ -48,7 +48,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.6.1"
+        classpath "com.android.tools.build:gradle:8.7.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion"
     }
diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties
index 0aaefbcaf..df97d72b8 100644
--- a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
index 8c882be95..7b8ace5ed 100644
--- a/ThemingCodelab/build.gradle
+++ b/ThemingCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.6.1'
+        classpath 'com.android.tools.build:gradle:8.7.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
     }
diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties
index 0aaefbcaf..df97d72b8 100644
--- a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME