diff --git a/.github/workflows/AccessibilityCodelab.yaml b/.github/workflows/AccessibilityCodelab.yaml index c00f4a6ae..065ca8f35 100644 --- a/.github/workflows/AccessibilityCodelab.yaml +++ b/.github/workflows/AccessibilityCodelab.yaml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index 9b115bfc0..a2b0f33e9 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties @@ -77,7 +77,7 @@ jobs: ls /dev/kvm - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/AnimationCodelab.yaml b/.github/workflows/AnimationCodelab.yaml index bcb1ec3cb..2ee567607 100644 --- a/.github/workflows/AnimationCodelab.yaml +++ b/.github/workflows/AnimationCodelab.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/BasicLayoutsCodelab.yaml b/.github/workflows/BasicLayoutsCodelab.yaml index 2f2fe30f4..782409a35 100644 --- a/.github/workflows/BasicLayoutsCodelab.yaml +++ b/.github/workflows/BasicLayoutsCodelab.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/BasicStateCodelab.yaml b/.github/workflows/BasicStateCodelab.yaml index fc727729c..2ec2546f5 100644 --- a/.github/workflows/BasicStateCodelab.yaml +++ b/.github/workflows/BasicStateCodelab.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/BasicsCodelab.yaml b/.github/workflows/BasicsCodelab.yaml index bd7e95816..1ca67829f 100644 --- a/.github/workflows/BasicsCodelab.yaml +++ b/.github/workflows/BasicsCodelab.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/MigrationCodelab.yaml b/.github/workflows/MigrationCodelab.yaml index 32dee932b..b272eda2b 100644 --- a/.github/workflows/MigrationCodelab.yaml +++ b/.github/workflows/MigrationCodelab.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties @@ -69,7 +69,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/NavigationCodelab.yaml b/.github/workflows/NavigationCodelab.yaml index e7fc1adbd..7a125b5ca 100644 --- a/.github/workflows/NavigationCodelab.yaml +++ b/.github/workflows/NavigationCodelab.yaml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/TestingCodelab.yaml b/.github/workflows/TestingCodelab.yaml index d3bd7452d..072270d4c 100644 --- a/.github/workflows/TestingCodelab.yaml +++ b/.github/workflows/TestingCodelab.yaml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/ThemingCodelab.yaml b/.github/workflows/ThemingCodelab.yaml index 88fdd41d8..d59ed8045 100644 --- a/.github/workflows/ThemingCodelab.yaml +++ b/.github/workflows/ThemingCodelab.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 68c7d202f..3c878aef3 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -25,7 +25,7 @@ android { namespace 'com.example.jetnews' defaultConfig { applicationId 'com.example.jetnews' - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 33 versionCode 1 versionName '1.0' @@ -70,7 +70,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.10.01') + def composeBom = platform('androidx.compose:compose-bom:2025.12.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -97,16 +97,16 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" implementation 'androidx.appcompat:appcompat:1.7.1' - implementation 'androidx.activity:activity-ktx:1.11.0' + implementation 'androidx.activity:activity-ktx:1.12.1' implementation 'androidx.core:core-ktx:1.17.0' - implementation "androidx.activity:activity-compose:1.11.0" + implementation "androidx.activity:activity-compose:1.12.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.4" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4" + 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.5' + implementation 'androidx.navigation:navigation-compose:2.9.6' androidTestImplementation 'androidx.test:rules:1.7.0' androidTestImplementation 'androidx.test:runner:1.7.0' diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 2c70fad77..a6c29b9ff 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.0' + classpath 'com.android.tools.build:gradle:8.13.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '8.0.0' + id 'com.diffplug.spotless' version '8.1.0' id 'org.jetbrains.kotlin.plugin.compose' version "2.1.21" apply false } diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 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.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.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 bebdd94f8..d125f8525 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -1,17 +1,17 @@ [versions] -androidGradlePlugin = "8.13.0" -composeBom = "2025.10.01" +androidGradlePlugin = "8.13.1" +composeBom = "2025.12.00" coreKtx = "1.17.0" -activityCompose = "1.11.0" +activityCompose = "1.12.1" espressoCore = "3.7.0" junit = "4.13.2" junitVersion = "1.3.0" kotlin = "2.1.21" kotlinxCoroutinesAndroid = "1.10.2" -lifecycle = "2.9.4" +lifecycle = "2.10.0" material3Adaptive = "1.2.0" material3AdaptiveNavSuite = "1.4.0" -window = "1.5.0" +window = "1.5.1" [libraries] androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" } diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 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.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 0b1c706a2..84ccc8dbb 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -33,7 +33,7 @@ android { namespace "androidx.compose.samples.crane" defaultConfig { applicationId "androidx.compose.samples.crane" - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -103,11 +103,11 @@ dependencies { } } - implementation "androidx.activity:activity-compose:1.11.0" + implementation "androidx.activity:activity-compose:1.12.1" implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.tracing:tracing:1.3.0" - def composeBom = platform('androidx.compose:compose-bom:2025.10.01') + def composeBom = platform('androidx.compose:compose-bom:2025.12.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -121,7 +121,7 @@ dependencies { debugImplementation "androidx.compose.ui:ui-test-manifest" - def lifecycle_version = "2.9.4" + 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" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 8a4a4023c..1d297fe75 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.13.0" + classpath "com.android.tools.build:gradle:8.13.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.2" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" @@ -28,7 +28,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '8.0.0' + id 'com.diffplug.spotless' version '8.1.0' } subprojects { diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 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.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 24b8419d6..6ae973786 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -61,7 +61,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.10.01') + def composeBom = platform('androidx.compose:compose-bom:2025.12.00') implementation(composeBom) androidTestImplementation(composeBom) @@ -72,8 +72,8 @@ dependencies { implementation "androidx.compose.material:material-icons-extended" implementation "androidx.compose.ui:ui-tooling-preview" implementation "com.google.android.material:material:1.13.0" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.4' - implementation 'androidx.activity:activity-compose:1.11.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.10.0' + implementation 'androidx.activity:activity-compose:1.12.1' 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 4043fc4e5..0ab9ec089 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -19,14 +19,14 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.13.0" + classpath "com.android.tools.build:gradle:8.13.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '8.0.0' + id 'com.diffplug.spotless' version '8.1.0' } subprojects { diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 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.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 1d25c1345..719617333 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -60,23 +60,23 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.10.01') + def composeBom = platform('androidx.compose:compose-bom:2025.12.00') implementation(composeBom) androidTestImplementation(composeBom) - kapt "androidx.room:room-compiler:2.8.3" + kapt "androidx.room:room-compiler:2.8.4" kapt "com.github.bumptech.glide:compiler:5.0.5" implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.constraintlayout:constraintlayout:2.2.1" implementation "androidx.core:core-ktx:1.17.0" implementation "androidx.fragment:fragment-ktx:1.8.9" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.4" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4" - implementation "androidx.navigation:navigation-fragment-ktx:2.9.5" - implementation "androidx.navigation:navigation-ui-ktx:2.9.5" + 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.recyclerview:recyclerview:1.4.0" - implementation "androidx.room:room-runtime:2.8.3" - implementation "androidx.room:room-ktx:2.8.3" + 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" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 9b37e7672..46549f2b1 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,15 +21,15 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.13.0" + classpath "com.android.tools.build:gradle:8.13.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.5" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.6" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '8.0.0' + id 'com.diffplug.spotless' version '8.1.0' } allprojects { diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 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.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 8b829c986..aa5a8a596 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -26,7 +26,7 @@ android { defaultConfig { applicationId "com.example.compose.rally" - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 33 versionCode 1 versionName '1.0' @@ -81,7 +81,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.10.01') + def composeBom = platform('androidx.compose:compose-bom:2025.12.00') implementation(composeBom) androidTestImplementation(composeBom) @@ -95,13 +95,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.11.0" - implementation "androidx.navigation:navigation-compose:2.9.5" + implementation "androidx.activity:activity-compose:1.12.1" + implementation "androidx.navigation:navigation-compose:2.9.6" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies androidTestImplementation "androidx.arch.core:core-testing:2.2.0" - androidTestImplementation "androidx.navigation:navigation-testing:2.9.5" + androidTestImplementation "androidx.navigation:navigation-testing:2.9.6" 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 6dffd2402..77c042752 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.13.0" + classpath "com.android.tools.build:gradle:8.13.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '8.0.0' + id 'com.diffplug.spotless' version '8.1.0' } subprojects { diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 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.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.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 3dca97802..d5313f311 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.9.4") + implementation("androidx.compose.runtime:runtime-tracing:1.10.0") implementation(libs.coil.compose) implementation(libs.androidx.media3.exoplayer) diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 1192453b9..6db2a8321 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] coil = "2.7.0" -com-android-application = "8.13.0" +com-android-application = "8.13.1" desugar_jdk_libs = "2.1.5" kotlinx-datetime = "0.6.2" -lifecycle-viewmodel-compose = "2.9.4" +lifecycle-viewmodel-compose = "2.10.0" material-icons-core = "1.7.8" media3 = "1.8.0" org-jetbrains-kotlin-android = "2.1.21" @@ -11,18 +11,18 @@ 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.9.4" -activity-compose = "1.11.0" -compose-bom = "2025.10.01" -runtime-tracing = "1.9.4" +lifecycle-runtime-ktx = "2.10.0" +activity-compose = "1.12.1" +compose-bom = "2025.12.00" +runtime-tracing = "1.10.0" tracing-ktx = "1.3.0" -tracing-perfetto = "1.0.0" +tracing-perfetto = "1.0.1" uiautomator = "2.3.0" benchmark = "1.4.1" androidx-baselineprofile = "1.4.1" profileinstaller = "1.4.1" material3 = "1.4.0" -spotless = "8.0.0" +spotless = "8.1.0" ktlint = "1.2.1" [libraries] diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 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.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/PerformanceCodelab/measure/build.gradle.kts b/PerformanceCodelab/measure/build.gradle.kts index 53559285e..83df5f1c2 100644 --- a/PerformanceCodelab/measure/build.gradle.kts +++ b/PerformanceCodelab/measure/build.gradle.kts @@ -79,6 +79,6 @@ dependencies { implementation(libs.benchmark.macro.junit4) // TODO Codelab task: Add tracing-perfetto(-binary) dependencies to enable Composition Tracing - implementation("androidx.tracing:tracing-perfetto:1.0.0") - implementation("androidx.tracing:tracing-perfetto-binary:1.0.0") + implementation("androidx.tracing:tracing-perfetto:1.0.1") + implementation("androidx.tracing:tracing-perfetto-binary:1.0.1") } diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index eb8d192ca..dcf0d66cf 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -26,7 +26,7 @@ android { namespace "com.example.compose.rally" defaultConfig { applicationId "com.example.compose.rally" - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 33 versionCode 1 versionName '1.0' @@ -84,7 +84,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.10.01') + def composeBom = platform('androidx.compose:compose-bom:2025.12.00') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index ed0a52613..01ac972cd 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -19,12 +19,12 @@ buildscript { ext { // Sdk and tools compileSdkVersion = 36 - minSdkVersion = 21 + minSdkVersion = 23 targetSdkVersion = 33 // App dependencies appCompatVersion = '1.7.1' - activityComposeVersion = '1.11.0' + activityComposeVersion = '1.12.1' 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.0" + classpath "com.android.tools.build:gradle:8.13.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion" } } plugins { - id 'com.diffplug.spotless' version '8.0.0' + id 'com.diffplug.spotless' version '8.1.0' } subprojects { diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 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.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index d8b63ed99..c9bf44713 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -25,7 +25,7 @@ android { compileSdk 36 defaultConfig { applicationId 'com.example.reply' - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 33 versionCode 1 versionName '1.0' @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.10.01') + def composeBom = platform('androidx.compose:compose-bom:2025.12.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -110,15 +110,15 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" implementation 'androidx.appcompat:appcompat:1.7.1' - implementation 'androidx.activity:activity-ktx:1.11.0' + implementation 'androidx.activity:activity-ktx:1.12.1' implementation 'androidx.core:core-ktx:1.17.0' - implementation "androidx.activity:activity-compose:1.11.0" + implementation "androidx.activity:activity-compose:1.12.1" - implementation "androidx.lifecycle:lifecycle-runtime-compose:2.9.4" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.4" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4" + implementation "androidx.lifecycle:lifecycle-runtime-compose:2.10.0" + 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" androidTestImplementation 'androidx.test:rules:1.7.0' androidTestImplementation 'androidx.test:runner:1.7.0' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index f21967d72..19016ba13 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.0' + classpath 'com.android.tools.build:gradle:8.13.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '8.0.0' + id 'com.diffplug.spotless' version '8.1.0' } subprojects { diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 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.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME