diff --git a/.github/workflows/AccessibilityCodelab.yaml b/.github/workflows/AccessibilityCodelab.yaml index fde7e706e..8a65bdb4c 100644 --- a/.github/workflows/AccessibilityCodelab.yaml +++ b/.github/workflows/AccessibilityCodelab.yaml @@ -24,7 +24,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 ab766a21c..3e57dbf3c 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -23,7 +23,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 @@ -71,7 +71,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 813d4b97b..64dca7e7b 100644 --- a/.github/workflows/AnimationCodelab.yaml +++ b/.github/workflows/AnimationCodelab.yaml @@ -23,7 +23,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 f18fe73b3..f00432497 100644 --- a/.github/workflows/BasicLayoutsCodelab.yaml +++ b/.github/workflows/BasicLayoutsCodelab.yaml @@ -23,7 +23,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 1ae100e93..075a52b88 100644 --- a/.github/workflows/BasicStateCodelab.yaml +++ b/.github/workflows/BasicStateCodelab.yaml @@ -23,7 +23,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 8836a566d..4bacb2f7d 100644 --- a/.github/workflows/BasicsCodelab.yaml +++ b/.github/workflows/BasicsCodelab.yaml @@ -23,7 +23,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 826f0c8a8..df2f5efaf 100644 --- a/.github/workflows/MigrationCodelab.yaml +++ b/.github/workflows/MigrationCodelab.yaml @@ -23,7 +23,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 @@ -71,7 +71,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/NavigationCodelab.yaml b/.github/workflows/NavigationCodelab.yaml index 375b9dde4..c21b6cec1 100644 --- a/.github/workflows/NavigationCodelab.yaml +++ b/.github/workflows/NavigationCodelab.yaml @@ -24,7 +24,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 aac084bf4..7c6847574 100644 --- a/.github/workflows/TestingCodelab.yaml +++ b/.github/workflows/TestingCodelab.yaml @@ -24,7 +24,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 9571b2ed1..cad193b24 100644 --- a/.github/workflows/ThemingCodelab.yaml +++ b/.github/workflows/ThemingCodelab.yaml @@ -23,7 +23,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 c1e38570c..f8de85e24 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -25,7 +25,7 @@ android { compileSdkVersion 36 defaultConfig { applicationId 'com.example.jetnews' - 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) @@ -114,16 +114,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 b81711f82..a9a8b0344 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.2.20" } } 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.2.20" 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 fb1dff5b2..cbeb1c5f4 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -1,15 +1,15 @@ [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.2.20" kotlinxCoroutinesAndroid = "1.10.2" -lifecycle = "2.9.4" -window = "1.5.0" +lifecycle = "2.10.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 d5857be5c..6e7b16da0 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -33,7 +33,7 @@ android { compileSdkVersion 36 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" @@ -120,7 +120,7 @@ dependencies { debugImplementation "androidx.compose.ui:ui-tooling" 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 "com.google.dagger:hilt-android:2.57.2" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 22f18db72..d09bb0d70 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.2.20" classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.2" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" @@ -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/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 043d8d4e4..6ec8d21b1 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/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.2.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index bc32167f6..4c4dde760 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -25,7 +25,7 @@ android { compileSdk 36 defaultConfig { applicationId 'com.example.android.codelab.animation' - minSdkVersion 21 + minSdkVersion 23 targetSdk 34 versionCode 1 versionName '1.0' @@ -43,10 +43,10 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.10.01') + def composeBom = platform('androidx.compose:compose-bom:2025.12.00') implementation(composeBom) - implementation 'androidx.activity:activity-compose:1.11.0' + implementation 'androidx.activity:activity-compose:1.12.1' implementation 'androidx.core:core-ktx:1.17.0' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material3:material3" diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 100644 --- a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AnimationCodelab/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/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index bc32167f6..4c4dde760 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -25,7 +25,7 @@ android { compileSdk 36 defaultConfig { applicationId 'com.example.android.codelab.animation' - minSdkVersion 21 + minSdkVersion 23 targetSdk 34 versionCode 1 versionName '1.0' @@ -43,10 +43,10 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.10.01') + def composeBom = platform('androidx.compose:compose-bom:2025.12.00') implementation(composeBom) - implementation 'androidx.activity:activity-compose:1.11.0' + implementation 'androidx.activity:activity-compose:1.12.1' implementation 'androidx.core:core-ktx:1.17.0' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material3:material3" diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index e8b2444fe..fa5cbe47c 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 a91fcb5ea..b7142851e 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,14 +20,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.2.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } 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/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts index 0a7e2664e..39ff1c9ce 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -65,10 +65,10 @@ android { dependencies { implementation("androidx.core:core-ktx:1.17.0") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.4") - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4") - implementation("androidx.activity:activity-compose:1.11.0") - implementation(platform("androidx.compose:compose-bom:2025.10.01")) + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.10.0") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0") + implementation("androidx.activity:activity-compose:1.12.1") + implementation(platform("androidx.compose:compose-bom:2025.12.00")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") @@ -77,7 +77,7 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.3.0") androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0") - androidTestImplementation(platform("androidx.compose:compose-bom:2025.10.01")) + androidTestImplementation(platform("androidx.compose:compose-bom:2025.12.00")) androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index c2831e38e..105a4617c 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -20,14 +20,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.2.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } plugins { - id 'com.diffplug.spotless' version '8.0.0' + id 'com.diffplug.spotless' version '8.1.0' } subprojects { diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 100644 --- a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/BasicStateCodelab/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/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts index e4a91951b..7ecd2f586 100644 --- a/BasicsCodelab/app/build.gradle.kts +++ b/BasicsCodelab/app/build.gradle.kts @@ -65,9 +65,9 @@ android { dependencies { implementation("androidx.core:core-ktx:1.17.0") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.4") - implementation("androidx.activity:activity-compose:1.11.0") - implementation(platform("androidx.compose:compose-bom:2025.10.01")) + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.10.0") + implementation("androidx.activity:activity-compose:1.12.1") + implementation(platform("androidx.compose:compose-bom:2025.12.00")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") @@ -76,7 +76,7 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.3.0") androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0") - androidTestImplementation(platform("androidx.compose:compose-bom:2025.10.01")) + androidTestImplementation(platform("androidx.compose:compose-bom:2025.12.00")) androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts index 019b78cf9..acd89657a 100644 --- a/BasicsCodelab/build.gradle.kts +++ b/BasicsCodelab/build.gradle.kts @@ -16,7 +16,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.13.0" apply false + id("com.android.application") version "8.13.1" apply false id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlin.plugin.compose") version "2.2.20" apply false } diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 100644 --- a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/BasicsCodelab/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 e9145864c..150bf177a 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.2.20" - 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.2.20" } } 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 a4272d7c7..92c1b54cf 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,7 +95,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.11.0" + implementation "androidx.activity:activity-compose:1.12.1" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 19ca56e4c..43b3765cb 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.2.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } 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/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 3aaf4dad7..28fc96e16 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.7.1-0.6.x-compat" -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.2.20" @@ -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/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index b0c2927ff..d557fd366 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/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' @@ -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) @@ -103,7 +103,7 @@ dependencies { implementation "androidx.compose.runtime:runtime-livedata" implementation "androidx.compose.ui:ui-tooling-preview" implementation "androidx.compose.material:material-icons-extended" - implementation "androidx.activity:activity-compose:1.11.0" + implementation "androidx.activity:activity-compose:1.12.1" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 24b13d4e8..73af79ede 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/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.2.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } 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 f2d00666a..f21936877 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -25,7 +25,7 @@ android { compileSdkVersion 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,14 +110,14 @@ 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" 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 ee60d9a39..bc47c1223 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.2.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } 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 diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index 45e9acb44..acdd6f42a 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -25,7 +25,7 @@ android { compileSdkVersion 36 defaultConfig { applicationId 'com.codelab.theming' - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 33 versionCode 1 versionName '1.0' @@ -44,14 +44,14 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.10.01') + def composeBom = platform('androidx.compose:compose-bom:2025.12.00') implementation(composeBom) implementation 'androidx.core:core-ktx:1.17.0' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material:material" implementation "androidx.compose.material:material-icons-extended" - implementation 'androidx.activity:activity-compose:1.11.0' + implementation 'androidx.activity:activity-compose:1.12.1' implementation "androidx.compose.ui:ui-tooling-preview" debugImplementation "androidx.compose.ui:ui-tooling" } diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index 80dabe28c..abfe8023f 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/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.2.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 100644 --- a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties +++ b/ThemingCodelabM2/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