diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
index 5e917b801..a82651361 100644
--- a/AccessibilityCodelab/build.gradle
+++ b/AccessibilityCodelab/build.gradle
@@ -27,7 +27,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '8.9.0'
+    id 'com.diffplug.spotless' version '8.10.0'
     id 'org.jetbrains.kotlin.plugin.compose' version "2.3.10" apply false
 }
 
diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 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-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 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-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
index 3240164fd..7c13e55aa 100644
--- a/AdvancedStateAndSideEffectsCodelab/build.gradle
+++ b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -28,7 +28,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '8.9.0'
+    id 'com.diffplug.spotless' version '8.10.0'
     id 'com.google.devtools.ksp' version '2.3.11' apply false
 }
 
diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 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-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 100644
--- a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
index 5fdcb365e..386ce95c5 100644
--- a/BasicLayoutsCodelab/build.gradle
+++ b/BasicLayoutsCodelab/build.gradle
@@ -27,7 +27,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '8.9.0'
+    id 'com.diffplug.spotless' version '8.10.0'
 }
 
 subprojects {
diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 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-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle
index 3222d6ca0..3de3fc335 100644
--- a/BasicStateCodelab/build.gradle
+++ b/BasicStateCodelab/build.gradle
@@ -27,7 +27,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '8.9.0'
+    id 'com.diffplug.spotless' version '8.10.0'
 }
 
 subprojects {
diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 100644
--- a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 100644
--- a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
index d73d6f1c9..bb3b65657 100644
--- a/MigrationCodelab/build.gradle
+++ b/MigrationCodelab/build.gradle
@@ -29,7 +29,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '8.9.0'
+    id 'com.diffplug.spotless' version '8.10.0'
     id 'com.android.legacy-kapt' version '9.3.1' apply false
 }
 
diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 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-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
index 6c98b0186..36907961d 100644
--- a/NavigationCodelab/build.gradle
+++ b/NavigationCodelab/build.gradle
@@ -28,7 +28,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '8.9.0'
+    id 'com.diffplug.spotless' version '8.10.0'
 }
 
 subprojects {
diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 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-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml
index 2cba09397..386e7f400 100644
--- a/PerformanceCodelab/gradle/libs.versions.toml
+++ b/PerformanceCodelab/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ benchmark = "1.4.1"
 androidx-baselineprofile = "1.5.0-rc01"
 profileinstaller = "1.4.1"
 material3 = "1.4.0"
-spotless = "8.9.0"
+spotless = "8.10.0"
 ktlint = "1.2.1"
 
 [libraries]
diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 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-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
index 1f13e52a7..f34ba7613 100644
--- a/TestingCodelab/build.gradle
+++ b/TestingCodelab/build.gradle
@@ -28,7 +28,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '8.9.0'
+    id 'com.diffplug.spotless' version '8.10.0'
 }
 
 subprojects {
diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 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-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
index 6aca86a33..01a14a8d1 100644
--- a/ThemingCodelab/build.gradle
+++ b/ThemingCodelab/build.gradle
@@ -28,7 +28,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '8.9.0'
+    id 'com.diffplug.spotless' version '8.10.0'
 }
 
 subprojects {
diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 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-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties
index 69dd0d040..ad7845be3 100644
--- a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties
+++ b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500