commit ae998a19d9c10e20154685874782d340f99817d2
author Aurimas Liutikas <aurimas@google.com> Wed Dec 06 13:02:38 2023 -0800
committer Aurimas Liutikas <aurimas@google.com> Wed Dec 06 13:02:38 2023 -0800
tree 1ebac1c971012c6fc838c285a995fbfef3ee2c8c
parent 2175967da1745560bab9b6a828eef156572fe085

Upgrade room test app to mockito-android 5.8.0

Test: run a room test on API 34 device
Change-Id: I4e5677909f980f7aa08259c513d23aa51f35c2f3

gradle/libs.versions.toml

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 53db4d4e..d408a73 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -224,6 +224,7 @@
 mockitoCore = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 mockitoCore4 = { module = "org.mockito:mockito-core", version = "4.8.0" }
 mockitoAndroid = { module = "org.mockito:mockito-android", version.ref = "mockito" }
+mockitoAndroid5 = { module = "org.mockito:mockito-android", version = "5.8.0" }
 mockitoKotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "2.2.11" }
 mockitoKotlin4 = { module = "org.mockito.kotlin:mockito-kotlin", version = "4.0.0" }
 moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }

room/integration-tests/testapp/build.gradle

diff --git a/room/integration-tests/testapp/build.gradle b/room/integration-tests/testapp/build.gradle
index d2f0759..cc25642 100644
--- a/room/integration-tests/testapp/build.gradle
+++ b/room/integration-tests/testapp/build.gradle
@@ -136,11 +136,9 @@
     androidTestImplementation(libs.testRules)
     androidTestImplementation(libs.espressoCore)
     androidTestImplementation(libs.truth)
-    androidTestImplementation(libs.mockitoCore4)
-    androidTestImplementation(libs.dexmakerMockito)
+    androidTestImplementation(libs.mockitoAndroid5)
     androidTestImplementation(project(":internal-testutils-truth"))
 
-
     testImplementation(libs.junit)
 }