Move ComposeContentTestRuleExt to SpaLibTestUtils
To use it in SpaTests in the future.
Bug: 259520506
Test: Unit test
Change-Id: Ic5ad78be4e04451cf317a70dfd615293565b488d
diff --git a/packages/SettingsLib/Spa/tests/Android.bp b/packages/SettingsLib/Spa/tests/Android.bp
index dcfc171..69740058 100644
--- a/packages/SettingsLib/Spa/tests/Android.bp
+++ b/packages/SettingsLib/Spa/tests/Android.bp
@@ -27,13 +27,10 @@
static_libs: [
"SpaLib",
"SpaLibTestUtils",
- "androidx.test.runner",
- "androidx.test.ext.junit",
"androidx.compose.runtime_runtime",
- "androidx.compose.ui_ui-test-junit4",
- "androidx.compose.ui_ui-test-manifest",
+ "androidx.test.ext.junit",
+ "androidx.test.runner",
"mockito-target-minus-junit4",
- "truth-prebuilt",
],
kotlincflags: ["-Xjvm-default=all"],
min_sdk_version: "31",
diff --git a/packages/SettingsLib/Spa/tests/build.gradle b/packages/SettingsLib/Spa/tests/build.gradle
index 2d501fc..5971895 100644
--- a/packages/SettingsLib/Spa/tests/build.gradle
+++ b/packages/SettingsLib/Spa/tests/build.gradle
@@ -61,8 +61,5 @@
dependencies {
androidTestImplementation project(":spa")
androidTestImplementation project(":testutils")
- androidTestImplementation "androidx.compose.ui:ui-test-junit4:$jetpack_compose_version"
- androidTestImplementation "com.google.truth:truth:1.1.3"
- androidTestImplementation "org.mockito:mockito-android:3.4.6"
- androidTestDebugImplementation "androidx.compose.ui:ui-test-manifest:$jetpack_compose_version"
+ androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:2.28.1"
}