chore: upgrade mockito, fix: spying mocked objects in new library

Author: demolaf

auth/build.gradle.kts

@@ -91,7 +91,7 @@ dependencies {
     implementation(Config.Libs.Androidx.fragment)
     implementation(Config.Libs.Androidx.customTabs)
     implementation(Config.Libs.Androidx.constraint)
-    implementation("androidx.credentials:credentials:1.3.0")
+    implementation(libs.androidx.credentials)
     implementation("androidx.credentials:credentials-play-services-auth:1.3.0")
 
     implementation(Config.Libs.Androidx.lifecycleExtensions)
@@ -112,12 +112,27 @@ dependencies {
 
     testImplementation(Config.Libs.Test.junit)
     testImplementation(Config.Libs.Test.truth)
-    testImplementation(Config.Libs.Test.mockito)
     testImplementation(Config.Libs.Test.core)
     testImplementation(Config.Libs.Test.robolectric)
     testImplementation(Config.Libs.Test.kotlinReflect)
     testImplementation(Config.Libs.Provider.facebook)
     testImplementation(libs.androidx.ui.test.junit4)
+    testImplementation(libs.mockito)
+    testImplementation(libs.mockito.inline)
+    testImplementation(libs.mockito.kotlin)
+    testImplementation(libs.androidx.credentials)
 
     debugImplementation(project(":internal:lintchecks"))
 }
+
+val mockitoAgent by configurations.creating
+
+dependencies {
+    mockitoAgent(libs.mockito) {
+        isTransitive = false
+    }
+}
+
+tasks.withType<Test>().configureEach {
+    jvmArgs("-javaagent:${mockitoAgent.asPath}")
+}

auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java

@@ -75,11 +75,17 @@ public static void initialize() {
     }
 
     private static void spyContextAndResources() {
-        CONTEXT = spy(CONTEXT);
+        // In Mockito 5.x, we need to avoid spying on objects that are already mocks/spies
+        if (!org.mockito.Mockito.mockingDetails(CONTEXT).isSpy()) {
+            CONTEXT = spy(CONTEXT);
+        }
         when(CONTEXT.getApplicationContext())
                 .thenReturn(CONTEXT);
-        Resources spiedResources = spy(CONTEXT.getResources());
-        when(CONTEXT.getResources()).thenReturn(spiedResources);
+        Resources resources = CONTEXT.getResources();
+        if (!org.mockito.Mockito.mockingDetails(resources).isSpy()) {
+            Resources spiedResources = spy(resources);
+            when(CONTEXT.getResources()).thenReturn(spiedResources);
+        }
     }
 
     private static void initializeApp(Context context) {

gradle/libs.versions.toml

@@ -1,9 +1,21 @@
 [versions]
-datastorePreferences = "1.1.1"
 kotlin = "2.2.0"
+
+# Compose
 androidxComposeBom = "2025.08.00"
 androidxActivityCompose = "1.9.0"
 
+# Authentication
+credentials = "1.3.0"
+
+# Storage
+datastorePreferences = "1.1.1"
+
+# Testing
+mockito = "5.19.0"
+mockitoInline = "5.2.0"
+mockitoKotlin = "6.0.0"
+
 [libraries]
 # Compose
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
@@ -16,11 +28,17 @@ androidx-compose-material3 = { group = "androidx.compose.material3", name = "mat
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivityCompose" }
 androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
 
+# Authentication
+androidx-credentials = { module = "androidx.credentials:credentials", version.ref = "credentials" }
+
 # Storage
 androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" }
 
 # Testing
 androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
+mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
+mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockitoInline" }
+mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlin" }
 
 [plugins]
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }