diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle
index 842cea0d1..932c9bd91 100644
--- a/AccessibilityCodelab/app/build.gradle
+++ b/AccessibilityCodelab/app/build.gradle
@@ -87,7 +87,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
     implementation(composeBom)
     testImplementation(composeBom)
     androidTestImplementation(composeBom)
@@ -118,12 +118,12 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.16.0'
     implementation "androidx.activity:activity-compose:1.10.1"
 
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0"
 
-    implementation 'androidx.navigation:navigation-compose:2.8.9'
+    implementation 'androidx.navigation:navigation-compose:2.9.0'
 
     androidTestImplementation 'androidx.test:rules:1.6.1'
     androidTestImplementation 'androidx.test:runner:1.6.2'
diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
index 46742b882..1ba4d869b 100644
--- a/AccessibilityCodelab/build.gradle
+++ b/AccessibilityCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.9.2'
+        classpath 'com.android.tools.build:gradle:8.10.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
     }
 }
diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar and b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AccessibilityCodelab/gradlew b/AccessibilityCodelab/gradlew
index faf93008b..23d15a936 100755
--- a/AccessibilityCodelab/gradlew
+++ b/AccessibilityCodelab/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/AccessibilityCodelab/gradlew.bat b/AccessibilityCodelab/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/AccessibilityCodelab/gradlew.bat
+++ b/AccessibilityCodelab/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml
index 3fb803325..92a344418 100644
--- a/AdaptiveUiCodelab/gradle/libs.versions.toml
+++ b/AdaptiveUiCodelab/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-androidGradlePlugin = "8.9.2"
-composeBom = "2025.04.01"
+androidGradlePlugin = "8.10.0"
+composeBom = "2025.05.00"
 coreKtx = "1.16.0"
 activityCompose = "1.10.1"
 espressoCore = "3.6.1"
@@ -8,7 +8,7 @@ junit = "4.13.2"
 junitVersion = "1.2.1"
 kotlin = "2.1.10"
 kotlinxCoroutinesAndroid = "1.10.1"
-lifecycle = "2.8.7"
+lifecycle = "2.9.0"
 window = "1.3.0"
 
 [libraries]
diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar and b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AdaptiveUiCodelab/gradlew b/AdaptiveUiCodelab/gradlew
index faf93008b..23d15a936 100755
--- a/AdaptiveUiCodelab/gradlew
+++ b/AdaptiveUiCodelab/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/AdaptiveUiCodelab/gradlew.bat b/AdaptiveUiCodelab/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/AdaptiveUiCodelab/gradlew.bat
+++ b/AdaptiveUiCodelab/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
index a313f28e1..9a0a831ab 100644
--- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle
+++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
@@ -107,7 +107,7 @@ dependencies {
     implementation "androidx.appcompat:appcompat:1.7.0"
     implementation "androidx.tracing:tracing:1.3.0"
 
-    def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
     implementation(composeBom)
     androidTestImplementation(composeBom)
     implementation "androidx.compose.runtime:runtime"
@@ -120,7 +120,7 @@ dependencies {
     debugImplementation "androidx.compose.ui:ui-tooling"
     debugImplementation "androidx.compose.ui:ui-test-manifest"
 
-    def lifecycle_version = "2.8.7"
+    def lifecycle_version = "2.9.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "com.google.dagger:hilt-android:2.56.2"
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
index 9aab08e34..e5958be88 100644
--- a/AdvancedStateAndSideEffectsCodelab/build.gradle
+++ b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.9.2"
+        classpath "com.android.tools.build:gradle:8.10.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.56.2"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar and b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AdvancedStateAndSideEffectsCodelab/gradlew b/AdvancedStateAndSideEffectsCodelab/gradlew
index faf93008b..23d15a936 100755
--- a/AdvancedStateAndSideEffectsCodelab/gradlew
+++ b/AdvancedStateAndSideEffectsCodelab/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/AdvancedStateAndSideEffectsCodelab/gradlew.bat b/AdvancedStateAndSideEffectsCodelab/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/AdvancedStateAndSideEffectsCodelab/gradlew.bat
+++ b/AdvancedStateAndSideEffectsCodelab/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle
index bac55bbf6..143a03750 100644
--- a/AnimationCodelab/build.gradle
+++ b/AnimationCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.9.2'
+        classpath 'com.android.tools.build:gradle:8.10.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
     }
diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle
index e19f6580d..ba4b89f07 100644
--- a/AnimationCodelab/finished/build.gradle
+++ b/AnimationCodelab/finished/build.gradle
@@ -43,7 +43,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
     implementation(composeBom)
 
     implementation 'androidx.activity:activity-compose:1.10.1'
diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.jar b/AnimationCodelab/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/AnimationCodelab/gradle/wrapper/gradle-wrapper.jar and b/AnimationCodelab/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AnimationCodelab/gradlew b/AnimationCodelab/gradlew
index faf93008b..23d15a936 100755
--- a/AnimationCodelab/gradlew
+++ b/AnimationCodelab/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/AnimationCodelab/gradlew.bat b/AnimationCodelab/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/AnimationCodelab/gradlew.bat
+++ b/AnimationCodelab/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle
index e19f6580d..ba4b89f07 100644
--- a/AnimationCodelab/start/build.gradle
+++ b/AnimationCodelab/start/build.gradle
@@ -43,7 +43,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
     implementation(composeBom)
 
     implementation 'androidx.activity:activity-compose:1.10.1'
diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle
index 3f2e2bc28..af83952c8 100644
--- a/BasicLayoutsCodelab/app/build.gradle
+++ b/BasicLayoutsCodelab/app/build.gradle
@@ -61,7 +61,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
@@ -72,7 +72,7 @@ dependencies {
     implementation "androidx.compose.material:material-icons-extended"
     implementation "androidx.compose.ui:ui-tooling-preview"
     implementation "com.google.android.material:material:1.12.0"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.0'
     implementation 'androidx.activity:activity-compose:1.10.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
index 286610380..54913a08e 100644
--- a/BasicLayoutsCodelab/build.gradle
+++ b/BasicLayoutsCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.9.2"
+        classpath "com.android.tools.build:gradle:8.10.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
     }
diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar and b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/BasicLayoutsCodelab/gradlew b/BasicLayoutsCodelab/gradlew
index faf93008b..23d15a936 100755
--- a/BasicLayoutsCodelab/gradlew
+++ b/BasicLayoutsCodelab/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/BasicLayoutsCodelab/gradlew.bat b/BasicLayoutsCodelab/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/BasicLayoutsCodelab/gradlew.bat
+++ b/BasicLayoutsCodelab/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts
index 5599714eb..d21248bc9 100644
--- a/BasicStateCodelab/app/build.gradle.kts
+++ b/BasicStateCodelab/app/build.gradle.kts
@@ -65,10 +65,10 @@ android {
 
 dependencies {
     implementation("androidx.core:core-ktx:1.16.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0")
     implementation("androidx.activity:activity-compose:1.10.1")
-    implementation(platform("androidx.compose:compose-bom:2025.04.01"))
+    implementation(platform("androidx.compose:compose-bom:2025.05.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
@@ -76,7 +76,7 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2025.04.01"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:2025.05.00"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle
index 26eaacfac..01e636457 100644
--- a/BasicStateCodelab/build.gradle
+++ b/BasicStateCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.9.2'
+        classpath 'com.android.tools.build:gradle:8.10.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
     }
diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.jar b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.jar and b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/BasicStateCodelab/gradlew b/BasicStateCodelab/gradlew
index faf93008b..23d15a936 100755
--- a/BasicStateCodelab/gradlew
+++ b/BasicStateCodelab/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/BasicStateCodelab/gradlew.bat b/BasicStateCodelab/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/BasicStateCodelab/gradlew.bat
+++ b/BasicStateCodelab/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts
index 04a20d26d..10f96b600 100644
--- a/BasicsCodelab/app/build.gradle.kts
+++ b/BasicsCodelab/app/build.gradle.kts
@@ -65,9 +65,9 @@ android {
 
 dependencies {
     implementation("androidx.core:core-ktx:1.16.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.0")
     implementation("androidx.activity:activity-compose:1.10.1")
-    implementation(platform("androidx.compose:compose-bom:2025.04.01"))
+    implementation(platform("androidx.compose:compose-bom:2025.05.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
@@ -76,7 +76,7 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2025.04.01"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:2025.05.00"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts
index 352e5f560..940cc2f88 100644
--- a/BasicsCodelab/build.gradle.kts
+++ b/BasicsCodelab/build.gradle.kts
@@ -16,7 +16,7 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.9.2" apply false
+    id("com.android.application") version "8.10.0" apply false
     id("org.jetbrains.kotlin.android") version "2.1.10" apply false
     id("org.jetbrains.kotlin.plugin.compose") version "2.1.10" apply false
 }
diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.jar b/BasicsCodelab/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/BasicsCodelab/gradle/wrapper/gradle-wrapper.jar and b/BasicsCodelab/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/BasicsCodelab/gradlew b/BasicsCodelab/gradlew
index faf93008b..23d15a936 100755
--- a/BasicsCodelab/gradlew
+++ b/BasicsCodelab/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/BasicsCodelab/gradlew.bat b/BasicsCodelab/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/BasicsCodelab/gradlew.bat
+++ b/BasicsCodelab/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle
index 62a4d0edf..a8ae438cb 100644
--- a/MigrationCodelab/app/build.gradle
+++ b/MigrationCodelab/app/build.gradle
@@ -60,7 +60,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
@@ -70,10 +70,10 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.2.1"
     implementation "androidx.core:core-ktx:1.16.0"
     implementation "androidx.fragment:fragment-ktx:1.8.6"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
-    implementation "androidx.navigation:navigation-fragment-ktx:2.8.9"
-    implementation "androidx.navigation:navigation-ui-ktx:2.8.9"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.9.0"
+    implementation "androidx.navigation:navigation-ui-ktx:2.9.0"
     implementation "androidx.recyclerview:recyclerview:1.4.0"
     implementation "androidx.room:room-runtime:2.7.1"
     implementation "androidx.room:room-ktx:2.7.1"
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
index 1a8972eb4..3389f9497 100644
--- a/MigrationCodelab/build.gradle
+++ b/MigrationCodelab/build.gradle
@@ -21,9 +21,9 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.9.2"
+        classpath "com.android.tools.build:gradle:8.10.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.9"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.0"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
     }
 }
diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.jar b/MigrationCodelab/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/MigrationCodelab/gradle/wrapper/gradle-wrapper.jar and b/MigrationCodelab/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/MigrationCodelab/gradlew b/MigrationCodelab/gradlew
index faf93008b..23d15a936 100755
--- a/MigrationCodelab/gradlew
+++ b/MigrationCodelab/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/MigrationCodelab/gradlew.bat b/MigrationCodelab/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/MigrationCodelab/gradlew.bat
+++ b/MigrationCodelab/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle
index 77580821e..c304de612 100644
--- a/NavigationCodelab/app/build.gradle
+++ b/NavigationCodelab/app/build.gradle
@@ -81,7 +81,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
index 35559c7b1..ea6290056 100644
--- a/NavigationCodelab/build.gradle
+++ b/NavigationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.9.2"
+        classpath "com.android.tools.build:gradle:8.10.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
     }
diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.jar b/NavigationCodelab/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/NavigationCodelab/gradle/wrapper/gradle-wrapper.jar and b/NavigationCodelab/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/NavigationCodelab/gradlew b/NavigationCodelab/gradlew
index faf93008b..23d15a936 100755
--- a/NavigationCodelab/gradlew
+++ b/NavigationCodelab/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/NavigationCodelab/gradlew.bat b/NavigationCodelab/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/NavigationCodelab/gradlew.bat
+++ b/NavigationCodelab/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml
index e014cefb9..4c364884f 100644
--- a/PerformanceCodelab/gradle/libs.versions.toml
+++ b/PerformanceCodelab/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
 coil = "2.7.0"
-com-android-application = "8.9.2"
+com-android-application = "8.10.0"
 desugar_jdk_libs = "2.1.5"
 kotlinx-datetime = "0.6.1"
-lifecycle-viewmodel-compose = "2.8.7"
+lifecycle-viewmodel-compose = "2.9.0"
 material-icons-core = "1.7.8"
 media3 = "1.6.1"
 org-jetbrains-kotlin-android = "2.1.10"
@@ -11,10 +11,10 @@ core-ktx = "1.16.0"
 junit = "4.13.2"
 androidx-test-ext-junit = "1.2.1"
 espresso-core = "3.6.1"
-lifecycle-runtime-ktx = "2.8.7"
+lifecycle-runtime-ktx = "2.9.0"
 activity-compose = "1.10.1"
-compose-bom = "2025.04.01"
-runtime-tracing = "1.8.0"
+compose-bom = "2025.05.00"
+runtime-tracing = "1.8.1"
 tracing-ktx = "1.3.0"
 tracing-perfetto = "1.0.0"
 uiautomator = "2.3.0"
diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.jar b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.jar and b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/PerformanceCodelab/gradlew b/PerformanceCodelab/gradlew
index faf93008b..23d15a936 100755
--- a/PerformanceCodelab/gradlew
+++ b/PerformanceCodelab/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/PerformanceCodelab/gradlew.bat b/PerformanceCodelab/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/PerformanceCodelab/gradlew.bat
+++ b/PerformanceCodelab/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle
index e68c391c4..9a401550e 100644
--- a/TestingCodelab/app/build.gradle
+++ b/TestingCodelab/app/build.gradle
@@ -84,7 +84,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
index 77adb7327..12409fb01 100644
--- a/TestingCodelab/build.gradle
+++ b/TestingCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.9.2"
+        classpath "com.android.tools.build:gradle:8.10.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
     }
diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.jar b/TestingCodelab/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/TestingCodelab/gradle/wrapper/gradle-wrapper.jar and b/TestingCodelab/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/TestingCodelab/gradlew b/TestingCodelab/gradlew
index faf93008b..23d15a936 100755
--- a/TestingCodelab/gradlew
+++ b/TestingCodelab/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/TestingCodelab/gradlew.bat b/TestingCodelab/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/TestingCodelab/gradlew.bat
+++ b/TestingCodelab/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle
index 479ad1e58..880c6e58f 100644
--- a/ThemingCodelab/app/build.gradle
+++ b/ThemingCodelab/app/build.gradle
@@ -87,7 +87,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
     implementation(composeBom)
     testImplementation(composeBom)
     androidTestImplementation(composeBom)
@@ -114,10 +114,10 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.16.0'
     implementation "androidx.activity:activity-compose:1.10.1"
 
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0"
 
     androidTestImplementation 'androidx.test:rules:1.6.1'
     androidTestImplementation 'androidx.test:runner:1.6.2'
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
index 1db9b527c..64b7b0340 100644
--- a/ThemingCodelab/build.gradle
+++ b/ThemingCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.9.2'
+        classpath 'com.android.tools.build:gradle:8.10.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
     }
diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.jar b/ThemingCodelab/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/ThemingCodelab/gradle/wrapper/gradle-wrapper.jar and b/ThemingCodelab/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ThemingCodelab/gradlew b/ThemingCodelab/gradlew
index faf93008b..23d15a936 100755
--- a/ThemingCodelab/gradlew
+++ b/ThemingCodelab/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/ThemingCodelab/gradlew.bat b/ThemingCodelab/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/ThemingCodelab/gradlew.bat
+++ b/ThemingCodelab/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle
index 400ef702e..70bf8f635 100644
--- a/ThemingCodelabM2/app/build.gradle
+++ b/ThemingCodelabM2/app/build.gradle
@@ -44,7 +44,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.04.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
     implementation(composeBom)
 
     implementation 'androidx.core:core-ktx:1.16.0'
diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle
index 0c5a99242..f72a38169 100644
--- a/ThemingCodelabM2/build.gradle
+++ b/ThemingCodelabM2/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.9.2"
+        classpath "com.android.tools.build:gradle:8.10.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10"
     }
diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.jar b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.jar and b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..ca025c83a 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-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ThemingCodelabM2/gradlew b/ThemingCodelabM2/gradlew
index faf93008b..23d15a936 100755
--- a/ThemingCodelabM2/gradlew
+++ b/ThemingCodelabM2/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/ThemingCodelabM2/gradlew.bat b/ThemingCodelabM2/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/ThemingCodelabM2/gradlew.bat
+++ b/ThemingCodelabM2/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell