From e73772fe71e4ac415afa25adfef4ef873b014fdf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 28 Feb 2026 00:57:44 +0000 Subject: [PATCH 1/2] Update all dependencies --- .github/workflows/AccessibilityCodelab.yaml | 4 ++-- .../AdvancedStateAndSideEffectsCodelab.yaml | 6 +++--- .github/workflows/AnimationCodelab.yaml | 4 ++-- .github/workflows/BasicLayoutsCodelab.yaml | 4 ++-- .github/workflows/BasicStateCodelab.yaml | 4 ++-- .github/workflows/BasicsCodelab.yaml | 4 ++-- .github/workflows/MigrationCodelab.yaml | 6 +++--- .github/workflows/NavigationCodelab.yaml | 4 ++-- .github/workflows/TestingCodelab.yaml | 4 ++-- .github/workflows/ThemingCodelab.yaml | 4 ++-- AccessibilityCodelab/app/build.gradle | 6 +++--- AccessibilityCodelab/build.gradle | 2 +- AdaptiveUiCodelab/gradle/libs.versions.toml | 6 +++--- .../app/build.gradle | 14 +++++++------- AdvancedStateAndSideEffectsCodelab/build.gradle | 6 +++--- BasicLayoutsCodelab/app/build.gradle | 4 ++-- BasicLayoutsCodelab/build.gradle | 2 +- MigrationCodelab/app/build.gradle | 2 +- MigrationCodelab/build.gradle | 4 ++-- NavigationCodelab/app/build.gradle | 4 ++-- NavigationCodelab/build.gradle | 2 +- PerformanceCodelab/app/build.gradle.kts | 2 +- PerformanceCodelab/gradle/libs.versions.toml | 8 ++++---- TestingCodelab/app/build.gradle | 2 +- TestingCodelab/build.gradle | 4 ++-- ThemingCodelab/app/build.gradle | 6 +++--- ThemingCodelab/build.gradle | 2 +- 27 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.github/workflows/AccessibilityCodelab.yaml b/.github/workflows/AccessibilityCodelab.yaml index 8549fef9e..b9a060890 100644 --- a/.github/workflows/AccessibilityCodelab.yaml +++ b/.github/workflows/AccessibilityCodelab.yaml @@ -48,14 +48,14 @@ jobs: run: ./gradlew assembleDebug lintDebug --stacktrace - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-outputs path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index 48c4ca0fa..2421ec8ea 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -47,14 +47,14 @@ jobs: run: ./gradlew assembleDebug lintDebug --stacktrace - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-outputs path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports @@ -111,7 +111,7 @@ jobs: - name: Upload test reports if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: test-reports-state-${{ matrix.api-level }} path: ${{ env.SAMPLE_PATH }}/app/build/reports diff --git a/.github/workflows/AnimationCodelab.yaml b/.github/workflows/AnimationCodelab.yaml index d618fa0e7..5d99caef9 100644 --- a/.github/workflows/AnimationCodelab.yaml +++ b/.github/workflows/AnimationCodelab.yaml @@ -47,14 +47,14 @@ jobs: run: ./gradlew assembleDebug lintDebug --stacktrace - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-outputs path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports diff --git a/.github/workflows/BasicLayoutsCodelab.yaml b/.github/workflows/BasicLayoutsCodelab.yaml index ac6d33a10..93b93efcb 100644 --- a/.github/workflows/BasicLayoutsCodelab.yaml +++ b/.github/workflows/BasicLayoutsCodelab.yaml @@ -47,14 +47,14 @@ jobs: run: ./gradlew assembleDebug lintDebug --stacktrace - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-outputs path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports \ No newline at end of file diff --git a/.github/workflows/BasicStateCodelab.yaml b/.github/workflows/BasicStateCodelab.yaml index 8a909cfc3..2c6d65f71 100644 --- a/.github/workflows/BasicStateCodelab.yaml +++ b/.github/workflows/BasicStateCodelab.yaml @@ -47,14 +47,14 @@ jobs: run: ./gradlew assembleDebug lintDebug --stacktrace - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-outputs path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports \ No newline at end of file diff --git a/.github/workflows/BasicsCodelab.yaml b/.github/workflows/BasicsCodelab.yaml index cc9e8e527..814b576cd 100644 --- a/.github/workflows/BasicsCodelab.yaml +++ b/.github/workflows/BasicsCodelab.yaml @@ -47,14 +47,14 @@ jobs: run: ./gradlew assembleDebug lintDebug --stacktrace - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-outputs path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports \ No newline at end of file diff --git a/.github/workflows/MigrationCodelab.yaml b/.github/workflows/MigrationCodelab.yaml index 2d0b5005f..417257ed3 100644 --- a/.github/workflows/MigrationCodelab.yaml +++ b/.github/workflows/MigrationCodelab.yaml @@ -47,14 +47,14 @@ jobs: run: ./gradlew assembleDebug lintDebug --stacktrace - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-outputs path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports @@ -102,7 +102,7 @@ jobs: - name: Upload test reports if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: test-reports-migration-${{ matrix.api-level }} path: ${{ env.SAMPLE_PATH }}/app/build/reports diff --git a/.github/workflows/NavigationCodelab.yaml b/.github/workflows/NavigationCodelab.yaml index 1a1b63b05..666046b79 100644 --- a/.github/workflows/NavigationCodelab.yaml +++ b/.github/workflows/NavigationCodelab.yaml @@ -48,14 +48,14 @@ jobs: run: ./gradlew assembleDebug lintDebug --stacktrace - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-outputs path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports diff --git a/.github/workflows/TestingCodelab.yaml b/.github/workflows/TestingCodelab.yaml index 58c064326..573940d97 100644 --- a/.github/workflows/TestingCodelab.yaml +++ b/.github/workflows/TestingCodelab.yaml @@ -48,14 +48,14 @@ jobs: run: ./gradlew assembleDebug lintDebug --stacktrace - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-outputs path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports diff --git a/.github/workflows/ThemingCodelab.yaml b/.github/workflows/ThemingCodelab.yaml index c0d6bd9c8..d1a00aa65 100644 --- a/.github/workflows/ThemingCodelab.yaml +++ b/.github/workflows/ThemingCodelab.yaml @@ -47,14 +47,14 @@ jobs: run: ./gradlew assembleDebug lintDebug --stacktrace - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-outputs path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: build-reports path: ${{ env.SAMPLE_PATH }}/app/build/reports \ No newline at end of file diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 63ef7d239..fa0564a8d 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -69,7 +69,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.01.01') + def composeBom = platform('androidx.compose:compose-bom:2026.02.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -96,9 +96,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.3' + implementation 'androidx.activity:activity-ktx:1.12.4' implementation 'androidx.core:core-ktx:1.17.0' - implementation "androidx.activity:activity-compose:1.12.3" + implementation "androidx.activity:activity-compose:1.12.4" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0" implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0" diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 12128bceb..5db88b3d4 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:9.0.0' + classpath 'com.android.tools.build:gradle:9.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0" } } diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index 2af544f3a..387be2815 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -androidGradlePlugin = "9.0.0" -composeBom = "2026.01.01" +androidGradlePlugin = "9.0.1" +composeBom = "2026.02.01" coreKtx = "1.17.0" -activityCompose = "1.12.3" +activityCompose = "1.12.4" espressoCore = "3.7.0" junit = "4.13.2" junitVersion = "1.3.0" diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index d1e575b4a..cde279729 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -99,11 +99,11 @@ dependencies { } } - implementation "androidx.activity:activity-compose:1.12.3" + implementation "androidx.activity:activity-compose:1.12.4" implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.tracing:tracing:1.3.0" - def composeBom = platform('androidx.compose:compose-bom:2026.01.01') + def composeBom = platform('androidx.compose:compose-bom:2026.02.01') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -121,8 +121,8 @@ dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version" - implementation "com.google.dagger:hilt-android:2.59.1" - ksp "com.google.dagger:hilt-compiler:2.59.1" + implementation "com.google.dagger:hilt-android:2.59.2" + ksp "com.google.dagger:hilt-compiler:2.59.2" ksp "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0" implementation "io.coil-kt:coil-compose:2.7.0" @@ -134,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.59.1" - androidTestImplementation "com.google.dagger:hilt-android-testing:2.59.1" - kspAndroidTest "com.google.dagger:hilt-compiler:2.59.1" + androidTestImplementation "com.google.dagger:hilt-android:2.59.2" + androidTestImplementation "com.google.dagger:hilt-android-testing:2.59.2" + kspAndroidTest "com.google.dagger:hilt-compiler:2.59.2" kspAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0" } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 0f2024890..cf7992067 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,15 +20,15 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:9.0.0" - classpath "com.google.dagger:hilt-android-gradle-plugin:2.59.1" + classpath "com.android.tools.build:gradle:9.0.1" + classpath "com.google.dagger:hilt-android-gradle-plugin:2.59.2" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10" } } plugins { id 'com.diffplug.spotless' version '8.2.1' - id 'com.google.devtools.ksp' version '2.3.4' apply false + id 'com.google.devtools.ksp' version '2.3.6' apply false } subprojects { diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 4c5d0b549..8ab2ea532 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.01.01') + def composeBom = platform('androidx.compose:compose-bom:2026.02.01') implementation(composeBom) androidTestImplementation(composeBom) @@ -69,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.3' + implementation 'androidx.activity:activity-compose:1.12.4' 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 457a09c8c..977de1500 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -19,7 +19,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:9.0.0" + classpath "com.android.tools.build:gradle:9.0.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0" } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 1a665554b..ca77f691f 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -56,7 +56,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.01.01') + def composeBom = platform('androidx.compose:compose-bom:2026.02.01') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 313e07508..acbf5309f 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:9.0.0" + classpath "com.android.tools.build:gradle:9.0.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.7" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0" @@ -30,7 +30,7 @@ buildscript { plugins { id 'com.diffplug.spotless' version '8.2.1' - id 'com.android.legacy-kapt' version '9.0.0' apply false + id 'com.android.legacy-kapt' version '9.0.1' apply false } allprojects { diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 84cda503e..16c09f65f 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -76,7 +76,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.01.01') + def composeBom = platform('androidx.compose:compose-bom:2026.02.01') implementation(composeBom) androidTestImplementation(composeBom) @@ -90,7 +90,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.12.3" + implementation "androidx.activity:activity-compose:1.12.4" implementation "androidx.navigation:navigation-compose:2.9.7" debugImplementation "androidx.compose.ui:ui-tooling" diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index f83c99441..3085eca28 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:9.0.0" + classpath "com.android.tools.build:gradle:9.0.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0" } diff --git a/PerformanceCodelab/app/build.gradle.kts b/PerformanceCodelab/app/build.gradle.kts index d5a3dbdb6..e620d1666 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.2") + implementation("androidx.compose.runtime:runtime-tracing:1.10.4") implementation(libs.coil.compose) implementation(libs.androidx.media3.exoplayer) diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index cff904ae1..fed544fb4 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] coil = "2.7.0" -com-android-application = "9.0.0" +com-android-application = "9.0.1" desugar_jdk_libs = "2.1.5" kotlinx-datetime = "0.7.1-0.6.x-compat" lifecycle-viewmodel-compose = "2.10.0" @@ -12,9 +12,9 @@ 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.3" -compose-bom = "2026.01.01" -runtime-tracing = "1.10.2" +activity-compose = "1.12.4" +compose-bom = "2026.02.01" +runtime-tracing = "1.10.4" tracing-ktx = "1.3.0" tracing-perfetto = "1.0.1" uiautomator = "2.3.0" diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index fad6fe1ef..4794b68fb 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -79,7 +79,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.01.01') + def composeBom = platform('androidx.compose:compose-bom:2026.02.01') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 6a2777e53..f855d7f8c 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -24,7 +24,7 @@ buildscript { // App dependencies appCompatVersion = '1.7.1' - activityComposeVersion = '1.12.3' + activityComposeVersion = '1.12.4' coreTestingVersion = '2.2.0' coroutinesVersion = "1.5.2" espressoVersion = '3.7.0' @@ -48,7 +48,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:9.0.0" + classpath "com.android.tools.build:gradle:9.0.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion" } diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index b1588f71a..2cf52ad83 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -86,7 +86,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.01.01') + def composeBom = platform('androidx.compose:compose-bom:2026.02.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -109,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.3' + implementation 'androidx.activity:activity-ktx:1.12.4' implementation 'androidx.core:core-ktx:1.17.0' - implementation "androidx.activity:activity-compose:1.12.3" + implementation "androidx.activity:activity-compose:1.12.4" 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 50fda5ba1..5a4176eea 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:9.0.0' + classpath 'com.android.tools.build:gradle:9.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0" } From 50e66ef890888ada7b4466ad438c6737884b54cd Mon Sep 17 00:00:00 2001 From: Ben Sagmoe Date: Mon, 2 Mar 2026 12:18:49 -0500 Subject: [PATCH 2/2] Remove remaining Android Kotlin Plugin references --- AdaptiveUiCodelab/app/build.gradle.kts | 4 ---- AdaptiveUiCodelab/build.gradle.kts | 1 - AdaptiveUiCodelab/gradle/libs.versions.toml | 1 - PerformanceCodelab/app/build.gradle.kts | 6 +----- PerformanceCodelab/build.gradle.kts | 1 - PerformanceCodelab/gradle/libs.versions.toml | 6 +----- PerformanceCodelab/measure/build.gradle.kts | 19 +++++++++---------- 7 files changed, 11 insertions(+), 27 deletions(-) diff --git a/AdaptiveUiCodelab/app/build.gradle.kts b/AdaptiveUiCodelab/app/build.gradle.kts index a44f1037b..eb1856c1e 100644 --- a/AdaptiveUiCodelab/app/build.gradle.kts +++ b/AdaptiveUiCodelab/app/build.gradle.kts @@ -16,7 +16,6 @@ plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.compose.compiler) } @@ -50,9 +49,6 @@ android { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" - } buildFeatures { compose = true } diff --git a/AdaptiveUiCodelab/build.gradle.kts b/AdaptiveUiCodelab/build.gradle.kts index 26b89a836..aab7e396a 100644 --- a/AdaptiveUiCodelab/build.gradle.kts +++ b/AdaptiveUiCodelab/build.gradle.kts @@ -23,6 +23,5 @@ buildscript { plugins { alias(libs.plugins.android.application) apply false - alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.compose.compiler) apply false } diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index 387be2815..d102e22ff 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -38,5 +38,4 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine [plugins] android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/PerformanceCodelab/app/build.gradle.kts b/PerformanceCodelab/app/build.gradle.kts index e620d1666..b071fd75a 100644 --- a/PerformanceCodelab/app/build.gradle.kts +++ b/PerformanceCodelab/app/build.gradle.kts @@ -15,7 +15,6 @@ */ plugins { alias(libs.plugins.com.android.application) - alias(libs.plugins.org.jetbrains.kotlin.android) alias(libs.plugins.androidx.baselineprofile) alias(libs.plugins.compose) } @@ -26,7 +25,7 @@ android { defaultConfig { applicationId = "com.compose.performance" - minSdk = 21 + minSdk = 23 targetSdk = 34 versionCode = 1 versionName = "1.0" @@ -52,9 +51,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 isCoreLibraryDesugaringEnabled = true } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } buildFeatures { compose = true } diff --git a/PerformanceCodelab/build.gradle.kts b/PerformanceCodelab/build.gradle.kts index c0b4e980c..4de253dd6 100644 --- a/PerformanceCodelab/build.gradle.kts +++ b/PerformanceCodelab/build.gradle.kts @@ -3,7 +3,6 @@ import com.diffplug.gradle.spotless.SpotlessExtension // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { alias(libs.plugins.com.android.application) apply false - alias(libs.plugins.org.jetbrains.kotlin.android) apply false alias(libs.plugins.androidTest) apply false alias(libs.plugins.androidx.baselineprofile) apply false alias(libs.plugins.com.diffplug.spotless) apply false diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index fed544fb4..63b6e3917 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -19,7 +19,7 @@ tracing-ktx = "1.3.0" tracing-perfetto = "1.0.1" uiautomator = "2.3.0" benchmark = "1.4.1" -androidx-baselineprofile = "1.4.1" +androidx-baselineprofile = "1.5.0-alpha03" profileinstaller = "1.4.1" material3 = "1.4.0" spotless = "8.2.1" @@ -58,11 +58,7 @@ ktlint = { module = "com.pinterest.ktlint:ktlint-core", version.ref = "ktlint" } [plugins] com-android-application = { id = "com.android.application", version.ref = "com-android-application" } -org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin-android" } androidTest = { id = "com.android.test", version.ref = "com-android-application" } androidx-baselineprofile = { id = "androidx.baselineprofile", version.ref = "androidx-baselineprofile" } com-diffplug-spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "org-jetbrains-kotlin-android" } - -[bundles] - diff --git a/PerformanceCodelab/measure/build.gradle.kts b/PerformanceCodelab/measure/build.gradle.kts index 83df5f1c2..ff739976b 100644 --- a/PerformanceCodelab/measure/build.gradle.kts +++ b/PerformanceCodelab/measure/build.gradle.kts @@ -17,7 +17,6 @@ import com.android.build.api.dsl.ManagedVirtualDevice plugins { alias(libs.plugins.androidTest) - alias(libs.plugins.org.jetbrains.kotlin.android) alias(libs.plugins.androidx.baselineprofile) } @@ -30,10 +29,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { minSdk = 27 targetSdk = 34 @@ -56,11 +51,15 @@ android { targetProjectPath = ":app" - testOptions.managedDevices.devices { - create("pixel6Api33") { - device = "Pixel 6" - apiLevel = 33 - systemImageSource = "aosp" + testOptions { + managedDevices { + localDevices { + create("pixel6Api33") { + device = "Pixel 6" + apiLevel = 33 + systemImageSource = "aosp" + } + } } } }