diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 180facf17..63ef7d239 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/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 { diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index a571b46b3..12128bceb 100644 --- a/AccessibilityCodelab/build.gradle +++ b/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 } diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c7..61285a659 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 23449a2b5..37f78a6af 100644 --- a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index d63169889..2af544f3a 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/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" diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c7..61285a659 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 23449a2b5..37f78a6af 100644 --- a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index dbccc20c0..d1e575b4a 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/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" } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 6352cf302..0f2024890 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/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 { diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c7..61285a659 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 23449a2b5..37f78a6af 100644 --- a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 584993eb4..4c5d0b549 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/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' diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index efbb18cc0..457a09c8c 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/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 { diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c7..61285a659 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 23449a2b5..37f78a6af 100644 --- a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index ef3a8e725..1a665554b 100644 --- a/MigrationCodelab/app/build.gradle +++ b/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" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 9347e7fc3..313e07508 100644 --- a/MigrationCodelab/build.gradle +++ b/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 { diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.jar b/MigrationCodelab/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c7..61285a659 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 23449a2b5..37f78a6af 100644 --- a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/settings.gradle b/MigrationCodelab/settings.gradle index 1ebe8029a..fcb112a59 100644 --- a/MigrationCodelab/settings.gradle +++ b/MigrationCodelab/settings.gradle @@ -14,4 +14,12 @@ * limitations under the License. */ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + include ':app' diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index ef94ff933..84cda503e 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -16,7 +16,6 @@ plugins { id 'com.android.application' - id 'kotlin-android' id 'org.jetbrains.kotlin.plugin.compose' } @@ -61,10 +60,6 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = '1.8' - } - buildFeatures { compose true } @@ -81,7 +76,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) @@ -95,13 +90,13 @@ dependencies { implementation "androidx.compose.foundation:foundation" implementation "androidx.compose.material:material" implementation "androidx.compose.material:material-icons-extended" - implementation "androidx.activity:activity-compose:1.12.2" - implementation "androidx.navigation:navigation-compose:2.9.6" + implementation "androidx.activity:activity-compose:1.12.3" + implementation "androidx.navigation:navigation-compose:2.9.7" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies androidTestImplementation "androidx.arch.core:core-testing:2.2.0" - androidTestImplementation "androidx.navigation:navigation-testing:2.9.6" + androidTestImplementation "androidx.navigation:navigation-testing:2.9.7" androidTestImplementation "androidx.test.espresso:espresso-contrib:3.7.0" androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0" diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 40948b4da..f83c99441 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,14 +21,14 @@ 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 "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 { diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.jar b/NavigationCodelab/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c7..61285a659 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 23449a2b5..37f78a6af 100644 --- a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/PerformanceCodelab/app/build.gradle.kts b/PerformanceCodelab/app/build.gradle.kts index f8f6a152c..d5a3dbdb6 100644 --- a/PerformanceCodelab/app/build.gradle.kts +++ b/PerformanceCodelab/app/build.gradle.kts @@ -92,7 +92,7 @@ dependencies { implementation(libs.androidx.tracing.ktx) // TODO Codelab task: Add androidx.runtime-tracing dependency to enable Composition Tracing - implementation("androidx.compose.runtime:runtime-tracing:1.10.1") + implementation("androidx.compose.runtime:runtime-tracing:1.10.2") implementation(libs.coil.compose) implementation(libs.androidx.media3.exoplayer) diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index cfaae3c55..cff904ae1 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -1,20 +1,20 @@ [versions] coil = "2.7.0" -com-android-application = "8.13.2" +com-android-application = "9.0.0" desugar_jdk_libs = "2.1.5" kotlinx-datetime = "0.7.1-0.6.x-compat" lifecycle-viewmodel-compose = "2.10.0" material-icons-core = "1.7.8" -media3 = "1.9.0" +media3 = "1.9.2" org-jetbrains-kotlin-android = "2.3.0" core-ktx = "1.17.0" junit = "4.13.2" androidx-test-ext-junit = "1.3.0" espresso-core = "3.7.0" lifecycle-runtime-ktx = "2.10.0" -activity-compose = "1.12.2" -compose-bom = "2026.01.00" -runtime-tracing = "1.10.1" +activity-compose = "1.12.3" +compose-bom = "2026.01.01" +runtime-tracing = "1.10.2" tracing-ktx = "1.3.0" tracing-perfetto = "1.0.1" uiautomator = "2.3.0" @@ -22,7 +22,7 @@ benchmark = "1.4.1" androidx-baselineprofile = "1.4.1" profileinstaller = "1.4.1" material3 = "1.4.0" -spotless = "8.1.0" +spotless = "8.2.1" ktlint = "1.2.1" [libraries] diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.jar b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c7..61285a659 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 23449a2b5..37f78a6af 100644 --- a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 1956a0015..fad6fe1ef 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -16,7 +16,6 @@ plugins { id 'com.android.application' - id 'kotlin-android' id 'org.jetbrains.kotlin.plugin.compose' } @@ -61,10 +60,6 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = '1.8' - } - buildFeatures { compose true @@ -84,7 +79,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) diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 74dbf64a1..6a2777e53 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -24,7 +24,7 @@ buildscript { // App dependencies appCompatVersion = '1.7.1' - activityComposeVersion = '1.12.2' + activityComposeVersion = '1.12.3' coreTestingVersion = '2.2.0' coroutinesVersion = "1.5.2" espressoVersion = '3.7.0' @@ -48,14 +48,14 @@ 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:$kotlinVersion" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion" } } plugins { - id 'com.diffplug.spotless' version '8.1.0' + id 'com.diffplug.spotless' version '8.2.1' } subprojects { diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.jar b/TestingCodelab/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c7..61285a659 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 23449a2b5..37f78a6af 100644 --- a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 6af79cc58..b1588f71a 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -16,7 +16,6 @@ plugins { id 'com.android.application' - id 'kotlin-android' id 'org.jetbrains.kotlin.plugin.compose' } @@ -87,7 +86,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) @@ -110,9 +109,9 @@ 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-runtime-compose:2.10.0" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0" diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index d6f19d436..50fda5ba1 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,14 +21,14 @@ 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 "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 { diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.jar b/ThemingCodelab/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c7..61285a659 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 23449a2b5..37f78a6af 100644 --- a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME