From a6225203eb07ed028f7b6a7194e5b13251bb6af3 Mon Sep 17 00:00:00 2001 From: Mark Renouf Date: Fri, 10 May 2024 12:55:48 -0400 Subject: Switch to -nodeps flavor of mockito-kotlin This allows use of mockito-kotlin without pulling in a specific implementation of Mockito. Unfortunately there are currently multiple versions of Mockito in use, including single-target prebuilts which also include mockmaker plugin metadata. Since mocktio-kotlin is a small library which depends only on the stable Mockito API (as wrapper functions), it can be used along with multiple versions without explicitly defining a runtime dependency. Bug: 339853443 Test: Treehugger presubmit Flag: TEST_ONLY Change-Id: I4431c1a8438c7a02d051fb5965f065dfbbd70102 --- packages/SystemUI/Android.bp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index fce7a00f9744..c04ec4f61c89 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -569,7 +569,7 @@ android_library { "androidx.test.uiautomator_uiautomator", "androidx.core_core-animation-testing", "mockito-target-extended-minus-junit4", - "mockito-kotlin2", + "mockito-kotlin-nodeps", "androidx.test.ext.junit", "androidx.test.ext.truth", "kotlin-test", @@ -656,6 +656,7 @@ java_library { "androidx.core_core-animation-testing", "androidx.test.ext.junit", "inline-mockito-robolectric-prebuilt", + "mockito-kotlin-nodeps", "platform-parametric-runner-lib", "SystemUICustomizationTestUtils", "kotlin-test", @@ -740,6 +741,7 @@ android_ravenwood_test { "androidx.core_core-animation-testing", "androidx.test.ext.junit", "kosmos", + "mockito-kotlin-nodeps", ], libs: [ "android.test.runner", -- cgit v1.2.3-59-g8ed1b