Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ifa90d11ffbfd12b2505334a706c48d40e920cf85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2023-06-14 01:27:43 +00:00
committed by Automerger Merge Worker
parent 9b463f81d8 12b9118d4c
commit bb556cc4d7
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/Spa/spa/build.gradle.kts
View File

@@ -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") {

6
packages/SettingsLib/Spa/testutils/build.gradle.kts
View File

@@ -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")
}