From 34639647f631c3b8fe32a5fd79d0d8b2a5ece5b7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 13:11:06 +0000 Subject: [PATCH] Update all dependencies (main) (#497) * Update all dependencies * Update compileSdk to 35 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jolanda Verhoef --- AccessibilityCodelab/app/build.gradle | 20 ++++++++--------- AccessibilityCodelab/build.gradle | 2 +- AdaptiveUiCodelab/app/build.gradle.kts | 2 +- AdaptiveUiCodelab/gradle/libs.versions.toml | 10 ++++----- .../app/build.gradle | 8 +++---- .../build.gradle | 2 +- AnimationCodelab/build.gradle | 2 +- AnimationCodelab/finished/build.gradle | 8 +++---- AnimationCodelab/start/build.gradle | 8 +++---- BasicLayoutsCodelab/app/build.gradle | 12 +++++----- BasicLayoutsCodelab/build.gradle | 2 +- BasicStateCodelab/app/build.gradle.kts | 14 ++++++------ BasicStateCodelab/build.gradle | 2 +- BasicsCodelab/app/build.gradle.kts | 12 +++++----- BasicsCodelab/build.gradle.kts | 2 +- MigrationCodelab/app/build.gradle | 22 +++++++++---------- MigrationCodelab/build.gradle | 4 ++-- NavigationCodelab/app/build.gradle | 8 +++---- NavigationCodelab/build.gradle | 2 +- PerformanceCodelab/app/build.gradle.kts | 2 +- PerformanceCodelab/gradle/libs.versions.toml | 22 +++++++++---------- PerformanceCodelab/measure/build.gradle.kts | 2 +- TestingCodelab/app/build.gradle | 10 ++++----- TestingCodelab/build.gradle | 2 +- ThemingCodelab/app/build.gradle | 20 ++++++++--------- ThemingCodelab/build.gradle | 2 +- ThemingCodelabM2/app/build.gradle | 8 +++---- ThemingCodelabM2/build.gradle | 2 +- 28 files changed, 106 insertions(+), 106 deletions(-) diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index e4d447252..31aa0840c 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace 'com.example.jetnews' - compileSdkVersion 34 + compileSdkVersion 35 defaultConfig { applicationId 'com.example.jetnews' minSdkVersion 21 @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.03') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -114,16 +114,16 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'androidx.activity:activity-ktx:1.9.2' - implementation 'androidx.core:core-ktx:1.13.1' - implementation "androidx.activity:activity-compose:1.9.2" + implementation 'androidx.activity:activity-ktx:1.9.3' + implementation 'androidx.core:core-ktx:1.15.0' + implementation "androidx.activity:activity-compose:1.9.3" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.6" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7" - implementation 'androidx.navigation:navigation-compose:2.8.2' + implementation 'androidx.navigation:navigation-compose:2.8.3' androidTestImplementation 'androidx.test:rules:1.6.1' androidTestImplementation 'androidx.test:runner:1.6.2' diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 175fb2bb7..86d50fe76 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.7.0' + classpath 'com.android.tools.build:gradle:8.7.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" } } diff --git a/AdaptiveUiCodelab/app/build.gradle.kts b/AdaptiveUiCodelab/app/build.gradle.kts index ee31fa6b5..8b11cb5bd 100644 --- a/AdaptiveUiCodelab/app/build.gradle.kts +++ b/AdaptiveUiCodelab/app/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.reply" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.example.reply" diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index e5eca7024..a297d537d 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] -androidGradlePlugin = "8.7.0" -composeBom = "2024.09.03" -coreKtx = "1.13.1" -activityCompose = "1.9.2" +androidGradlePlugin = "8.7.2" +composeBom = "2024.10.01" +coreKtx = "1.15.0" +activityCompose = "1.9.3" espressoCore = "3.6.1" junit = "4.13.2" junitVersion = "1.2.1" kotlin = "2.0.20" kotlinxCoroutinesAndroid = "1.8.1" -lifecycle = "2.8.6" +lifecycle = "2.8.7" window = "1.3.0" [libraries] diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index cd89e0636..42a6422e7 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 34 + compileSdkVersion 35 defaultConfig { applicationId "androidx.compose.samples.crane" minSdkVersion 21 @@ -103,11 +103,11 @@ dependencies { } } - implementation "androidx.activity:activity-compose:1.9.2" + implementation "androidx.activity:activity-compose:1.9.3" implementation "androidx.appcompat:appcompat:1.7.0" implementation "androidx.tracing:tracing:1.2.0" - def composeBom = platform('androidx.compose:compose-bom:2024.09.03') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') 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.8.6" + def lifecycle_version = "2.8.7" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "com.google.dagger:hilt-android:2.52" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index ff2165495..38222c52d 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.7.0" + classpath "com.android.tools.build:gradle:8.7.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "com.google.dagger:hilt-android-gradle-plugin:2.52" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index afdde8033..8c2dea9b8 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.7.0' + classpath 'com.android.tools.build:gradle:8.7.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index b894784c9..15537c06e 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.example.android.codelab.animation" - compileSdk 34 + compileSdk 35 defaultConfig { applicationId 'com.example.android.codelab.animation' minSdkVersion 21 @@ -43,11 +43,11 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.03') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) - implementation 'androidx.activity:activity-compose:1.9.2' - implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.activity:activity-compose:1.9.3' + implementation 'androidx.core:core-ktx:1.15.0' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material3:material3" implementation "androidx.compose.ui:ui-tooling-preview" diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index b894784c9..15537c06e 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.example.android.codelab.animation" - compileSdk 34 + compileSdk 35 defaultConfig { applicationId 'com.example.android.codelab.animation' minSdkVersion 21 @@ -43,11 +43,11 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.03') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) - implementation 'androidx.activity:activity-compose:1.9.2' - implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.activity:activity-compose:1.9.3' + implementation 'androidx.core:core-ktx:1.15.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 bd5ab6b33..9b13457b2 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.codelab.basiclayouts" - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "com.codelab.basiclayouts" @@ -61,19 +61,19 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.03') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) androidTestImplementation(composeBom) - implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.core:core-ktx:1.15.0' implementation "androidx.compose.ui:ui" implementation 'androidx.compose.material3:material3' - implementation 'androidx.compose.material3:material3-window-size-class:1.3.0' + implementation 'androidx.compose.material3:material3-window-size-class:1.3.1' 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.8.6' - implementation 'androidx.activity:activity-compose:1.9.2' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7' + implementation 'androidx.activity:activity-compose:1.9.3' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.2.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 54873a059..8da09f908 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.7.0" + classpath "com.android.tools.build:gradle:8.7.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts index 770fa91bd..fd0858850 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.codelabs.state" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.codelabs.state" @@ -64,11 +64,11 @@ android { } dependencies { - implementation("androidx.core:core-ktx:1.13.1") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6") - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6") - implementation("androidx.activity:activity-compose:1.9.2") - implementation(platform("androidx.compose:compose-bom:2024.09.03")) + implementation("androidx.core:core-ktx:1.15.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7") + implementation("androidx.activity:activity-compose:1.9.3") + implementation(platform("androidx.compose:compose-bom:2024.10.01")) 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.2.1") androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2024.09.03")) + androidTestImplementation(platform("androidx.compose:compose-bom:2024.10.01")) 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 a70f47f13..c66b26b4d 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.7.0' + classpath 'com.android.tools.build:gradle:8.7.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } diff --git a/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts index 2addcf845..d00a78257 100644 --- a/BasicsCodelab/app/build.gradle.kts +++ b/BasicsCodelab/app/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.codelab.basics" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.codelab.basics" @@ -64,10 +64,10 @@ android { } dependencies { - implementation("androidx.core:core-ktx:1.13.1") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6") - implementation("androidx.activity:activity-compose:1.9.2") - implementation(platform("androidx.compose:compose-bom:2024.09.03")) + implementation("androidx.core:core-ktx:1.15.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7") + implementation("androidx.activity:activity-compose:1.9.3") + implementation(platform("androidx.compose:compose-bom:2024.10.01")) 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.2.1") androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2024.09.03")) + androidTestImplementation(platform("androidx.compose:compose-bom:2024.10.01")) 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 a47e1eeaa..61f898057 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.7.0" apply false + id("com.android.application") version "8.7.2" apply false id("org.jetbrains.kotlin.android") version "2.0.20" apply false id("org.jetbrains.kotlin.plugin.compose") version "2.0.20" apply false } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 55c5db3c7..6d9adb573 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'org.jetbrains.kotlin.plugin.compose' android { - compileSdkVersion 34 + compileSdkVersion 35 namespace "com.google.samples.apps.sunflower" defaultConfig { applicationId "com.google.samples.apps.sunflower" @@ -60,26 +60,26 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.03') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) androidTestImplementation(composeBom) kapt "androidx.room:room-compiler:2.6.1" kapt "com.github.bumptech.glide:compiler:4.16.0" implementation "androidx.appcompat:appcompat:1.7.0" - implementation "androidx.constraintlayout:constraintlayout:2.1.4" - implementation "androidx.core:core-ktx:1.13.1" - implementation "androidx.fragment:fragment-ktx:1.8.4" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.6" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6" - implementation "androidx.navigation:navigation-fragment-ktx:2.8.2" - implementation "androidx.navigation:navigation-ui-ktx:2.8.2" + implementation "androidx.constraintlayout:constraintlayout:2.2.0" + implementation "androidx.core:core-ktx:1.15.0" + implementation "androidx.fragment:fragment-ktx:1.8.5" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7" + implementation "androidx.navigation:navigation-fragment-ktx:2.8.3" + implementation "androidx.navigation:navigation-ui-ktx:2.8.3" implementation "androidx.recyclerview:recyclerview:1.3.2" implementation "androidx.room:room-runtime:2.6.1" implementation "androidx.room:room-ktx:2.6.1" implementation "androidx.tracing:tracing:1.2.0" implementation "androidx.viewpager2:viewpager2:1.1.0" - implementation "androidx.work:work-runtime-ktx:2.9.1" + implementation "androidx.work:work-runtime-ktx:2.10.0" 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.11.0" @@ -103,7 +103,7 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-intents:3.6.1" androidTestImplementation "androidx.test.ext:junit:1.2.1" androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0" - androidTestImplementation "androidx.work:work-testing:2.9.1" + androidTestImplementation "androidx.work:work-testing:2.10.0" 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 e8f8c7d91..0ee92b29f 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.7.0" + classpath "com.android.tools.build:gradle:8.7.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.2" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.3" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } } diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 9b16cdc29..f978670f1 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.example.compose.rally" - compileSdkVersion 34 + compileSdkVersion 35 defaultConfig { applicationId "com.example.compose.rally" @@ -81,12 +81,12 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.03') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.appcompat:appcompat:1.7.0" - implementation "androidx.core:core-ktx:1.13.1" + implementation "androidx.core:core-ktx:1.15.0" implementation "com.google.android.material:material:1.12.0" // Compose @@ -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.9.2" + implementation "androidx.activity:activity-compose:1.9.3" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index cd40c3628..91309a0d8 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.7.0" + classpath "com.android.tools.build:gradle:8.7.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } diff --git a/PerformanceCodelab/app/build.gradle.kts b/PerformanceCodelab/app/build.gradle.kts index 1735baf7f..25094d32c 100644 --- a/PerformanceCodelab/app/build.gradle.kts +++ b/PerformanceCodelab/app/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.compose.performance" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.compose.performance" diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 73ceafa91..8bcc2f560 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -1,27 +1,27 @@ [versions] coil = "2.7.0" -com-android-application = "8.7.0" +com-android-application = "8.7.2" desugar_jdk_libs = "2.1.2" kotlinx-datetime = "0.6.1" -lifecycle-viewmodel-compose = "2.8.6" -material-icons-core = "1.7.3" +lifecycle-viewmodel-compose = "2.8.7" +material-icons-core = "1.7.5" media3 = "1.4.1" org-jetbrains-kotlin-android = "2.0.20" -core-ktx = "1.13.1" +core-ktx = "1.15.0" junit = "4.13.2" androidx-test-ext-junit = "1.2.1" espresso-core = "3.6.1" -lifecycle-runtime-ktx = "2.8.6" -activity-compose = "1.9.2" -compose-bom = "2024.09.03" -runtime-tracing = "1.7.3" +lifecycle-runtime-ktx = "2.8.7" +activity-compose = "1.9.3" +compose-bom = "2024.10.01" +runtime-tracing = "1.7.5" tracing-ktx = "1.3.0-alpha02" tracing-perfetto = "1.0.0" uiautomator = "2.3.0" -benchmark = "1.3.2" -androidx-baselineprofile = "1.3.2" +benchmark = "1.3.3" +androidx-baselineprofile = "1.3.3" profileinstaller = "1.4.1" -material3 = "1.3.0" +material3 = "1.3.1" spotless = "6.25.0" ktlint = "1.2.1" diff --git a/PerformanceCodelab/measure/build.gradle.kts b/PerformanceCodelab/measure/build.gradle.kts index 7890d573f..794e8bce2 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 = 34 + compileSdk = 35 compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 1a0405c24..edbccde4c 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.example.compose.rally" - compileSdkVersion 34 + compileSdkVersion 35 defaultConfig { applicationId "com.example.compose.rally" @@ -84,14 +84,14 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.03') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.appcompat:appcompat:1.7.0" - implementation "androidx.core:core-ktx:1.13.1" + implementation "androidx.core:core-ktx:1.15.0" implementation "com.google.android.material:material:1.12.0" - implementation "androidx.fragment:fragment-ktx:1.8.4" + implementation "androidx.fragment:fragment-ktx:1.8.5" // Compose implementation "androidx.compose.runtime:runtime" @@ -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.9.2" + implementation "androidx.activity:activity-compose:1.9.3" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 48d4f5790..404257a63 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.7.0" + classpath "com.android.tools.build:gradle:8.7.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index bd3757a22..42f0323fb 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.example.reply" - compileSdkVersion 34 + compileSdkVersion 35 defaultConfig { applicationId 'com.example.reply' minSdkVersion 21 @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.03') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -110,14 +110,14 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'androidx.activity:activity-ktx:1.9.2' - implementation 'androidx.core:core-ktx:1.13.1' - implementation "androidx.activity:activity-compose:1.9.2" - - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.6" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6" + implementation 'androidx.activity:activity-ktx:1.9.3' + implementation 'androidx.core:core-ktx:1.15.0' + implementation "androidx.activity:activity-compose:1.9.3" + + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7" androidTestImplementation 'androidx.test:rules:1.6.1' androidTestImplementation 'androidx.test:runner:1.6.2' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 7b8ace5ed..72a42deed 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.7.0' + classpath 'com.android.tools.build:gradle:8.7.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index 0508c107f..0ee5748fb 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.codelab.theming" - compileSdkVersion 34 + compileSdkVersion 35 defaultConfig { applicationId 'com.codelab.theming' minSdkVersion 21 @@ -44,14 +44,14 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.03') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) - implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.core:core-ktx:1.15.0' implementation "androidx.compose.ui:ui" implementation "androidx.compose.material:material" implementation "androidx.compose.material:material-icons-extended" - implementation 'androidx.activity:activity-compose:1.9.2' + implementation 'androidx.activity:activity-compose:1.9.3' implementation "androidx.compose.ui:ui-tooling-preview" debugImplementation "androidx.compose.ui:ui-tooling" } diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index 0f0c31936..a9eaf106c 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.7.0" + classpath "com.android.tools.build:gradle:8.7.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" }