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

Commit a6225203 authored by Mark Renouf's avatar Mark Renouf
Browse files

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
parent 7e1f38a7

packages/SystemUI/Android.bp

+3 −1
Original line number Original line Diff line number Diff line
@@ -569,7 +569,7 @@ android_library { 
        "androidx.test.uiautomator_uiautomator",

        "androidx.test.uiautomator_uiautomator",

        "androidx.core_core-animation-testing",

        "androidx.core_core-animation-testing",

        "mockito-target-extended-minus-junit4",

        "mockito-target-extended-minus-junit4",

        "mockito-kotlin2",

        "mockito-kotlin-nodeps",

        "androidx.test.ext.junit",

        "androidx.test.ext.junit",

        "androidx.test.ext.truth",

        "androidx.test.ext.truth",

        "kotlin-test",

        "kotlin-test",
@@ -656,6 +656,7 @@ java_library { 
        "androidx.core_core-animation-testing",

        "androidx.core_core-animation-testing",

        "androidx.test.ext.junit",

        "androidx.test.ext.junit",

        "inline-mockito-robolectric-prebuilt",

        "inline-mockito-robolectric-prebuilt",

        "mockito-kotlin-nodeps",

        "platform-parametric-runner-lib",

        "platform-parametric-runner-lib",

        "SystemUICustomizationTestUtils",

        "SystemUICustomizationTestUtils",

        "kotlin-test",

        "kotlin-test",
@@ -740,6 +741,7 @@ android_ravenwood_test { 
        "androidx.core_core-animation-testing",

        "androidx.core_core-animation-testing",

        "androidx.test.ext.junit",

        "androidx.test.ext.junit",

        "kosmos",

        "kosmos",

        "mockito-kotlin-nodeps",

    ],

    ],

    libs: [

    libs: [

        "android.test.runner",

        "android.test.runner",