Merge "Move lifecycle-runtime-testing to testutils" into udc-qpr-dev

packages/SettingsLib/Spa/spa/build.gradle.kts

@@ -69,7 +69,6 @@ dependencies {
     implementation("com.airbnb.android:lottie-compose:5.2.0")
 
     androidTestImplementation(project(":testutils"))
-    androidTestImplementation("androidx.lifecycle:lifecycle-runtime-testing")
     androidTestImplementation(libs.dexmaker.mockito)
 }
 

packages/SettingsLib/Spa/tests/Android.bp

@@ -31,7 +31,6 @@ android_test {
         "SpaLib",
         "SpaLibTestUtils",
         "androidx.compose.runtime_runtime",
-        "androidx.lifecycle_lifecycle-runtime-testing",
         "androidx.test.ext.junit",
         "androidx.test.runner",
         "mockito-target-minus-junit4",

packages/SettingsLib/Spa/testutils/Android.bp

@@ -29,6 +29,7 @@ android_library {
         "androidx.compose.runtime_runtime",
         "androidx.compose.ui_ui-test-junit4",
         "androidx.compose.ui_ui-test-manifest",
+        "androidx.lifecycle_lifecycle-runtime-testing",
         "mockito",
         "truth-prebuilt",
     ],

packages/SettingsLib/Spa/testutils/build.gradle.kts

@@ -26,7 +26,7 @@ android {
 
     sourceSets {
         sourceSets.getByName("main") {
-            java.setSrcDirs(listOf("src"))
+            kotlin.setSrcDirs(listOf("src"))
             manifest.srcFile("AndroidManifest.xml")
         }
     }
@@ -40,6 +40,7 @@ dependencies {
 
     api("androidx.arch.core:core-testing:2.2.0-alpha01")
     api("androidx.compose.ui:ui-test-junit4:$jetpackComposeVersion")
+    api("androidx.lifecycle:lifecycle-runtime-testing")
     api(libs.truth)
     api("org.mockito:mockito-core:2.21.0")
     debugApi("androidx.compose.ui:ui-test-manifest:$jetpackComposeVersion")