Add lifecycle-livedata-ktx for SpaLib
Also,
- Update the appcompat library version.
- Use -opt-in instead of -Xopt-in.
- Add TEST_MAPPING for SpaPrivilegedLibTests.
Bug: 235727273
Test: m SpaLib
Test: m SpaPrivilegedLib
Change-Id: I1a0e7957e23ba281ab18794d349f2968f5110050
diff --git a/packages/SettingsLib/Spa/TEST_MAPPING b/packages/SettingsLib/Spa/TEST_MAPPING
index b4b65d4..b7ce518 100644
--- a/packages/SettingsLib/Spa/TEST_MAPPING
+++ b/packages/SettingsLib/Spa/TEST_MAPPING
@@ -5,6 +5,9 @@
},
{
"name": "SpaPrivilegedLibTests"
+ },
+ {
+ "name": "SettingsSpaUnitTests"
}
]
}
diff --git a/packages/SettingsLib/Spa/spa/Android.bp b/packages/SettingsLib/Spa/spa/Android.bp
index 1d42e27..8b29366 100644
--- a/packages/SettingsLib/Spa/spa/Android.bp
+++ b/packages/SettingsLib/Spa/spa/Android.bp
@@ -29,6 +29,7 @@
"androidx.compose.runtime_runtime",
"androidx.compose.runtime_runtime-livedata",
"androidx.compose.ui_ui-tooling-preview",
+ "androidx.lifecycle_lifecycle-livedata-ktx",
"androidx.navigation_navigation-compose",
"com.google.android.material_material",
"lottie_compose",
diff --git a/packages/SettingsLib/Spa/spa/build.gradle b/packages/SettingsLib/Spa/spa/build.gradle
index 362953f..7e05e75 100644
--- a/packages/SettingsLib/Spa/spa/build.gradle
+++ b/packages/SettingsLib/Spa/spa/build.gradle
@@ -59,13 +59,14 @@
}
dependencies {
- api "androidx.appcompat:appcompat:1.6.0-rc01"
+ api "androidx.appcompat:appcompat:1.7.0-alpha01"
api "androidx.compose.material3:material3:$jetpack_compose_material3_version"
api "androidx.compose.material:material-icons-extended:$jetpack_compose_version"
api "androidx.compose.runtime:runtime-livedata:$jetpack_compose_version"
api "androidx.compose.ui:ui-tooling-preview:$jetpack_compose_version"
- api 'androidx.navigation:navigation-compose:2.5.0'
- api 'com.google.android.material:material:1.6.1'
+ api "androidx.lifecycle:lifecycle-livedata-ktx:2.6.0-alpha02"
+ api "androidx.navigation:navigation-compose:2.5.0"
+ api "com.google.android.material:material:1.6.1"
debugApi "androidx.compose.ui:ui-tooling:$jetpack_compose_version"
- implementation 'com.airbnb.android:lottie-compose:5.2.0'
+ implementation "com.airbnb.android:lottie-compose:5.2.0"
}