diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 07c43ef80a..5a3bbb51cd 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 dependencies {
   implementation("com.diffplug.spotless:spotless-plugin-gradle:6.22.0")
 
-  implementation("com.android.tools.build:gradle:8.5.0")
+  implementation("com.android.tools.build:gradle:8.7.3")
 
   implementation("app.cash.licensee:licensee-gradle-plugin:1.8.0")
   implementation("com.osacky.flank.gradle:fladle:0.17.4")
diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts
index a89e6d68e6..e340c5c063 100644
--- a/catalog/build.gradle.kts
+++ b/catalog/build.gradle.kts
@@ -37,7 +37,7 @@ android {
       listOf("META-INF/ASL2.0", "META-INF/ASL-2.0.txt", "META-INF/LGPL-3.0.txt"),
     )
   }
-  kotlin { jvmToolchain(11) }
+  kotlin { jvmToolchain(17) }
 }
 
 dependencies {
diff --git a/codelabs/datacapture/app/build.gradle.kts b/codelabs/datacapture/app/build.gradle.kts
index 4c6cc3949c..ae5fcdd187 100644
--- a/codelabs/datacapture/app/build.gradle.kts
+++ b/codelabs/datacapture/app/build.gradle.kts
@@ -34,7 +34,7 @@ android {
     }
 
     packaging { resources.excludes.addAll(listOf("META-INF/ASL-2.0.txt", "META-INF/LGPL-3.0.txt")) }
-    kotlin { jvmToolchain(11) }
+    kotlin { jvmToolchain(17) }
 }
 
 dependencies {
diff --git a/codelabs/datacapture/app/src/main/java/com/google/codelab/sdclibrary/MainActivity.kt b/codelabs/datacapture/app/src/main/java/com/google/codelab/sdclibrary/MainActivity.kt
index a7f922c760..4759d65b2d 100644
--- a/codelabs/datacapture/app/src/main/java/com/google/codelab/sdclibrary/MainActivity.kt
+++ b/codelabs/datacapture/app/src/main/java/com/google/codelab/sdclibrary/MainActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 Google LLC
+ * Copyright 2022-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@ package com.google.codelab.sdclibrary
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
 
 class MainActivity : AppCompatActivity() {
 
diff --git a/codelabs/datacapture/build.gradle.kts b/codelabs/datacapture/build.gradle.kts
index dcd615f0cb..898efceea7 100644
--- a/codelabs/datacapture/build.gradle.kts
+++ b/codelabs/datacapture/build.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.1.2")
+        classpath("com.android.tools.build:gradle:8.7.3")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/codelabs/datacapture/gradle/wrapper/gradle-wrapper.jar b/codelabs/datacapture/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..2c3521197d 100644
Binary files a/codelabs/datacapture/gradle/wrapper/gradle-wrapper.jar and b/codelabs/datacapture/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/codelabs/datacapture/gradle/wrapper/gradle-wrapper.properties b/codelabs/datacapture/gradle/wrapper/gradle-wrapper.properties
index da1db5f04e..19cfad969b 100644
--- a/codelabs/datacapture/gradle/wrapper/gradle-wrapper.properties
+++ b/codelabs/datacapture/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/codelabs/engine/app/build.gradle.kts b/codelabs/engine/app/build.gradle.kts
index b682babd86..b708a66235 100644
--- a/codelabs/engine/app/build.gradle.kts
+++ b/codelabs/engine/app/build.gradle.kts
@@ -33,7 +33,7 @@ android {
     }
 
     packaging { resources.excludes.addAll(listOf("META-INF/ASL-2.0.txt", "META-INF/LGPL-3.0.txt")) }
-    kotlin { jvmToolchain(11) }
+    kotlin { jvmToolchain(17) }
 }
 
 dependencies {
diff --git a/codelabs/engine/build.gradle.kts b/codelabs/engine/build.gradle.kts
index dcd615f0cb..898efceea7 100644
--- a/codelabs/engine/build.gradle.kts
+++ b/codelabs/engine/build.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.1.2")
+        classpath("com.android.tools.build:gradle:8.7.3")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/codelabs/engine/gradle/wrapper/gradle-wrapper.properties b/codelabs/engine/gradle/wrapper/gradle-wrapper.properties
index da1db5f04e..19cfad969b 100644
--- a/codelabs/engine/gradle/wrapper/gradle-wrapper.properties
+++ b/codelabs/engine/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2617362fd0..171d8761b2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists