diff --git a/.github/workflows/AccessibilityCodelab.yaml b/.github/workflows/AccessibilityCodelab.yaml index 7c0cd1694..3dfc54233 100644 --- a/.github/workflows/AccessibilityCodelab.yaml +++ b/.github/workflows/AccessibilityCodelab.yaml @@ -30,12 +30,12 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v5 - name: Build project working-directory: ${{ env.SAMPLE_PATH }} diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index 2fda2c125..69c4cce34 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -29,12 +29,12 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v5 - name: Build project working-directory: ${{ env.SAMPLE_PATH }} @@ -77,12 +77,12 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v5 - name: Run instrumentation tests uses: reactivecircus/android-emulator-runner@v2 diff --git a/.github/workflows/AnimationCodelab.yaml b/.github/workflows/AnimationCodelab.yaml index a2d0f2e38..0f2c6fa93 100644 --- a/.github/workflows/AnimationCodelab.yaml +++ b/.github/workflows/AnimationCodelab.yaml @@ -29,12 +29,12 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v5 - name: Build project working-directory: ${{ env.SAMPLE_PATH }} diff --git a/.github/workflows/BasicLayoutsCodelab.yaml b/.github/workflows/BasicLayoutsCodelab.yaml index d94954793..882b65b69 100644 --- a/.github/workflows/BasicLayoutsCodelab.yaml +++ b/.github/workflows/BasicLayoutsCodelab.yaml @@ -29,12 +29,12 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v5 - name: Build project working-directory: ${{ env.SAMPLE_PATH }} diff --git a/.github/workflows/BasicStateCodelab.yaml b/.github/workflows/BasicStateCodelab.yaml index 15aacaacb..32ec54e59 100644 --- a/.github/workflows/BasicStateCodelab.yaml +++ b/.github/workflows/BasicStateCodelab.yaml @@ -29,12 +29,12 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v5 - name: Build project working-directory: ${{ env.SAMPLE_PATH }} diff --git a/.github/workflows/BasicsCodelab.yaml b/.github/workflows/BasicsCodelab.yaml index 9db1b5a15..a180cf2fb 100644 --- a/.github/workflows/BasicsCodelab.yaml +++ b/.github/workflows/BasicsCodelab.yaml @@ -29,12 +29,12 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v5 - name: Build project working-directory: ${{ env.SAMPLE_PATH }} diff --git a/.github/workflows/MigrationCodelab.yaml b/.github/workflows/MigrationCodelab.yaml index c81e95f1a..bc987256b 100644 --- a/.github/workflows/MigrationCodelab.yaml +++ b/.github/workflows/MigrationCodelab.yaml @@ -29,12 +29,12 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v5 - name: Build project working-directory: ${{ env.SAMPLE_PATH }} @@ -77,12 +77,12 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v5 - name: Run instrumentation tests uses: reactivecircus/android-emulator-runner@v2 diff --git a/.github/workflows/NavigationCodelab.yaml b/.github/workflows/NavigationCodelab.yaml index c5a0b70a6..3e25e8497 100644 --- a/.github/workflows/NavigationCodelab.yaml +++ b/.github/workflows/NavigationCodelab.yaml @@ -30,12 +30,12 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v5 - name: Build project working-directory: ${{ env.SAMPLE_PATH }} diff --git a/.github/workflows/TestingCodelab.yaml b/.github/workflows/TestingCodelab.yaml index 021f4cd4e..52b897bdd 100644 --- a/.github/workflows/TestingCodelab.yaml +++ b/.github/workflows/TestingCodelab.yaml @@ -30,12 +30,12 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v5 - name: Build project working-directory: ${{ env.SAMPLE_PATH }} diff --git a/.github/workflows/ThemingCodelab.yaml b/.github/workflows/ThemingCodelab.yaml index 07470d5e8..3090bee64 100644 --- a/.github/workflows/ThemingCodelab.yaml +++ b/.github/workflows/ThemingCodelab.yaml @@ -29,12 +29,12 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - - uses: gradle/actions/setup-gradle@v4 + - uses: gradle/actions/setup-gradle@v5 - name: Build project working-directory: ${{ env.SAMPLE_PATH }} diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 60a84723b..a5531138c 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.08.00') + def composeBom = platform('androidx.compose:compose-bom:2025.10.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -114,23 +114,23 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" implementation 'androidx.appcompat:appcompat:1.7.1' - implementation 'androidx.activity:activity-ktx:1.10.1' + implementation 'androidx.activity:activity-ktx:1.11.0' implementation 'androidx.core:core-ktx:1.17.0' - implementation "androidx.activity:activity-compose:1.10.1" + implementation "androidx.activity:activity-compose:1.11.0" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.2" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2" + 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.navigation:navigation-compose:2.9.3' + implementation 'androidx.navigation:navigation-compose:2.9.5' androidTestImplementation 'androidx.test:rules:1.7.0' androidTestImplementation 'androidx.test:runner:1.7.0' // TODO: Bump to latest after Espresso 3.5.0 goes stable // (due to https://github.com/robolectric/robolectric/issues/6593) - testImplementation 'org.robolectric:robolectric:4.15.1' + testImplementation 'org.robolectric:robolectric:4.16' } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index f592214f6..b81711f82 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.12.1' + classpath 'com.android.tools.build:gradle:8.13.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20" } } plugins { - id 'com.diffplug.spotless' version '7.2.1' + id 'com.diffplug.spotless' version '8.0.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 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdaptiveUiCodelab/app/build.gradle.kts b/AdaptiveUiCodelab/app/build.gradle.kts index 8293523a7..b0e0c4ece 100644 --- a/AdaptiveUiCodelab/app/build.gradle.kts +++ b/AdaptiveUiCodelab/app/build.gradle.kts @@ -26,7 +26,7 @@ android { defaultConfig { applicationId = "com.example.reply" - minSdk = 21 + minSdk = 23 targetSdk = 33 versionCode = 1 versionName = "1.0" diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index 7fbc84391..56e3e7f36 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -1,15 +1,15 @@ [versions] -androidGradlePlugin = "8.12.1" -composeBom = "2025.08.00" +androidGradlePlugin = "8.13.0" +composeBom = "2025.10.00" coreKtx = "1.17.0" -activityCompose = "1.10.1" +activityCompose = "1.11.0" espressoCore = "3.7.0" junit = "4.13.2" junitVersion = "1.3.0" kotlin = "2.2.20" kotlinxCoroutinesAndroid = "1.10.2" -lifecycle = "2.9.2" -window = "1.4.0" +lifecycle = "2.9.4" +window = "1.5.0" [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 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 13bd8d679..9e308c3eb 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -103,11 +103,11 @@ dependencies { } } - implementation "androidx.activity:activity-compose:1.10.1" + implementation "androidx.activity:activity-compose:1.11.0" implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.tracing:tracing:1.3.0" - def composeBom = platform('androidx.compose:compose-bom:2025.08.00') + def composeBom = platform('androidx.compose:compose-bom:2025.10.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -120,11 +120,11 @@ dependencies { debugImplementation "androidx.compose.ui:ui-tooling" debugImplementation "androidx.compose.ui:ui-test-manifest" - def lifecycle_version = "2.9.2" + def lifecycle_version = "2.9.4" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - implementation "com.google.dagger:hilt-android:2.57" - kapt "com.google.dagger:hilt-compiler:2.57" + implementation "com.google.dagger:hilt-android:2.57.2" + kapt "com.google.dagger:hilt-compiler:2.57.2" implementation "io.coil-kt:coil-compose:2.7.0" @@ -135,7 +135,7 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0" androidTestImplementation "androidx.test.ext:junit-ktx:1.3.0" androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2" - androidTestImplementation "com.google.dagger:hilt-android:2.57" - androidTestImplementation "com.google.dagger:hilt-android-testing:2.57" - kaptAndroidTest "com.google.dagger:hilt-compiler:2.57" + androidTestImplementation "com.google.dagger:hilt-android:2.57.2" + androidTestImplementation "com.google.dagger:hilt-android-testing:2.57.2" + kaptAndroidTest "com.google.dagger:hilt-compiler:2.57.2" } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 09fba777e..22f18db72 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,15 +20,15 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.12.1" + classpath "com.android.tools.build:gradle:8.13.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20" - classpath "com.google.dagger:hilt-android-gradle-plugin:2.57" + classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.2" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } plugins { - id 'com.diffplug.spotless' version '7.2.1' + id 'com.diffplug.spotless' version '8.0.0' } subprojects { diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index bfa0c9a8a..043d8d4e4 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.12.1' + classpath 'com.android.tools.build:gradle:8.13.0' 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 21c939318..5acf926ad 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -43,13 +43,14 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.08.00') + def composeBom = platform('androidx.compose:compose-bom:2025.10.00') implementation(composeBom) - implementation 'androidx.activity:activity-compose:1.10.1' + implementation 'androidx.activity:activity-compose:1.11.0' implementation 'androidx.core:core-ktx:1.17.0' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material3:material3" implementation "androidx.compose.ui:ui-tooling-preview" + implementation "androidx.compose.material:material-icons-core" debugImplementation "androidx.compose.ui:ui-tooling" } diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties index 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index 21c939318..5acf926ad 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -43,13 +43,14 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.08.00') + def composeBom = platform('androidx.compose:compose-bom:2025.10.00') implementation(composeBom) - implementation 'androidx.activity:activity-compose:1.10.1' + implementation 'androidx.activity:activity-compose:1.11.0' implementation 'androidx.core:core-ktx:1.17.0' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material3:material3" implementation "androidx.compose.ui:ui-tooling-preview" + implementation "androidx.compose.material:material-icons-core" debugImplementation "androidx.compose.ui:ui-tooling" } diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 4ca724abe..f26fd344f 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -61,19 +61,19 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.08.00') + def composeBom = platform('androidx.compose:compose-bom:2025.10.00') implementation(composeBom) androidTestImplementation(composeBom) implementation 'androidx.core:core-ktx:1.17.0' implementation "androidx.compose.ui:ui" implementation 'androidx.compose.material3:material3' - implementation 'androidx.compose.material3:material3-window-size-class:1.3.2' + implementation 'androidx.compose.material3:material3-window-size-class:1.4.0' implementation "androidx.compose.material:material-icons-extended" implementation "androidx.compose.ui:ui-tooling-preview" - implementation "com.google.android.material:material:1.12.0" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.2' - implementation 'androidx.activity:activity-compose:1.10.1' + 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' 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 6cac83bef..a91fcb5ea 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,14 +20,14 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.12.1" + classpath "com.android.tools.build:gradle:8.13.0" 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 '7.2.1' + id 'com.diffplug.spotless' version '8.0.0' } subprojects { diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-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 0aa57a694..b444f771a 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -65,18 +65,19 @@ android { dependencies { implementation("androidx.core:core-ktx:1.17.0") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.2") - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2") - implementation("androidx.activity:activity-compose:1.10.1") - implementation(platform("androidx.compose:compose-bom:2025.08.00")) + 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.00")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") implementation("androidx.compose.material3:material3") + implementation("androidx.compose.material:material-icons-core") 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.08.00")) + androidTestImplementation(platform("androidx.compose:compose-bom:2025.10.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 0c7dbd27e..c2831e38e 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -20,14 +20,14 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.12.1' + classpath 'com.android.tools.build:gradle:8.13.0' 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 '7.2.1' + id 'com.diffplug.spotless' version '8.0.0' } subprojects { diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties index 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-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 6e68a43d2..5ddc70c90 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.2") - implementation("androidx.activity:activity-compose:1.10.1") - implementation(platform("androidx.compose:compose-bom:2025.08.00")) + 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.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.08.00")) + androidTestImplementation(platform("androidx.compose:compose-bom:2025.10.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 629190786..019b78cf9 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.12.1" apply false + id("com.android.application") version "8.13.0" 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 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index e8cf44299..a8a1cf077 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -26,7 +26,7 @@ android { namespace "com.google.samples.apps.sunflower" defaultConfig { applicationId "com.google.samples.apps.sunflower" - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 33 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" versionCode 1 @@ -60,29 +60,29 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.08.00') + def composeBom = platform('androidx.compose:compose-bom:2025.10.00') implementation(composeBom) androidTestImplementation(composeBom) - kapt "androidx.room:room-compiler:2.7.2" - kapt "com.github.bumptech.glide:compiler:4.16.0" + kapt "androidx.room:room-compiler:2.8.2" + 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.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2" - implementation "androidx.navigation:navigation-fragment-ktx:2.9.3" - implementation "androidx.navigation:navigation-ui-ktx:2.9.3" + 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.recyclerview:recyclerview:1.4.0" - implementation "androidx.room:room-runtime:2.7.2" - implementation "androidx.room:room-ktx:2.7.2" + implementation "androidx.room:room-runtime:2.8.2" + implementation "androidx.room:room-ktx:2.8.2" implementation "androidx.tracing:tracing:1.3.0" implementation "androidx.viewpager2:viewpager2:1.1.0" - implementation "androidx.work:work-runtime-ktx:2.10.3" - implementation "com.github.bumptech.glide:glide:4.16.0" - implementation "com.google.android.material:material:1.12.0" - implementation "com.google.code.gson:gson:2.13.1" + implementation "androidx.work:work-runtime-ktx:2.10.5" + implementation "com.github.bumptech.glide:glide:5.0.5" + implementation "com.google.android.material:material:1.13.0" + implementation "com.google.code.gson:gson:2.13.2" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2" @@ -103,9 +103,9 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-intents:3.7.0" androidTestImplementation "androidx.test.ext:junit:1.3.0" androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0" - androidTestImplementation "androidx.work:work-testing:2.10.3" + androidTestImplementation "androidx.work:work-testing:2.10.5" androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.1" - androidTestImplementation "com.google.truth:truth:1.4.4" + androidTestImplementation "com.google.truth:truth:1.4.5" androidTestImplementation "androidx.compose.ui:ui-test-junit4" testImplementation "junit:junit:4.13.2" } diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index bfe5114bc..e9145864c 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,15 +21,15 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.12.1" + classpath "com.android.tools.build:gradle:8.13.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.3" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.5" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } plugins { - id 'com.diffplug.spotless' version '7.2.1' + id 'com.diffplug.spotless' version '8.0.0' } allprojects { diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index dfc9ccb77..f5a4ba27a 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -81,13 +81,13 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.08.00') + def composeBom = platform('androidx.compose:compose-bom:2025.10.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.core:core-ktx:1.17.0" - implementation "com.google.android.material:material:1.12.0" + implementation "com.google.android.material:material:1.13.0" // Compose implementation "androidx.compose.runtime:runtime" @@ -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.10.1" + implementation "androidx.activity:activity-compose:1.11.0" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 4dd7132f4..19ca56e4c 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.12.1" + classpath "com.android.tools.build:gradle:8.13.0" 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 '7.2.1' + id 'com.diffplug.spotless' version '8.0.0' } subprojects { diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-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 85d325614..d93c336b7 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.12.1" +com-android-application = "8.13.0" desugar_jdk_libs = "2.1.5" kotlinx-datetime = "0.7.1-0.6.x-compat" -lifecycle-viewmodel-compose = "2.9.2" +lifecycle-viewmodel-compose = "2.9.4" 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.2" -activity-compose = "1.10.1" -compose-bom = "2025.08.00" -runtime-tracing = "1.9.0" +lifecycle-runtime-ktx = "2.9.4" +activity-compose = "1.11.0" +compose-bom = "2025.10.00" +runtime-tracing = "1.9.3" tracing-ktx = "1.3.0" tracing-perfetto = "1.0.0" uiautomator = "2.3.0" -benchmark = "1.4.0" -androidx-baselineprofile = "1.4.0" +benchmark = "1.4.1" +androidx-baselineprofile = "1.4.1" profileinstaller = "1.4.1" -material3 = "1.3.2" -spotless = "7.2.1" +material3 = "1.4.0" +spotless = "8.0.0" ktlint = "1.2.1" [libraries] diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties index 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 1f4c8acf1..e3fdcdb96 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -84,13 +84,13 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.08.00') + def composeBom = platform('androidx.compose:compose-bom:2025.10.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.core:core-ktx:1.17.0" - implementation "com.google.android.material:material:1.12.0" + implementation "com.google.android.material:material:1.13.0" implementation "androidx.fragment:fragment-ktx:1.8.9" // Compose @@ -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.10.1" + implementation "androidx.activity:activity-compose:1.11.0" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index f5553ee13..24b13d4e8 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.12.1" + classpath "com.android.tools.build:gradle:8.13.0" 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 '7.2.1' + id 'com.diffplug.spotless' version '8.0.0' } subprojects { diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 874fc4271..096308fea 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.08.00') + def composeBom = platform('androidx.compose:compose-bom:2025.10.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.10.1' + implementation 'androidx.activity:activity-ktx:1.11.0' implementation 'androidx.core:core-ktx:1.17.0' - implementation "androidx.activity:activity-compose:1.10.1" + implementation "androidx.activity:activity-compose:1.11.0" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.2" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2" + 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" 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 8aaa1f24e..ee60d9a39 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.12.1' + classpath 'com.android.tools.build:gradle:8.13.0' 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 '7.2.1' + id 'com.diffplug.spotless' version '8.0.0' } subprojects { diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index 662e7eae7..2da235896 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -44,14 +44,14 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.08.00') + def composeBom = platform('androidx.compose:compose-bom:2025.10.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.10.1' + implementation 'androidx.activity:activity-compose:1.11.0' implementation "androidx.compose.ui:ui-tooling-preview" debugImplementation "androidx.compose.ui:ui-tooling" } diff --git a/ThemingCodelabM2/app/src/main/AndroidManifest.xml b/ThemingCodelabM2/app/src/main/AndroidManifest.xml index 71d42e795..be3213e70 100644 --- a/ThemingCodelabM2/app/src/main/AndroidManifest.xml +++ b/ThemingCodelabM2/app/src/main/AndroidManifest.xml @@ -12,8 +12,7 @@ or implied. See the License for the specific language governing permissions and limitations under the License. --> - + ) diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index 781cfacb7..80dabe28c 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.12.1" + classpath "com.android.tools.build:gradle:8.13.0" 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 2a84e188b..2e1113280 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.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME