Update all dependencies (end)

AccessibilityCodelab/app/build.gradle

@@ -16,7 +16,6 @@
 
 plugins {
     id 'com.android.application'
-    id 'kotlin-android'
     id 'org.jetbrains.kotlin.plugin.compose'
 }
 
@@ -70,7 +69,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2026.01.00')
+    def composeBom = platform('androidx.compose:compose-bom:2026.01.01')
     implementation(composeBom)
     testImplementation(composeBom)
     androidTestImplementation(composeBom)
@@ -97,23 +96,23 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
 
     implementation 'androidx.appcompat:appcompat:1.7.1'
-    implementation 'androidx.activity:activity-ktx:1.12.2'
+    implementation 'androidx.activity:activity-ktx:1.12.3'
     implementation 'androidx.core:core-ktx:1.17.0'
-    implementation "androidx.activity:activity-compose:1.12.2"
+    implementation "androidx.activity:activity-compose:1.12.3"
 
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.10.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0"
 
-    implementation 'androidx.navigation:navigation-compose:2.9.6'
+    implementation 'androidx.navigation:navigation-compose:2.9.7'
 
     androidTestImplementation 'androidx.test:rules:1.7.0'
     androidTestImplementation 'androidx.test:runner:1.7.0'
 
     // 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.16'
+    testImplementation 'org.robolectric:robolectric:4.16.1'
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {

AccessibilityCodelab/build.gradle

@@ -21,13 +21,13 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.2'
+        classpath 'com.android.tools.build:gradle:9.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
     }
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '8.1.0'
+    id 'com.diffplug.spotless' version '8.2.1'
     id 'org.jetbrains.kotlin.plugin.compose' version "2.3.0" apply false
 }
 

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.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

AdaptiveUiCodelab/gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-androidGradlePlugin = "8.13.2"
-composeBom = "2026.01.00"
+androidGradlePlugin = "9.0.0"
+composeBom = "2026.01.01"
 coreKtx = "1.17.0"
-activityCompose = "1.12.2"
+activityCompose = "1.12.3"
 espressoCore = "3.7.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"

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.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

AdvancedStateAndSideEffectsCodelab/app/build.gradle

@@ -16,10 +16,9 @@
 
 plugins {
     id 'com.android.application'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'dagger.hilt.android.plugin'
+    id 'com.google.devtools.ksp'
     id 'org.jetbrains.kotlin.plugin.compose'
+    id 'dagger.hilt.android.plugin'
 }
 
 // Reads the Google maps key that is used in the AndroidManifest
@@ -29,6 +28,7 @@ if (rootProject.file("local.properties").exists()) {
 }
 
 android {
+    namespace "androidx.compose.samples.crane"
     compileSdkVersion 36
     namespace "androidx.compose.samples.crane"
     defaultConfig {
@@ -69,10 +69,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
     buildFeatures {
         compose true
 
@@ -103,11 +99,11 @@ dependencies {
         }
     }
 
-    implementation "androidx.activity:activity-compose:1.12.2"
+    implementation "androidx.activity:activity-compose:1.12.3"
     implementation "androidx.appcompat:appcompat:1.7.1"
     implementation "androidx.tracing:tracing:1.3.0"
 
-    def composeBom = platform('androidx.compose:compose-bom:2026.01.00')
+    def composeBom = platform('androidx.compose:compose-bom:2026.01.01')
     implementation(composeBom)
     androidTestImplementation(composeBom)
     implementation "androidx.compose.runtime:runtime"
@@ -120,14 +116,14 @@ dependencies {
     debugImplementation "androidx.compose.ui:ui-tooling"
     debugImplementation "androidx.compose.ui:ui-test-manifest"
 
-
     def lifecycle_version = "2.10.0"
     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.57.2"
-    kapt "com.google.dagger:hilt-compiler:2.57.2"
-    kapt "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.9.0"
+
+    implementation "com.google.dagger:hilt-android:2.59.1"
+    ksp "com.google.dagger:hilt-compiler:2.59.1"
+    ksp "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"
 
     implementation "io.coil-kt:coil-compose:2.7.0"
 
@@ -138,8 +134,8 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0"
     androidTestImplementation "androidx.test.ext:junit-ktx:1.3.0"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
-    androidTestImplementation "com.google.dagger:hilt-android:2.57.2"
-    androidTestImplementation "com.google.dagger:hilt-android-testing:2.57.2"
-    kaptAndroidTest "com.google.dagger:hilt-compiler:2.57.2"
-    kaptAndroidTest "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.9.0"
+    androidTestImplementation "com.google.dagger:hilt-android:2.59.1"
+    androidTestImplementation "com.google.dagger:hilt-android-testing:2.59.1"
+    kspAndroidTest "com.google.dagger:hilt-compiler:2.59.1"
+    kspAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"
 }

AdvancedStateAndSideEffectsCodelab/build.gradle

@@ -20,15 +20,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.13.2"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0"
-        classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.2"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.0"
+        classpath "com.android.tools.build:gradle:9.0.0"
+        classpath "com.google.dagger:hilt-android-gradle-plugin:2.59.1"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
     }
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '8.1.0'
+    id 'com.diffplug.spotless' version '8.2.1'
+    id 'com.google.devtools.ksp' version '2.3.4' apply false
 }
 
 subprojects {

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.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

BasicLayoutsCodelab/app/build.gradle

@@ -16,7 +16,6 @@
 
 plugins {
     id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
     id 'org.jetbrains.kotlin.plugin.compose'
 }
 
@@ -47,9 +46,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         compose true
     }
