Bump mockito from 4.11.0 to 5.15.2

This commit updates Mockito to 5.15.2 from 4.11.0. Mockito inline is now the default, so the corresponding dependency is no longer needed.
MGaetan89 · Jan 27, 2025 · d417b46 · d417b46
1 parent 9634997
commit d417b46
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 3 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -81,7 +81,7 @@ junit4 = "4.13.2"
 libphonenumber = "8.13.53"
 
 # https://github.com/mockito/mockito/releases
-mockito = "4.11.0"
+mockito = "5.15.2"
 
 # https://github.com/mockk/mockk/releases
 mockk = "1.13.16"
@@ -198,7 +198,7 @@ sqlite4java-win32-x86 = { module = "com.almworks.sqlite4java:sqlite4java-win32-x
 truth = { module = "com.google.truth:truth", version.ref = "truth" }
 
 mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
-mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito" }
+mockito-subclass = { module = "org.mockito:mockito-subclass", version.ref = "mockito" }
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 
 roborazzi = { module = "io.github.takahirom.roborazzi:roborazzi", version.ref = "roborazzi" }

diff --git a/integration_tests/mockito-experimental/build.gradle.kts b/integration_tests/mockito-experimental/build.gradle.kts
@@ -8,5 +8,5 @@ dependencies {
   testRuntimeOnly(AndroidSdk.MAX_SDK.coordinates)
   testImplementation(libs.junit4)
   testImplementation(libs.truth)
-  testImplementation(libs.mockito.inline)
+  testImplementation(libs.mockito)
 }
diff --git a/integration_tests/mockito-kotlin/build.gradle.kts b/integration_tests/mockito-kotlin/build.gradle.kts
@@ -24,4 +24,5 @@ dependencies {
   testImplementation(libs.truth)
   testImplementation(libs.kotlin.stdlib)
   testImplementation(libs.mockito)
+  testImplementation(libs.mockito.subclass)
 }
diff --git a/integration_tests/mockito/build.gradle.kts b/integration_tests/mockito/build.gradle.kts
@@ -9,4 +9,5 @@ dependencies {
   testImplementation(libs.junit4)
   testImplementation(libs.truth)
   testImplementation(libs.mockito)
+  testImplementation(libs.mockito.subclass)
 }
diff --git a/integration_tests/nativegraphics/build.gradle.kts b/integration_tests/nativegraphics/build.gradle.kts
@@ -32,5 +32,6 @@ dependencies {
   testImplementation(libs.truth)
   testImplementation(libs.junit4)
   testImplementation(libs.mockito)
+  testImplementation(libs.mockito.subclass)
   testImplementation(libs.guava.testlib)
 }
diff --git a/preinstrumented/build.gradle.kts b/preinstrumented/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
 
   testImplementation(libs.junit4)
   testImplementation(libs.mockito)
+  testImplementation(libs.mockito.subclass)
 }
 
 val instrumentAll by

diff --git a/processor/build.gradle.kts b/processor/build.gradle.kts
@@ -56,6 +56,7 @@ dependencies {
   testImplementation(libs.javax.annotation.jsr250.api)
   testImplementation(libs.junit4)
   testImplementation(libs.mockito)
+  testImplementation(libs.mockito.subclass)
   testImplementation(libs.compile.testing)
   testImplementation(libs.truth)
 }
diff --git a/resources/build.gradle.kts b/resources/build.gradle.kts
@@ -14,6 +14,7 @@ dependencies {
   testImplementation(libs.junit4)
   testImplementation(libs.truth)
   testImplementation(libs.mockito)
+  testImplementation(libs.mockito.subclass)
 
   annotationProcessor(libs.auto.value)
 }
diff --git a/robolectric/build.gradle.kts b/robolectric/build.gradle.kts
@@ -48,6 +48,7 @@ dependencies {
   testImplementation(libs.junit4)
   testImplementation(libs.truth)
   testImplementation(libs.mockito)
+  testImplementation(libs.mockito.subclass)
   testImplementation(libs.hamcrest)
   testImplementation("androidx.test:core:$axtCoreVersion@aar")
   testImplementation("androidx.test.ext:junit:$axtJunitVersion@aar")

diff --git a/sandbox/build.gradle.kts b/sandbox/build.gradle.kts
@@ -23,5 +23,6 @@ dependencies {
   testImplementation(libs.junit4)
   testImplementation(libs.truth)
   testImplementation(libs.mockito)
+  testImplementation(libs.mockito.subclass)
   testImplementation(project(":junit"))
 }
diff --git a/shadows/playservices/build.gradle.kts b/shadows/playservices/build.gradle.kts
@@ -24,6 +24,7 @@ dependencies {
   testImplementation(libs.junit4)
   testImplementation(libs.truth)
   testImplementation(libs.mockito)
+  testImplementation(libs.mockito.subclass)
   testRuntimeOnly(libs.bundles.play.services.`for`.shadows)
   testRuntimeOnly(AndroidSdk.MAX_SDK.coordinates)
 }