Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb556cc4 authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix Spa test utils" into udc-qpr-dev am: 12b9118d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23653476



Change-Id: Ifa90d11ffbfd12b2505334a706c48d40e920cf85
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9b463f81 12b9118d

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

+3 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
 */



plugins {

    id(libs.plugins.android.library.get().pluginId)

    id(libs.plugins.kotlin.android.get().pluginId)

    alias(libs.plugins.android.library)

    alias(libs.plugins.kotlin.android)

    jacoco

}
@@ -70,6 +70,7 @@ dependencies { 


    androidTestImplementation(project(":testutils"))

    androidTestImplementation("androidx.lifecycle:lifecycle-runtime-testing")

    androidTestImplementation(libs.dexmaker.mockito)

}



tasks.register<JacocoReport>("coverageReport") {

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

+3 −3
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
 */



plugins {

    id(libs.plugins.android.library.get().pluginId)

    id(libs.plugins.kotlin.android.get().pluginId)

    alias(libs.plugins.android.library)

    alias(libs.plugins.kotlin.android)

}



val jetpackComposeVersion: String? by extra
@@ -41,6 +41,6 @@ dependencies { 
    api("androidx.arch.core:core-testing:2.2.0-alpha01")

    api("androidx.compose.ui:ui-test-junit4:$jetpackComposeVersion")

    api(libs.truth)

    api(libs.dexmaker.mockito)

    api("org.mockito:mockito-core:2.21.0")

    debugApi("androidx.compose.ui:ui-test-manifest:$jetpackComposeVersion")

}