From 310a47b5b0c9657ea7f59984d55e8219aa7c4c60 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Thu, 3 Nov 2022 16:44:07 +0800 Subject: [PATCH] Upgrade navigation-compose to 2.6.0-alpha03 Also change MPAndroidChart's implementation to api. Bug: 235727273 Test: Unit test Test: Manual with Gallery App Change-Id: I34f6b3881c068d9c17692b6bfd4d72f249758c24 --- packages/SettingsLib/Spa/gallery/build.gradle | 3 +-- packages/SettingsLib/Spa/spa/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/SettingsLib/Spa/gallery/build.gradle b/packages/SettingsLib/Spa/gallery/build.gradle index f0b6ac540c493..e04a9be2acd69 100644 --- a/packages/SettingsLib/Spa/gallery/build.gradle +++ b/packages/SettingsLib/Spa/gallery/build.gradle @@ -57,6 +57,5 @@ android { } dependencies { - implementation(project(":spa")) - implementation "com.github.PhilJay:MPAndroidChart:v3.1.0-alpha" + implementation project(":spa") } diff --git a/packages/SettingsLib/Spa/spa/build.gradle b/packages/SettingsLib/Spa/spa/build.gradle index 682d3fc055ccc..7a20c747249b5 100644 --- a/packages/SettingsLib/Spa/spa/build.gradle +++ b/packages/SettingsLib/Spa/spa/build.gradle @@ -60,9 +60,9 @@ dependencies { 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:2.6.0-alpha03" - api "androidx.navigation:navigation-compose:2.5.0" + api "androidx.navigation:navigation-compose:2.6.0-alpha03" + api "com.github.PhilJay:MPAndroidChart:v3.1.0-alpha" api "com.google.android.material:material:1.7.0-alpha03" debugApi "androidx.compose.ui:ui-tooling:$jetpack_compose_version" implementation "com.airbnb.android:lottie-compose:5.2.0" - implementation "com.github.PhilJay:MPAndroidChart:v3.1.0-alpha" }