@@ -61,7 +57,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2026.01.00')
+    def composeBom = platform('androidx.compose:compose-bom:2026.01.01')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
@@ -73,7 +69,7 @@ dependencies {
     implementation "androidx.compose.ui:ui-tooling-preview"
     implementation "com.google.android.material:material:1.13.0"
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.10.0'
-    implementation 'androidx.activity:activity-compose:1.12.2'
+    implementation 'androidx.activity:activity-compose:1.12.3'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'

BasicLayoutsCodelab/build.gradle

@@ -19,14 +19,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.13.2"
+        classpath "com.android.tools.build:gradle:9.0.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
     }
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '8.1.0'
+    id 'com.diffplug.spotless' version '8.2.1'
 }
 
 subprojects {

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.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

MigrationCodelab/app/build.gradle

@@ -15,10 +15,9 @@
  */
 
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'
+apply plugin: 'com.android.legacy-kapt'
 
 
 android {
@@ -36,17 +35,14 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-        freeCompilerArgs = ['-Xjvm-default=all-compatibility']
-    }
+
     buildFeatures {
         dataBinding true
         compose true
@@ -60,7 +56,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2026.01.00')
+    def composeBom = platform('androidx.compose:compose-bom:2026.01.01')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
@@ -72,14 +68,14 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:1.8.9"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.10.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0"
-    implementation "androidx.navigation:navigation-fragment-ktx:2.9.6"
-    implementation "androidx.navigation:navigation-ui-ktx:2.9.6"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.9.7"
+    implementation "androidx.navigation:navigation-ui-ktx:2.9.7"
     implementation "androidx.recyclerview:recyclerview:1.4.0"
     implementation "androidx.room:room-runtime:2.8.4"
     implementation "androidx.room:room-ktx:2.8.4"
     implementation "androidx.tracing:tracing:1.3.0"
     implementation "androidx.viewpager2:viewpager2:1.1.0"
-    implementation "androidx.work:work-runtime-ktx:2.11.0"
+    implementation "androidx.work:work-runtime-ktx:2.11.1"
     implementation "com.github.bumptech.glide:glide:5.0.5"
     implementation "com.google.android.material:material:1.13.0"
     implementation "com.google.code.gson:gson:2.13.2"
@@ -103,7 +99,7 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-intents:3.7.0"
     androidTestImplementation "androidx.test.ext:junit:1.3.0"
     androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0"
-    androidTestImplementation "androidx.work:work-testing:2.11.0"
+    androidTestImplementation "androidx.work:work-testing:2.11.1"
     androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.1"
     androidTestImplementation "com.google.truth:truth:1.4.5"
     androidTestImplementation "androidx.compose.ui:ui-test-junit4"

MigrationCodelab/build.gradle

@@ -21,15 +21,16 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.13.2"
+        classpath "com.android.tools.build:gradle:9.0.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.6"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.7"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
     }
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '8.1.0'
+    id 'com.diffplug.spotless' version '8.2.1'
+    id 'com.android.legacy-kapt' version '9.0.0' apply false
 }
 
 allprojects {

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.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

MigrationCodelab/settings.gradle

@@ -14,4 +14,12 @@
  * limitations under the License.
  */
 
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
 include ':app'