From 82457c9df0813dcd6509cadbec2b011efc8c4d01 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Tue, 14 Feb 2023 14:24:21 +0800 Subject: [PATCH] Upgrade Jetpack Compose to 1.4.0-beta01 Also upgrade other Jetpack libraries. Bug: 260441791 Test: Gradle Sync Test: Run Gallery Change-Id: I5015c72d44f33c37baed749d7e751a767a0f224b --- packages/SettingsLib/Spa/build.gradle | 2 +- packages/SettingsLib/Spa/spa/build.gradle | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/SettingsLib/Spa/build.gradle b/packages/SettingsLib/Spa/build.gradle index 9117524a3e88b..42af9992f7749 100644 --- a/packages/SettingsLib/Spa/build.gradle +++ b/packages/SettingsLib/Spa/build.gradle @@ -19,7 +19,7 @@ buildscript { BUILD_TOOLS_VERSION = "30.0.3" MIN_SDK = 21 TARGET_SDK = 33 - jetpack_compose_version = '1.4.0-alpha05' + jetpack_compose_version = '1.4.0-beta01' jetpack_compose_compiler_version = '1.4.0' } } diff --git a/packages/SettingsLib/Spa/spa/build.gradle b/packages/SettingsLib/Spa/spa/build.gradle index 6f1b41c69ff0a..16a4a9b2dcaee 100644 --- a/packages/SettingsLib/Spa/spa/build.gradle +++ b/packages/SettingsLib/Spa/spa/build.gradle @@ -69,18 +69,16 @@ android { } dependencies { - String jetpack_lifecycle_version = "2.6.0-alpha03" - - api "androidx.appcompat:appcompat:1.7.0-alpha01" + api "androidx.appcompat:appcompat:1.7.0-alpha02" api "androidx.slice:slice-builders:1.1.0-alpha02" api "androidx.slice:slice-core:1.1.0-alpha02" api "androidx.slice:slice-view:1.1.0-alpha02" - api "androidx.compose.material3:material3:1.1.0-alpha05" + api "androidx.compose.material3:material3:1.1.0-alpha06" api "androidx.compose.material:material-icons-extended:$jetpack_compose_version" - api "androidx.compose.runtime:runtime-livedata:1.4.0-alpha04" + api "androidx.compose.runtime:runtime-livedata:$jetpack_compose_version" api "androidx.compose.ui:ui-tooling-preview:$jetpack_compose_version" - api "androidx.lifecycle:lifecycle-livedata-ktx:$jetpack_lifecycle_version" - api "androidx.lifecycle:lifecycle-runtime-compose:$jetpack_lifecycle_version" + api "androidx.lifecycle:lifecycle-livedata-ktx" + api "androidx.lifecycle:lifecycle-runtime-compose" api "androidx.navigation:navigation-compose:2.6.0-alpha04" api "com.github.PhilJay:MPAndroidChart:v3.1.0-alpha" api "com.google.android.material:material:1.7.0-alpha03"