diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle
index ccc35e4d2..f5d336787 100644
--- a/AccessibilityCodelab/app/build.gradle
+++ b/AccessibilityCodelab/app/build.gradle
@@ -73,7 +73,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.03.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
     implementation(composeBom)
     testImplementation(composeBom)
     androidTestImplementation(composeBom)
@@ -102,9 +102,9 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.activity:activity-ktx:1.8.2'
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation "androidx.activity:activity-compose:1.8.2"
+    implementation 'androidx.activity:activity-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.13.0'
+    implementation "androidx.activity:activity-compose:1.9.0"
 
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0"
@@ -118,7 +118,7 @@ dependencies {
 
     // TODO: Bump to latest after Espresso 3.5.0 goes stable
     //  (due to https://github.com/robolectric/robolectric/issues/6593)
-    testImplementation 'org.robolectric:robolectric:4.11.1'
+    testImplementation 'org.robolectric:robolectric:4.12.1'
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
index f464a1c64..1beb63038 100644
--- a/AccessibilityCodelab/build.gradle
+++ b/AccessibilityCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar
index d64cd4917..e6441136f 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 a80b22ce5..b82aa23a4 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AdaptiveUiCodelab/app/build.gradle b/AdaptiveUiCodelab/app/build.gradle
index 2c8dbc681..b2f50bfaa 100644
--- a/AdaptiveUiCodelab/app/build.gradle
+++ b/AdaptiveUiCodelab/app/build.gradle
@@ -65,7 +65,7 @@ android {
 dependencies {
 
 
-    def composeBom = platform('androidx.compose:compose-bom:2024.03.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
@@ -78,8 +78,8 @@ dependencies {
 
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
-    implementation 'androidx.activity:activity-compose:1.8.2'
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.activity:activity-compose:1.9.0'
+    implementation 'androidx.core:core-ktx:1.13.0'
     implementation "androidx.window:window:1.2.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
     implementation "androidx.compose.material3:material3-window-size-class:1.2.1"
diff --git a/AdaptiveUiCodelab/build.gradle b/AdaptiveUiCodelab/build.gradle
index a29741113..22c813ec1 100644
--- a/AdaptiveUiCodelab/build.gradle
+++ b/AdaptiveUiCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.1"
+        classpath "com.android.tools.build:gradle:8.3.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar
index d64cd4917..e6441136f 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 a80b22ce5..b82aa23a4 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
index 854e63757..5f4f1beb3 100644
--- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle
+++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
@@ -106,10 +106,10 @@ dependencies {
         }
     }
 
-    implementation "androidx.activity:activity-compose:1.8.2"
+    implementation "androidx.activity:activity-compose:1.9.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
 
-    def composeBom = platform('androidx.compose:compose-bom:2024.03.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
     implementation(composeBom)
     androidTestImplementation(composeBom)
     implementation "androidx.compose.runtime:runtime"
@@ -127,8 +127,8 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
-    implementation "com.google.dagger:hilt-android:2.51"
-    kapt "com.google.dagger:hilt-compiler:2.51"
+    implementation "com.google.dagger:hilt-android:2.51.1"
+    kapt "com.google.dagger:hilt-compiler:2.51.1"
 
     implementation "io.coil-kt:coil-compose:2.6.0"
 
@@ -139,7 +139,7 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
     androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0"
-    androidTestImplementation "com.google.dagger:hilt-android:2.51"
-    androidTestImplementation "com.google.dagger:hilt-android-testing:2.51"
-    kaptAndroidTest "com.google.dagger:hilt-compiler:2.51"
+    androidTestImplementation "com.google.dagger:hilt-android:2.51.1"
+    androidTestImplementation "com.google.dagger:hilt-android-testing:2.51.1"
+    kaptAndroidTest "com.google.dagger:hilt-compiler:2.51.1"
 }
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
index 147f8d75b..05700870c 100644
--- a/AdvancedStateAndSideEffectsCodelab/build.gradle
+++ b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -20,9 +20,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.1"
+        classpath "com.android.tools.build:gradle:8.3.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
-        classpath "com.google.dagger:hilt-android-gradle-plugin:2.51"
+        classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"
     }
 }
 
diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar
index d64cd4917..e6441136f 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 a80b22ce5..b82aa23a4 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle
index a57c709e9..f988aca35 100644
--- a/BasicLayoutsCodelab/app/build.gradle
+++ b/BasicLayoutsCodelab/app/build.gradle
@@ -63,11 +63,11 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.03.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.13.0'
     implementation "androidx.compose.ui:ui"
     implementation 'androidx.compose.material3:material3'
     implementation 'androidx.compose.material3:material3-window-size-class:1.2.1'
@@ -75,7 +75,7 @@ dependencies {
     implementation "androidx.compose.ui:ui-tooling-preview"
     implementation "com.google.android.material:material:1.11.0"
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
-    implementation 'androidx.activity:activity-compose:1.8.2'
+    implementation 'androidx.activity:activity-compose:1.9.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
index a8aa66cc7..58fb0a510 100644
--- a/BasicLayoutsCodelab/build.gradle
+++ b/BasicLayoutsCodelab/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.1"
+        classpath "com.android.tools.build:gradle:8.3.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar
index d64cd4917..e6441136f 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 a80b22ce5..b82aa23a4 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle
index 86e5b180a..98330dd0b 100644
--- a/MigrationCodelab/app/build.gradle
+++ b/MigrationCodelab/app/build.gradle
@@ -61,7 +61,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.03.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
@@ -69,7 +69,7 @@ dependencies {
     kapt "com.github.bumptech.glide:compiler:4.16.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
-    implementation "androidx.core:core-ktx:1.12.0"
+    implementation "androidx.core:core-ktx:1.13.0"
     implementation "androidx.fragment:fragment-ktx:1.6.2"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
index 3089517d7..f35705445 100644
--- a/MigrationCodelab/build.gradle
+++ b/MigrationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.1"
+        classpath "com.android.tools.build:gradle:8.3.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
     }
diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.jar b/MigrationCodelab/gradle/wrapper/gradle-wrapper.jar
index d64cd4917..e6441136f 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 a80b22ce5..b82aa23a4 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle
index bf32cc935..7ad51d0da 100644
--- a/NavigationCodelab/app/build.gradle
+++ b/NavigationCodelab/app/build.gradle
@@ -80,12 +80,12 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.03.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.core:core-ktx:1.12.0"
+    implementation "androidx.core:core-ktx:1.13.0"
     implementation "com.google.android.material:material:1.11.0"
 
     // Compose
@@ -94,7 +94,7 @@ dependencies {
     implementation "androidx.compose.foundation:foundation"
     implementation "androidx.compose.material:material"
     implementation "androidx.compose.material:material-icons-extended"
-    implementation "androidx.activity:activity-compose:1.8.2"
+    implementation "androidx.activity:activity-compose:1.9.0"
     implementation "androidx.navigation:navigation-compose:2.7.7"
     debugImplementation "androidx.compose.ui:ui-tooling"
 
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
index 97e6647f6..049e9ef19 100644
--- a/NavigationCodelab/build.gradle
+++ b/NavigationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.1"
+        classpath "com.android.tools.build:gradle:8.3.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.jar b/NavigationCodelab/gradle/wrapper/gradle-wrapper.jar
index d64cd4917..e6441136f 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 a80b22ce5..b82aa23a4 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle
index d7655e7e1..ddc0f6494 100644
--- a/TestingCodelab/app/build.gradle
+++ b/TestingCodelab/app/build.gradle
@@ -87,7 +87,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.03.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
index 9c71fe2ca..8b79a7ba2 100644
--- a/TestingCodelab/build.gradle
+++ b/TestingCodelab/build.gradle
@@ -24,7 +24,7 @@ buildscript {
 
         // App dependencies
         appCompatVersion = '1.6.1'
-        activityComposeVersion = '1.8.2'
+        activityComposeVersion = '1.9.0'
         composeCompilerVersion = '1.5.10'
         coreTestingVersion = '2.2.0'
         coroutinesVersion = "1.5.2"
@@ -33,7 +33,7 @@ buildscript {
         junitVersion = '4.13.1'
         kotlinVersion = '1.9.22'
         ktlintVersion = '0.48.2'
-        ktxVersion = '1.12.0'
+        ktxVersion = '1.13.0'
         lifecycleVersion = '2.3.0'
         materialVersion = '1.11.0'
         runnerVersion = '1.0.1'
@@ -49,7 +49,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.1"
+        classpath "com.android.tools.build:gradle:8.3.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.jar b/TestingCodelab/gradle/wrapper/gradle-wrapper.jar
index d64cd4917..e6441136f 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 a80b22ce5..b82aa23a4 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle
index 2a97b1647..b94afc2d8 100644
--- a/ThemingCodelab/app/build.gradle
+++ b/ThemingCodelab/app/build.gradle
@@ -90,7 +90,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.03.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
     implementation(composeBom)
     testImplementation(composeBom)
     androidTestImplementation(composeBom)
@@ -113,9 +113,9 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.activity:activity-ktx:1.8.2'
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation "androidx.activity:activity-compose:1.8.2"
+    implementation 'androidx.activity:activity-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.13.0'
+    implementation "androidx.activity:activity-compose:1.9.0"
 
     implementation "androidx.lifecycle:lifecycle-runtime-compose:2.7.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
index 2df6b275a..7274301ac 100644
--- a/ThemingCodelab/build.gradle
+++ b/ThemingCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.jar b/ThemingCodelab/gradle/wrapper/gradle-wrapper.jar
index d64cd4917..e6441136f 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 a80b22ce5..b82aa23a4 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME