diff --git a/.github/workflows/AccessibilityCodelab.yaml b/.github/workflows/AccessibilityCodelab.yaml index b283be50a..7c0cd1694 100644 --- a/.github/workflows/AccessibilityCodelab.yaml +++ b/.github/workflows/AccessibilityCodelab.yaml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - 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 56aab4176..2fda2c125 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - 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@v4 + uses: actions/checkout@v5 - 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 f60e71d06..a2d0f2e38 100644 --- a/.github/workflows/AnimationCodelab.yaml +++ b/.github/workflows/AnimationCodelab.yaml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - 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 2091ad004..d94954793 100644 --- a/.github/workflows/BasicLayoutsCodelab.yaml +++ b/.github/workflows/BasicLayoutsCodelab.yaml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - 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 78f077ca0..15aacaacb 100644 --- a/.github/workflows/BasicStateCodelab.yaml +++ b/.github/workflows/BasicStateCodelab.yaml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - 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 4aa648a73..9db1b5a15 100644 --- a/.github/workflows/BasicsCodelab.yaml +++ b/.github/workflows/BasicsCodelab.yaml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - 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 ed4d6d68b..c81e95f1a 100644 --- a/.github/workflows/MigrationCodelab.yaml +++ b/.github/workflows/MigrationCodelab.yaml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - 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@v4 + uses: actions/checkout@v5 - 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 50096ee3f..c5a0b70a6 100644 --- a/.github/workflows/NavigationCodelab.yaml +++ b/.github/workflows/NavigationCodelab.yaml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - 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 97861842b..021f4cd4e 100644 --- a/.github/workflows/TestingCodelab.yaml +++ b/.github/workflows/TestingCodelab.yaml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - 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 e63a0a262..07470d5e8 100644 --- a/.github/workflows/ThemingCodelab.yaml +++ b/.github/workflows/ThemingCodelab.yaml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - 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 27c34a421..60a84723b 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace 'com.example.jetnews' - compileSdkVersion 35 + compileSdkVersion 36 defaultConfig { applicationId 'com.example.jetnews' minSdkVersion 21 @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.08.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -115,18 +115,18 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.7.1' implementation 'androidx.activity:activity-ktx:1.10.1' - implementation 'androidx.core:core-ktx:1.16.0' + implementation 'androidx.core:core-ktx:1.17.0' implementation "androidx.activity:activity-compose:1.10.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1" + 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.navigation:navigation-compose:2.9.0' + implementation 'androidx.navigation:navigation-compose:2.9.3' - androidTestImplementation 'androidx.test:rules:1.6.1' - androidTestImplementation 'androidx.test:runner:1.6.2' + 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) diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index fc0f43708..a33747d30 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.10.1' + classpath 'com.android.tools.build:gradle:8.12.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' 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 ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.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 8b11cb5bd..8293523a7 100644 --- a/AdaptiveUiCodelab/app/build.gradle.kts +++ b/AdaptiveUiCodelab/app/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.reply" - compileSdk = 35 + compileSdk = 36 defaultConfig { applicationId = "com.example.reply" diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index bf173ad12..142b663fa 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] -androidGradlePlugin = "8.10.1" -composeBom = "2025.06.01" -coreKtx = "1.16.0" +androidGradlePlugin = "8.12.1" +composeBom = "2025.08.00" +coreKtx = "1.17.0" activityCompose = "1.10.1" -espressoCore = "3.6.1" +espressoCore = "3.7.0" junit = "4.13.2" -junitVersion = "1.2.1" +junitVersion = "1.3.0" kotlin = "2.1.21" kotlinxCoroutinesAndroid = "1.10.2" -lifecycle = "2.9.1" +lifecycle = "2.9.2" window = "1.4.0" [libraries] diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index c90dba2ea..13bd8d679 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -30,7 +30,7 @@ if (rootProject.file("local.properties").exists()) { android { namespace "androidx.compose.samples.crane" - compileSdkVersion 35 + compileSdkVersion 36 defaultConfig { applicationId "androidx.compose.samples.crane" minSdkVersion 21 @@ -107,7 +107,7 @@ dependencies { implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.tracing:tracing:1.3.0" - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.08.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -120,22 +120,22 @@ dependencies { debugImplementation "androidx.compose.ui:ui-tooling" debugImplementation "androidx.compose.ui:ui-test-manifest" - def lifecycle_version = "2.9.1" + def lifecycle_version = "2.9.2" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - implementation "com.google.dagger:hilt-android:2.56.2" - kapt "com.google.dagger:hilt-compiler:2.56.2" + implementation "com.google.dagger:hilt-android:2.57" + kapt "com.google.dagger:hilt-compiler:2.57" implementation "io.coil-kt:coil-compose:2.7.0" androidTestImplementation "junit:junit:4.13.2" - androidTestImplementation "androidx.test:core:1.6.1" - androidTestImplementation "androidx.test:runner:1.6.2" - androidTestImplementation "androidx.test:rules:1.6.1" - androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1" - androidTestImplementation "androidx.test.ext:junit-ktx:1.2.1" + androidTestImplementation "androidx.test:core:1.7.0" + androidTestImplementation "androidx.test:runner:1.7.0" + androidTestImplementation "androidx.test:rules:1.7.0" + 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.56.2" - androidTestImplementation "com.google.dagger:hilt-android-testing:2.56.2" - kaptAndroidTest "com.google.dagger:hilt-compiler:2.56.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" } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index b32674ea8..7941c22a8 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,15 +20,15 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.10.1" + classpath "com.android.tools.build:gradle:8.12.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" - classpath "com.google.dagger:hilt-android-gradle-plugin:2.56.2" + classpath "com.google.dagger:hilt-android-gradle-plugin:2.57" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } subprojects { diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 47b60be49..10ca6fb49 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.10.1' + classpath 'com.android.tools.build:gradle:8.12.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index e5265d911..21c939318 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.example.android.codelab.animation" - compileSdk 35 + compileSdk 36 defaultConfig { applicationId 'com.example.android.codelab.animation' minSdkVersion 21 @@ -43,11 +43,11 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.08.00') implementation(composeBom) implementation 'androidx.activity:activity-compose:1.10.1' - implementation 'androidx.core:core-ktx:1.16.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" diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index e5265d911..21c939318 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.example.android.codelab.animation" - compileSdk 35 + compileSdk 36 defaultConfig { applicationId 'com.example.android.codelab.animation' minSdkVersion 21 @@ -43,11 +43,11 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.08.00') implementation(composeBom) implementation 'androidx.activity:activity-compose:1.10.1' - implementation 'androidx.core:core-ktx:1.16.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" diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 7634b5ad6..4ca724abe 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.codelab.basiclayouts" - compileSdk 35 + compileSdk 36 defaultConfig { applicationId "com.codelab.basiclayouts" @@ -61,22 +61,22 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.08.00') implementation(composeBom) androidTestImplementation(composeBom) - implementation 'androidx.core:core-ktx:1.16.0' + 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.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.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.2' implementation 'androidx.activity:activity-compose:1.10.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.2.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' + androidTestImplementation 'androidx.test.ext:junit:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' androidTestImplementation "androidx.compose.ui:ui-test-junit4" debugImplementation "androidx.compose.ui:ui-tooling" } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index d751fa596..f8c44f995 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,14 +20,14 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.10.1" + classpath "com.android.tools.build:gradle:8.12.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 '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } subprojects { diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.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 55af671dd..0aa57a694 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.codelabs.state" - compileSdk = 35 + compileSdk = 36 defaultConfig { applicationId = "com.codelabs.state" @@ -64,19 +64,19 @@ android { } dependencies { - implementation("androidx.core:core-ktx:1.16.0") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1") + 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.06.01")) + implementation(platform("androidx.compose:compose-bom:2025.08.00")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") implementation("androidx.compose.material3:material3") testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.2.1") - androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2025.06.01")) + 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("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 89b5eddfd..911548d1b 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -20,14 +20,14 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.10.1' + classpath 'com.android.tools.build:gradle:8.12.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 '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } subprojects { diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.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 9cd35e8c2..6e68a43d2 100644 --- a/BasicsCodelab/app/build.gradle.kts +++ b/BasicsCodelab/app/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.codelab.basics" - compileSdk = 35 + compileSdk = 36 defaultConfig { applicationId = "com.codelab.basics" @@ -64,19 +64,19 @@ android { } dependencies { - implementation("androidx.core:core-ktx:1.16.0") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1") + 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.06.01")) + implementation(platform("androidx.compose:compose-bom:2025.08.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-extended") testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.2.1") - androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2025.06.01")) + 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("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 1a5377dca..14784a39b 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.10.1" apply false + id("com.android.application") version "8.12.1" apply false id("org.jetbrains.kotlin.android") version "2.1.21" apply false id("org.jetbrains.kotlin.plugin.compose") version "2.1.21" apply false } diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 0a4fc472c..e8cf44299 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'org.jetbrains.kotlin.plugin.compose' android { - compileSdkVersion 35 + compileSdkVersion 36 namespace "com.google.samples.apps.sunflower" defaultConfig { applicationId "com.google.samples.apps.sunflower" @@ -60,7 +60,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.08.00') implementation(composeBom) androidTestImplementation(composeBom) @@ -68,18 +68,18 @@ dependencies { kapt "com.github.bumptech.glide:compiler:4.16.0" implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.constraintlayout:constraintlayout:2.2.1" - implementation "androidx.core:core-ktx:1.16.0" - implementation "androidx.fragment:fragment-ktx:1.8.8" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1" - implementation "androidx.navigation:navigation-fragment-ktx:2.9.0" - implementation "androidx.navigation:navigation-ui-ktx:2.9.0" + 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.recyclerview:recyclerview:1.4.0" implementation "androidx.room:room-runtime:2.7.2" implementation "androidx.room:room-ktx:2.7.2" implementation "androidx.tracing:tracing:1.3.0" implementation "androidx.viewpager2:viewpager2:1.1.0" - implementation "androidx.work:work-runtime-ktx:2.10.2" + 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" @@ -98,12 +98,12 @@ dependencies { // Testing dependencies androidTestImplementation "androidx.arch.core:core-testing:2.2.0" - androidTestImplementation "androidx.test.espresso:espresso-contrib:3.6.1" - androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1" - androidTestImplementation "androidx.test.espresso:espresso-intents:3.6.1" - androidTestImplementation "androidx.test.ext:junit:1.2.1" + androidTestImplementation "androidx.test.espresso:espresso-contrib:3.7.0" + androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0" + 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.2" + androidTestImplementation "androidx.work:work-testing:2.10.3" androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.1" androidTestImplementation "com.google.truth:truth:1.4.4" androidTestImplementation "androidx.compose.ui:ui-test-junit4" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index d1053a8c8..22c918388 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,15 +21,15 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.10.1" + classpath "com.android.tools.build:gradle:8.12.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.0" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.3" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } allprojects { diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 95274f947..dfc9ccb77 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.example.compose.rally" - compileSdkVersion 35 + compileSdkVersion 36 defaultConfig { applicationId "com.example.compose.rally" @@ -81,12 +81,12 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.08.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.appcompat:appcompat:1.7.1" - implementation "androidx.core:core-ktx:1.16.0" + implementation "androidx.core:core-ktx:1.17.0" implementation "com.google.android.material:material:1.12.0" // Compose @@ -100,8 +100,8 @@ dependencies { // Testing dependencies androidTestImplementation "androidx.arch.core:core-testing:2.2.0" - androidTestImplementation "androidx.test.espresso:espresso-contrib:3.6.1" - androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1" + androidTestImplementation "androidx.test.espresso:espresso-contrib:3.7.0" + androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0" // Compose testing dependencies androidTestImplementation "androidx.compose.ui:ui-test-junit4" diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index e74dfd91d..bf84af9d6 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.10.1" + classpath "com.android.tools.build:gradle:8.12.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 '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } subprojects { diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-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 25094d32c..337eda8ce 100644 --- a/PerformanceCodelab/app/build.gradle.kts +++ b/PerformanceCodelab/app/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.compose.performance" - compileSdk = 35 + compileSdk = 36 defaultConfig { applicationId = "com.compose.performance" diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 67964b79d..75b87afb0 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -1,28 +1,28 @@ [versions] coil = "2.7.0" -com-android-application = "8.10.1" +com-android-application = "8.12.1" desugar_jdk_libs = "2.1.5" kotlinx-datetime = "0.6.2" -lifecycle-viewmodel-compose = "2.9.1" +lifecycle-viewmodel-compose = "2.9.2" material-icons-core = "1.7.8" -media3 = "1.7.1" +media3 = "1.8.0" org-jetbrains-kotlin-android = "2.1.21" -core-ktx = "1.16.0" +core-ktx = "1.17.0" junit = "4.13.2" -androidx-test-ext-junit = "1.2.1" -espresso-core = "3.6.1" -lifecycle-runtime-ktx = "2.9.1" +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.06.01" -runtime-tracing = "1.8.3" +compose-bom = "2025.08.00" +runtime-tracing = "1.9.0" tracing-ktx = "1.3.0" tracing-perfetto = "1.0.0" uiautomator = "2.3.0" -benchmark = "1.3.4" -androidx-baselineprofile = "1.3.4" +benchmark = "1.4.0" +androidx-baselineprofile = "1.4.0" profileinstaller = "1.4.1" material3 = "1.3.2" -spotless = "7.0.4" +spotless = "7.2.1" ktlint = "1.2.1" [libraries] diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-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 794e8bce2..5c5644da6 100644 --- a/PerformanceCodelab/measure/build.gradle.kts +++ b/PerformanceCodelab/measure/build.gradle.kts @@ -23,7 +23,7 @@ plugins { android { namespace = "com.compose.performance.measure" - compileSdk = 35 + compileSdk = 36 compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 64ad45b40..1f4c8acf1 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.example.compose.rally" - compileSdkVersion 35 + compileSdkVersion 36 defaultConfig { applicationId "com.example.compose.rally" @@ -84,14 +84,14 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.08.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.appcompat:appcompat:1.7.1" - implementation "androidx.core:core-ktx:1.16.0" + implementation "androidx.core:core-ktx:1.17.0" implementation "com.google.android.material:material:1.12.0" - implementation "androidx.fragment:fragment-ktx:1.8.8" + implementation "androidx.fragment:fragment-ktx:1.8.9" // Compose implementation "androidx.compose.runtime:runtime" @@ -108,8 +108,8 @@ dependencies { // Testing dependencies androidTestImplementation "androidx.arch.core:core-testing:2.2.0" - androidTestImplementation "androidx.test.espresso:espresso-contrib:3.6.1" - androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1" + androidTestImplementation "androidx.test.espresso:espresso-contrib:3.7.0" + androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0" // Compose testing dependencies androidTestImplementation "androidx.compose.ui:ui-test" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index e9bbeb7c7..5fb6ee86a 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.10.1" + classpath "com.android.tools.build:gradle:8.12.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 '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } subprojects { diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 759b05fdf..874fc4271 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.example.reply" - compileSdkVersion 35 + compileSdkVersion 36 defaultConfig { applicationId 'com.example.reply' minSdkVersion 21 @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.08.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -111,16 +111,16 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.7.1' implementation 'androidx.activity:activity-ktx:1.10.1' - implementation 'androidx.core:core-ktx:1.16.0' + implementation 'androidx.core:core-ktx:1.17.0' implementation "androidx.activity:activity-compose:1.10.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1" + 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" - androidTestImplementation 'androidx.test:rules:1.6.1' - androidTestImplementation 'androidx.test:runner:1.6.2' + 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 42a0527af..ad4d00724 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.10.1' + classpath 'com.android.tools.build:gradle:8.12.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 '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } subprojects { diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index 6119daa5b..662e7eae7 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.codelab.theming" - compileSdkVersion 35 + compileSdkVersion 36 defaultConfig { applicationId 'com.codelab.theming' minSdkVersion 21 @@ -44,10 +44,10 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.08.00') implementation(composeBom) - implementation 'androidx.core:core-ktx:1.16.0' + 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" diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index 204f8bbe1..7325f0092 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.10.1" + classpath "com.android.tools.build:gradle:8.12.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..2a84e188b 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-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME