From a180c48137adb951d04e1ccb3e82e0566d8be447 Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Sun, 11 Jun 2023 02:26:18 +0800
Subject: [PATCH] Fix Spa test utils

Should dependent on org.mockito:mockito-core instead of dexmaker.

Bug: 284913888
Test: Gradle Sync
Test: Unit test
Change-Id: I71dbd79c474630875f47b74b501de3981ab4fc6c
---
 packages/SettingsLib/Spa/spa/build.gradle.kts       | 5 +++--
 packages/SettingsLib/Spa/testutils/build.gradle.kts | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/SettingsLib/Spa/spa/build.gradle.kts b/packages/SettingsLib/Spa/spa/build.gradle.kts
index fac63361fc1e1..52896351d92fe 100644
--- a/packages/SettingsLib/Spa/spa/build.gradle.kts
+++ b/packages/SettingsLib/Spa/spa/build.gradle.kts
@@ -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") {
diff --git a/packages/SettingsLib/Spa/testutils/build.gradle.kts b/packages/SettingsLib/Spa/testutils/build.gradle.kts
index c3df9bc806286..6df0226a94f96 100644
--- a/packages/SettingsLib/Spa/testutils/build.gradle.kts
+++ b/packages/SettingsLib/Spa/testutils/build.gradle.kts
@@ -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")
 }