Remove bytebuddy excludes We needed these when we used minSdkVersion <21 that required enabling legacy multidex to run the tests. Now that the default minSdkVersion is 21 we no longer need these excludes to save method count. Test: None Change-Id: I00a097396bc81efd11a85413696234d69c2847db
diff --git a/appcompat/appcompat-resources/build.gradle b/appcompat/appcompat-resources/build.gradle index a34ebd8..19f68bf 100644 --- a/appcompat/appcompat-resources/build.gradle +++ b/appcompat/appcompat-resources/build.gradle
@@ -43,8 +43,8 @@ androidTestImplementation(libs.testRules) androidTestImplementation(libs.truth) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":internal-testutils-runtime"), { exclude group: "androidx.appcompat", module: "appcompat-resources" })
diff --git a/appcompat/appcompat/build.gradle b/appcompat/appcompat/build.gradle index fd5e26f..f4fc9020 100644 --- a/appcompat/appcompat/build.gradle +++ b/appcompat/appcompat/build.gradle
@@ -46,8 +46,8 @@ androidTestImplementation(libs.testUiautomator) androidTestImplementation(libs.truth) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation("androidx.lifecycle:lifecycle-viewmodel:2.6.1") androidTestImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.6.1", { // Needed to ensure that the same version of lifecycle-runtime-ktx
diff --git a/arch/core/core-testing/build.gradle b/arch/core/core-testing/build.gradle index dda5131..f5688ed 100644 --- a/arch/core/core-testing/build.gradle +++ b/arch/core/core-testing/build.gradle
@@ -32,7 +32,7 @@ api(project(":arch:core:core-runtime")) api("androidx.annotation:annotation:1.8.1") api(libs.junit) - api(libs.mockitoCore, excludes.bytebuddy) + api(libs.mockitoCore) testImplementation(libs.junit)
diff --git a/benchmark/benchmark-macro-junit4/build.gradle b/benchmark/benchmark-macro-junit4/build.gradle index 4f9ef1f..f8663aa 100644 --- a/benchmark/benchmark-macro-junit4/build.gradle +++ b/benchmark/benchmark-macro-junit4/build.gradle
@@ -54,10 +54,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.espressoCore) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) - // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) } tasks.withType(KotlinCompile).configureEach {
diff --git a/biometric/biometric/build.gradle b/biometric/biometric/build.gradle index 49370d4..4bd2bd8 100644 --- a/biometric/biometric/build.gradle +++ b/biometric/biometric/build.gradle
@@ -57,8 +57,8 @@ androidTestImplementation(libs.testRules) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testUiautomator) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) + androidTestImplementation(libs.dexmakerMockito) + androidTestImplementation(libs.mockitoCore) androidTestImplementation(libs.truth) androidTestImplementation("androidx.fragment:fragment-testing:1.4.1") }
diff --git a/browser/browser/build.gradle b/browser/browser/build.gradle index 9af6f1b..7606121 100644 --- a/browser/browser/build.gradle +++ b/browser/browser/build.gradle
@@ -51,8 +51,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":internal-testutils-runtime")) }
diff --git a/buildSrc/dependencies.gradle b/buildSrc/dependencies.gradle index 23c0358..48fa25e 100644 --- a/buildSrc/dependencies.gradle +++ b/buildSrc/dependencies.gradle
@@ -16,10 +16,6 @@ // Add ext.libs for library versions def excludes = [:] -excludes.bytebuddy = { - exclude group: "net.bytebuddy" -} - excludes.espresso = { exclude group: "androidx.annotation" exclude group: "androidx.appcompat"
diff --git a/camera/camera-camera2/build.gradle b/camera/camera-camera2/build.gradle index 0401f79..fe5ef3d 100644 --- a/camera/camera-camera2/build.gradle +++ b/camera/camera-camera2/build.gradle
@@ -63,8 +63,8 @@ androidTestImplementation(libs.testRules) androidTestImplementation(libs.truth) androidTestImplementation(libs.testUiautomator) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation("androidx.appcompat:appcompat:1.1.0") androidTestImplementation(project(":camera:camera-testing")) { // Ensure camera-testing does not pull in androidx.test dependencies
diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle index 0cc031d..4efb36c 100644 --- a/camera/camera-core/build.gradle +++ b/camera/camera-core/build.gradle
@@ -71,8 +71,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.truth) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":camera:camera-testing")) { // Ensure camera-testing does not pull in androidx.test dependencies exclude(group:"androidx.test")
diff --git a/camera/camera-extensions/build.gradle b/camera/camera-extensions/build.gradle index 034920a..c7e4120 100644 --- a/camera/camera-extensions/build.gradle +++ b/camera/camera-extensions/build.gradle
@@ -53,10 +53,10 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.kotlinCoroutinesAndroid) androidTestImplementation(libs.kotlinStdlib) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has its own MockMaker + androidTestImplementation(libs.mockitoCore) androidTestImplementation(libs.testUiautomator) androidTestImplementation(libs.truth) androidTestImplementation(project(":camera:camera-camera2"))
diff --git a/camera/camera-video/build.gradle b/camera/camera-video/build.gradle index ed18c77..f992c47 100644 --- a/camera/camera-video/build.gradle +++ b/camera/camera-video/build.gradle
@@ -53,8 +53,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.truth) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.autoValueAnnotations) androidTestImplementation(project(":camera:camera-lifecycle")) androidTestImplementation(project(":camera:camera-testing")) {
diff --git a/camera/camera-view/build.gradle b/camera/camera-view/build.gradle index 251128f..fe349d6 100644 --- a/camera/camera-view/build.gradle +++ b/camera/camera-view/build.gradle
@@ -70,8 +70,8 @@ } androidTestImplementation(project(":camera:camera-camera2-pipe-integration")) androidTestImplementation(project(":internal-testutils-truth")) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0") } android {
diff --git a/camera/viewfinder/viewfinder-view/build.gradle b/camera/viewfinder/viewfinder-view/build.gradle index 4225bde..b2854e8 100644 --- a/camera/viewfinder/viewfinder-view/build.gradle +++ b/camera/viewfinder/viewfinder-view/build.gradle
@@ -62,8 +62,8 @@ androidTestImplementation(libs.testUiautomator) androidTestImplementation(libs.kotlinStdlib) androidTestImplementation(libs.truth) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) } android {
diff --git a/coordinatorlayout/coordinatorlayout/build.gradle b/coordinatorlayout/coordinatorlayout/build.gradle index 8f27824..3f4475a 100644 --- a/coordinatorlayout/coordinatorlayout/build.gradle +++ b/coordinatorlayout/coordinatorlayout/build.gradle
@@ -27,8 +27,8 @@ }) androidTestImplementation(libs.espressoCore, excludes.espresso) androidTestImplementation(libs.bundles.espressoContrib, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":internal-testutils-runtime"), { exclude group: "androidx.coordinatorlayout", module: "coordinatorlayout" })
diff --git a/core/core-google-shortcuts/build.gradle b/core/core-google-shortcuts/build.gradle index 4824910..39be349 100644 --- a/core/core-google-shortcuts/build.gradle +++ b/core/core-google-shortcuts/build.gradle
@@ -42,8 +42,8 @@ androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore) androidTestImplementation(libs.espressoIntents) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) androidTestImplementation(libs.junit) }
diff --git a/core/core/build.gradle b/core/core/build.gradle index 7827448..d4d7840 100644 --- a/core/core/build.gradle +++ b/core/core/build.gradle
@@ -43,7 +43,7 @@ androidTestImplementation(libs.testRules) androidTestImplementation(libs.truth) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) androidTestImplementation(libs.testUiautomator) androidTestImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.6.2") @@ -51,8 +51,8 @@ // Including both dexmakers allows support for all API levels plus final mocking support on // API 28+. The implementation is swapped based on the finality of the mock type. This // delegation is handled manually inside androidx.core.util.mockito.CustomMockMaker. - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockitoInline, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.dexmakerMockito) + androidTestImplementation(libs.dexmakerMockitoInline) androidTestImplementation("androidx.appcompat:appcompat:1.1.0") { exclude group: "androidx.core", module: "core" }
diff --git a/draganddrop/draganddrop/build.gradle b/draganddrop/draganddrop/build.gradle index f58b809..089c9e8 100644 --- a/draganddrop/draganddrop/build.gradle +++ b/draganddrop/draganddrop/build.gradle
@@ -33,8 +33,8 @@ api("androidx.appcompat:appcompat:1.4.0") api("androidx.core:core:1.7.0") annotationProcessor(libs.nullaway) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner)
diff --git a/dynamicanimation/dynamicanimation-ktx/build.gradle b/dynamicanimation/dynamicanimation-ktx/build.gradle index f7e8e34..fbfd7c9 100644 --- a/dynamicanimation/dynamicanimation-ktx/build.gradle +++ b/dynamicanimation/dynamicanimation-ktx/build.gradle
@@ -39,8 +39,8 @@ androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) } androidx {
diff --git a/dynamicanimation/dynamicanimation/build.gradle b/dynamicanimation/dynamicanimation/build.gradle index 26594fb..aba2b5a 100644 --- a/dynamicanimation/dynamicanimation/build.gradle +++ b/dynamicanimation/dynamicanimation/build.gradle
@@ -21,8 +21,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) } androidx {
diff --git a/emoji/emoji/build.gradle b/emoji/emoji/build.gradle index 83a20ed..40bfe37 100644 --- a/emoji/emoji/build.gradle +++ b/emoji/emoji/build.gradle
@@ -35,8 +35,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":internal-testutils-runtime")) }
diff --git a/emoji2/emoji2-benchmark/build.gradle b/emoji2/emoji2-benchmark/build.gradle index f86eb6a..b5c2de3 100644 --- a/emoji2/emoji2-benchmark/build.gradle +++ b/emoji2/emoji2-benchmark/build.gradle
@@ -55,8 +55,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation project(':internal-testutils-runtime') androidTestImplementation(libs.kotlinStdlib) }
diff --git a/emoji2/emoji2-bundled/build.gradle b/emoji2/emoji2-bundled/build.gradle index d48ac83..df76592 100644 --- a/emoji2/emoji2-bundled/build.gradle +++ b/emoji2/emoji2-bundled/build.gradle
@@ -44,8 +44,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation project(':internal-testutils-runtime') // view tests that use font are in this module as well; for licensing reasons
diff --git a/emoji2/emoji2-views-helper/build.gradle b/emoji2/emoji2-views-helper/build.gradle index 629fc9f..1362d13 100644 --- a/emoji2/emoji2-views-helper/build.gradle +++ b/emoji2/emoji2-views-helper/build.gradle
@@ -24,8 +24,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation project(':internal-testutils-runtime') }
diff --git a/emoji2/emoji2-views/build.gradle b/emoji2/emoji2-views/build.gradle index 41926fe..9e6c338 100644 --- a/emoji2/emoji2-views/build.gradle +++ b/emoji2/emoji2-views/build.gradle
@@ -24,8 +24,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation project(':internal-testutils-runtime') }
diff --git a/emoji2/emoji2/build.gradle b/emoji2/emoji2/build.gradle index 182c191..a4597af 100644 --- a/emoji2/emoji2/build.gradle +++ b/emoji2/emoji2/build.gradle
@@ -38,8 +38,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation project(':internal-testutils-runtime') }
diff --git a/fragment/fragment-testing/build.gradle b/fragment/fragment-testing/build.gradle index e782228..6e83dc1 100644 --- a/fragment/fragment-testing/build.gradle +++ b/fragment/fragment-testing/build.gradle
@@ -46,8 +46,8 @@ androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.truth) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) lintPublish(project(":fragment:fragment-testing-lint")) }
diff --git a/fragment/fragment/build.gradle b/fragment/fragment/build.gradle index 5f80f70..eff0092 100644 --- a/fragment/fragment/build.gradle +++ b/fragment/fragment/build.gradle
@@ -61,8 +61,8 @@ androidTestImplementation(libs.testRules) androidTestImplementation(libs.truth) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":internal-testutils-runtime"), { exclude group: "androidx.fragment", module: "fragment" })
diff --git a/leanback/leanback-grid/build.gradle b/leanback/leanback-grid/build.gradle index f24c785..30fc5af 100644 --- a/leanback/leanback-grid/build.gradle +++ b/leanback/leanback-grid/build.gradle
@@ -44,8 +44,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":internal-testutils-espresso")) androidTestImplementation(project(":internal-testutils-runtime")) androidTestImplementation(project(":internal-testutils-common"))
diff --git a/leanback/leanback-paging/build.gradle b/leanback/leanback-paging/build.gradle index 9eade4e..9e1cfb0 100644 --- a/leanback/leanback-paging/build.gradle +++ b/leanback/leanback-paging/build.gradle
@@ -27,8 +27,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":internal-testutils-espresso")) androidTestImplementation(project(":internal-testutils-runtime")) androidTestImplementation(project(":internal-testutils-common"))
diff --git a/leanback/leanback-tab/build.gradle b/leanback/leanback-tab/build.gradle index 78d8b76..74ab4ba 100644 --- a/leanback/leanback-tab/build.gradle +++ b/leanback/leanback-tab/build.gradle
@@ -26,8 +26,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":internal-testutils-espresso")) androidTestImplementation(project(":internal-testutils-runtime")) androidTestImplementation(project(":internal-testutils-common"))
diff --git a/leanback/leanback/build.gradle b/leanback/leanback/build.gradle index 5f18f6e..ed754ce 100644 --- a/leanback/leanback/build.gradle +++ b/leanback/leanback/build.gradle
@@ -31,8 +31,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":internal-testutils-espresso")) androidTestImplementation(project(":internal-testutils-runtime")) androidTestImplementation(project(":internal-testutils-common"))
diff --git a/loader/loader-ktx/build.gradle b/loader/loader-ktx/build.gradle index ffb4403..d411d1b 100644 --- a/loader/loader-ktx/build.gradle +++ b/loader/loader-ktx/build.gradle
@@ -43,8 +43,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) } androidx {
diff --git a/loader/loader/build.gradle b/loader/loader/build.gradle index dc40421..209c8fb 100644 --- a/loader/loader/build.gradle +++ b/loader/loader/build.gradle
@@ -25,8 +25,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) } androidx {
diff --git a/navigation/navigation-common/build.gradle b/navigation/navigation-common/build.gradle index bcde5af..cc8206c 100644 --- a/navigation/navigation-common/build.gradle +++ b/navigation/navigation-common/build.gradle
@@ -67,8 +67,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.espressoCore) androidTestImplementation(libs.truth) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.kotlinStdlib) lintPublish(project(':navigation:navigation-common-lint'))
diff --git a/navigation/navigation-dynamic-features-fragment/build.gradle b/navigation/navigation-dynamic-features-fragment/build.gradle index 34a65f65..d294b3c 100644 --- a/navigation/navigation-dynamic-features-fragment/build.gradle +++ b/navigation/navigation-dynamic-features-fragment/build.gradle
@@ -51,9 +51,9 @@ androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testRules) androidTestImplementation(libs.testRunner) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.espressoCore) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) androidTestImplementation(libs.truth) androidTestImplementation(project(":internal-testutils-runtime"), { exclude group: "androidx.fragment", module: "fragment"
diff --git a/navigation/navigation-dynamic-features-runtime/build.gradle b/navigation/navigation-dynamic-features-runtime/build.gradle index 8693621..ba25181 100644 --- a/navigation/navigation-dynamic-features-runtime/build.gradle +++ b/navigation/navigation-dynamic-features-runtime/build.gradle
@@ -54,9 +54,9 @@ androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testRules) androidTestImplementation(libs.testRunner) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.espressoCore) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) androidTestImplementation(libs.truth) androidTestImplementation(project(":internal-testutils-runtime"), { exclude group: "androidx.fragment", module: "fragment"
diff --git a/navigation/navigation-runtime/build.gradle b/navigation/navigation-runtime/build.gradle index 44c5e23..9acb9fd 100644 --- a/navigation/navigation-runtime/build.gradle +++ b/navigation/navigation-runtime/build.gradle
@@ -53,8 +53,8 @@ androidTestImplementation(libs.espressoCore) androidTestImplementation(libs.espressoIntents) androidTestImplementation(libs.truth) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.kotlinStdlib) androidTestImplementation(libs.kotlinTest)
diff --git a/pdf/integration-tests/testapp/build.gradle b/pdf/integration-tests/testapp/build.gradle index 24a850b..66b4549 100644 --- a/pdf/integration-tests/testapp/build.gradle +++ b/pdf/integration-tests/testapp/build.gradle
@@ -30,8 +30,8 @@ androidTestImplementation(libs.testRules) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.junit) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) androidTestImplementation(libs.espressoCore) androidTestImplementation(project(":pdf:pdf-viewer-fragment"))
diff --git a/pdf/pdf-viewer/build.gradle b/pdf/pdf-viewer/build.gradle index 78bb274..595a07f 100644 --- a/pdf/pdf-viewer/build.gradle +++ b/pdf/pdf-viewer/build.gradle
@@ -51,8 +51,8 @@ androidTestImplementation(libs.testRules) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.junit) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) androidTestImplementation(libs.espressoCore) }
diff --git a/preference/preference/build.gradle b/preference/preference/build.gradle index 27d3503..d3140ab 100644 --- a/preference/preference/build.gradle +++ b/preference/preference/build.gradle
@@ -38,8 +38,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.kotlinStdlib) androidTestImplementation(libs.truth) }
diff --git a/privacysandbox/ads/ads-adservices-java/build.gradle b/privacysandbox/ads/ads-adservices-java/build.gradle index 305ee1a..c38dc28 100644 --- a/privacysandbox/ads/ads-adservices-java/build.gradle +++ b/privacysandbox/ads/ads-adservices-java/build.gradle
@@ -53,8 +53,8 @@ androidTestImplementation(libs.truth) androidTestImplementation(project(":internal-testutils-truth")) - androidTestImplementation(libs.mockitoCore4, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockitoInline, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore4) + androidTestImplementation(libs.dexmakerMockitoInline) androidTestImplementation(libs.dexmakerMockitoInlineExtended) }
diff --git a/privacysandbox/ads/ads-adservices/build.gradle b/privacysandbox/ads/ads-adservices/build.gradle index 5610d1a..afa4d60 100644 --- a/privacysandbox/ads/ads-adservices/build.gradle +++ b/privacysandbox/ads/ads-adservices/build.gradle
@@ -45,8 +45,8 @@ androidTestImplementation(libs.truth) androidTestImplementation(project(":internal-testutils-truth")) - androidTestImplementation(libs.mockitoCore4, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockitoInline, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore4) + androidTestImplementation(libs.dexmakerMockitoInline) androidTestImplementation(libs.dexmakerMockitoInlineExtended) }
diff --git a/privacysandbox/sdkruntime/sdkruntime-client/build.gradle b/privacysandbox/sdkruntime/sdkruntime-client/build.gradle index fb5e7c0..8753f06 100644 --- a/privacysandbox/sdkruntime/sdkruntime-client/build.gradle +++ b/privacysandbox/sdkruntime/sdkruntime-client/build.gradle
@@ -120,8 +120,8 @@ androidTestImplementation(project(':internal-testutils-runtime')) androidTestImplementation(project(":internal-testutils-truth")) // for assertThrows - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockitoInline, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockitoInline) androidTestBundleDex(project(":privacysandbox:sdkruntime:test-sdks:current")) androidTestBundleDex(project(":privacysandbox:sdkruntime:test-sdks:v4"))
diff --git a/privacysandbox/sdkruntime/sdkruntime-core/build.gradle b/privacysandbox/sdkruntime/sdkruntime-core/build.gradle index a8366d3..21ed9ac 100644 --- a/privacysandbox/sdkruntime/sdkruntime-core/build.gradle +++ b/privacysandbox/sdkruntime/sdkruntime-core/build.gradle
@@ -45,8 +45,8 @@ androidTestImplementation(libs.truth) androidTestImplementation(libs.junit) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockitoInline, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockitoInline) } android {
diff --git a/privacysandbox/sdkruntime/sdkruntime-provider/build.gradle b/privacysandbox/sdkruntime/sdkruntime-provider/build.gradle index 83865d4..3e22512 100644 --- a/privacysandbox/sdkruntime/sdkruntime-provider/build.gradle +++ b/privacysandbox/sdkruntime/sdkruntime-provider/build.gradle
@@ -38,8 +38,8 @@ androidTestImplementation(libs.truth) androidTestImplementation(libs.junit) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockitoInline, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockitoInline) } android {
diff --git a/profileinstaller/profileinstaller-benchmark/build.gradle b/profileinstaller/profileinstaller-benchmark/build.gradle index 83de260..d813b34 100644 --- a/profileinstaller/profileinstaller-benchmark/build.gradle +++ b/profileinstaller/profileinstaller-benchmark/build.gradle
@@ -38,8 +38,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation project(':internal-testutils-runtime') androidTestImplementation(libs.kotlinStdlib) }
diff --git a/recyclerview/recyclerview-selection/build.gradle b/recyclerview/recyclerview-selection/build.gradle index b599c61..0768c45 100644 --- a/recyclerview/recyclerview-selection/build.gradle +++ b/recyclerview/recyclerview-selection/build.gradle
@@ -38,8 +38,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.junit) }
diff --git a/recyclerview/recyclerview/build.gradle b/recyclerview/recyclerview/build.gradle index 92b9d6f..395de30 100644 --- a/recyclerview/recyclerview/build.gradle +++ b/recyclerview/recyclerview/build.gradle
@@ -26,8 +26,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) androidTestImplementation(libs.junit) androidTestImplementation(libs.kotlinStdlib)
diff --git a/remotecallback/remotecallback/build.gradle b/remotecallback/remotecallback/build.gradle index c1da69a6..5cd252f 100644 --- a/remotecallback/remotecallback/build.gradle +++ b/remotecallback/remotecallback/build.gradle
@@ -35,8 +35,8 @@ androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestAnnotationProcessor(project(":remotecallback:remotecallback-processor")) }
diff --git a/room/integration-tests/autovaluetestapp/build.gradle b/room/integration-tests/autovaluetestapp/build.gradle index 86c2124..3336f4f 100644 --- a/room/integration-tests/autovaluetestapp/build.gradle +++ b/room/integration-tests/autovaluetestapp/build.gradle
@@ -35,8 +35,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.espressoCore) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) testImplementation(libs.junit) }
diff --git a/sharetarget/sharetarget/build.gradle b/sharetarget/sharetarget/build.gradle index 83f12c4..eb41cbe 100644 --- a/sharetarget/sharetarget/build.gradle +++ b/sharetarget/sharetarget/build.gradle
@@ -38,8 +38,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) } androidx {
diff --git a/slice/slice-benchmark/build.gradle b/slice/slice-benchmark/build.gradle index f895e78..02b8c23 100644 --- a/slice/slice-benchmark/build.gradle +++ b/slice/slice-benchmark/build.gradle
@@ -41,8 +41,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) } androidx {
diff --git a/slice/slice-core/build.gradle b/slice/slice-core/build.gradle index 96d5715..9537bbb 100644 --- a/slice/slice-core/build.gradle +++ b/slice/slice-core/build.gradle
@@ -37,8 +37,8 @@ androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) annotationProcessor (project(":versionedparcelable:versionedparcelable-compiler")) }
diff --git a/slice/slice-remotecallback/build.gradle b/slice/slice-remotecallback/build.gradle index 2cbdcd7..d726d05 100644 --- a/slice/slice-remotecallback/build.gradle +++ b/slice/slice-remotecallback/build.gradle
@@ -38,8 +38,8 @@ androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestAnnotationProcessor project(":remotecallback:remotecallback-processor") }
diff --git a/slice/slice-test/build.gradle b/slice/slice-test/build.gradle index a485674..d918271 100644 --- a/slice/slice-test/build.gradle +++ b/slice/slice-test/build.gradle
@@ -40,8 +40,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) } androidx {
diff --git a/slice/slice-view/build.gradle b/slice/slice-view/build.gradle index 302d901..88a74e9 100644 --- a/slice/slice-view/build.gradle +++ b/slice/slice-view/build.gradle
@@ -43,8 +43,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore4, excludes.bytebuddy) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore4) + androidTestImplementation(libs.dexmakerMockito) } androidx {
diff --git a/startup/integration-tests/first-library/build.gradle b/startup/integration-tests/first-library/build.gradle index ef0402b..75c7de1 100644 --- a/startup/integration-tests/first-library/build.gradle +++ b/startup/integration-tests/first-library/build.gradle
@@ -29,8 +29,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.espressoCore) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has its own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) testImplementation(libs.junit) }
diff --git a/startup/integration-tests/second-library/build.gradle b/startup/integration-tests/second-library/build.gradle index 96216cb..c9c6ced 100644 --- a/startup/integration-tests/second-library/build.gradle +++ b/startup/integration-tests/second-library/build.gradle
@@ -28,8 +28,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.espressoCore) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has its own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) testImplementation(libs.junit) }
diff --git a/startup/startup-runtime/build.gradle b/startup/startup-runtime/build.gradle index c0b692d..5a9bd97 100644 --- a/startup/startup-runtime/build.gradle +++ b/startup/startup-runtime/build.gradle
@@ -49,8 +49,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.espressoCore) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has its own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) testImplementation(libs.junit) }
diff --git a/swiperefreshlayout/swiperefreshlayout/build.gradle b/swiperefreshlayout/swiperefreshlayout/build.gradle index 28bce37..5ae85eb 100644 --- a/swiperefreshlayout/swiperefreshlayout/build.gradle +++ b/swiperefreshlayout/swiperefreshlayout/build.gradle
@@ -24,8 +24,8 @@ androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) androidTestImplementation(libs.bundles.espressoContrib, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":internal-testutils-espresso")) androidTestImplementation(project(":internal-testutils-runtime"), { exclude group: "androidx.swiperefreshlayout", module: "swiperefreshlayout"
diff --git a/testutils/testutils-mockito/build.gradle b/testutils/testutils-mockito/build.gradle index c50d41e..8550ce9 100644 --- a/testutils/testutils-mockito/build.gradle +++ b/testutils/testutils-mockito/build.gradle
@@ -30,7 +30,7 @@ } dependencies { - api(libs.mockitoCore, excludes.bytebuddy) + api(libs.mockitoCore) implementation(libs.kotlinStdlib) }
diff --git a/transition/transition/build.gradle b/transition/transition/build.gradle index d1de2133..39fdd42 100644 --- a/transition/transition/build.gradle +++ b/transition/transition/build.gradle
@@ -28,8 +28,8 @@ androidTestImplementation(libs.testRules) androidTestImplementation(libs.truth) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.opentest4j) androidTestImplementation(project(":fragment:fragment")) androidTestImplementation("androidx.appcompat:appcompat:1.1.0")
diff --git a/versionedparcelable/versionedparcelable/build.gradle b/versionedparcelable/versionedparcelable/build.gradle index 4a1ab25..abf8f79 100644 --- a/versionedparcelable/versionedparcelable/build.gradle +++ b/versionedparcelable/versionedparcelable/build.gradle
@@ -36,8 +36,8 @@ androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) androidTestAnnotationProcessor project(":versionedparcelable:versionedparcelable-compiler") }
diff --git a/viewpager/viewpager/build.gradle b/viewpager/viewpager/build.gradle index 70f64ab..2e98fc6 100644 --- a/viewpager/viewpager/build.gradle +++ b/viewpager/viewpager/build.gradle
@@ -22,8 +22,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation project(':internal-testutils-espresso') }
diff --git a/viewpager2/viewpager2/build.gradle b/viewpager2/viewpager2/build.gradle index 67c9a66..e3f2872 100644 --- a/viewpager2/viewpager2/build.gradle +++ b/viewpager2/viewpager2/build.gradle
@@ -43,8 +43,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":internal-testutils-espresso")) androidTestImplementation(project(":internal-testutils-appcompat"), { exclude group: "androidx.viewpager2", module: "viewpager2"
diff --git a/wear/watchface/watchface-client-guava/build.gradle b/wear/watchface/watchface-client-guava/build.gradle index a393a6b..310b255 100644 --- a/wear/watchface/watchface-client-guava/build.gradle +++ b/wear/watchface/watchface-client-guava/build.gradle
@@ -41,8 +41,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) }
diff --git a/wear/watchface/watchface-client/build.gradle b/wear/watchface/watchface-client/build.gradle index 075f4bf..f43e366 100644 --- a/wear/watchface/watchface-client/build.gradle +++ b/wear/watchface/watchface-client/build.gradle
@@ -44,8 +44,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) testImplementation(libs.mockitoCore4)
diff --git a/wear/watchface/watchface-editor-guava/build.gradle b/wear/watchface/watchface-editor-guava/build.gradle index 6baca89..15c9ff976 100644 --- a/wear/watchface/watchface-editor-guava/build.gradle +++ b/wear/watchface/watchface-editor-guava/build.gradle
@@ -39,8 +39,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) }
diff --git a/wear/watchface/watchface-editor/build.gradle b/wear/watchface/watchface-editor/build.gradle index 0bd2f0e..b3747af 100644 --- a/wear/watchface/watchface-editor/build.gradle +++ b/wear/watchface/watchface-editor/build.gradle
@@ -49,8 +49,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.kotlinCoroutinesTest) androidTestImplementation(libs.kotlinTest) androidTestImplementation(libs.truth)
diff --git a/wear/watchface/watchface-guava/build.gradle b/wear/watchface/watchface-guava/build.gradle index 319eb9d..28b9236 100644 --- a/wear/watchface/watchface-guava/build.gradle +++ b/wear/watchface/watchface-guava/build.gradle
@@ -39,14 +39,14 @@ androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) testImplementation(libs.testCore) testImplementation(libs.testRunner) testImplementation(libs.testRules) - testImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - testImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + testImplementation(libs.mockitoCore) + testImplementation(libs.dexmakerMockito) testImplementation(libs.robolectric) testImplementation(libs.truth) }
diff --git a/wear/watchface/watchface/build.gradle b/wear/watchface/watchface/build.gradle index 8b5f470..2204343 100644 --- a/wear/watchface/watchface/build.gradle +++ b/wear/watchface/watchface/build.gradle
@@ -48,9 +48,9 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) androidTestImplementation(libs.mockitoKotlin) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) testImplementation(project(":wear:watchface:watchface-complications-rendering"))
diff --git a/wear/wear/build.gradle b/wear/wear/build.gradle index 41e2757..bc59963 100644 --- a/wear/wear/build.gradle +++ b/wear/wear/build.gradle
@@ -30,8 +30,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.espressoCore, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) testImplementation(libs.kotlinStdlib)
diff --git a/webkit/integration-tests/instrumentation/build.gradle b/webkit/integration-tests/instrumentation/build.gradle index 289f6b7..377fea1 100644 --- a/webkit/integration-tests/instrumentation/build.gradle +++ b/webkit/integration-tests/instrumentation/build.gradle
@@ -45,8 +45,8 @@ androidTestImplementation(libs.testRules) androidTestImplementation("androidx.appcompat:appcompat:1.1.0") androidTestImplementation("androidx.concurrent:concurrent-futures:1.0.0") - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) // Hamcrest matchers: androidTestImplementation(libs.bundles.espressoContrib, excludes.espresso)
diff --git a/webkit/integration-tests/testapp/build.gradle b/webkit/integration-tests/testapp/build.gradle index 6d26540..09d8d9a 100644 --- a/webkit/integration-tests/testapp/build.gradle +++ b/webkit/integration-tests/testapp/build.gradle
@@ -46,9 +46,8 @@ androidTestImplementation(libs.bundles.espressoContrib, excludes.espresso) androidTestImplementation(libs.espressoIdlingResource) androidTestImplementation(libs.espressoWeb, excludes.espresso) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) } // We want to publish a release apk of this project for webkit team's use
diff --git a/webkit/webkit/build.gradle b/webkit/webkit/build.gradle index 193e4b7..8be9b86 100644 --- a/webkit/webkit/build.gradle +++ b/webkit/webkit/build.gradle
@@ -41,8 +41,8 @@ androidTestImplementation(libs.testRules) androidTestImplementation("androidx.appcompat:appcompat:1.1.0") androidTestImplementation("androidx.concurrent:concurrent-futures:1.0.0") - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) // Hamcrest matchers: androidTestImplementation(libs.bundles.espressoContrib, excludes.espresso)
diff --git a/window/extensions/extensions/build.gradle b/window/extensions/extensions/build.gradle index 399cc93..2643332 100644 --- a/window/extensions/extensions/build.gradle +++ b/window/extensions/extensions/build.gradle
@@ -44,8 +44,8 @@ androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) androidTestImplementation(libs.truth) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) + androidTestImplementation(libs.dexmakerMockito) + androidTestImplementation(libs.mockitoCore) } androidx {
diff --git a/window/window-java/build.gradle b/window/window-java/build.gradle index a64e31c..372d095 100644 --- a/window/window-java/build.gradle +++ b/window/window-java/build.gradle
@@ -47,9 +47,9 @@ androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.mockitoKotlin, excludes.bytebuddy) + androidTestImplementation(libs.dexmakerMockito) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.mockitoKotlin) } androidx {
diff --git a/window/window-rxjava2/build.gradle b/window/window-rxjava2/build.gradle index 0a84a10..01a72dd 100644 --- a/window/window-rxjava2/build.gradle +++ b/window/window-rxjava2/build.gradle
@@ -45,9 +45,9 @@ androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.mockitoKotlin, excludes.bytebuddy) + androidTestImplementation(libs.dexmakerMockito) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.mockitoKotlin) androidTestImplementation(libs.kotlinCoroutinesTest) }
diff --git a/window/window-rxjava3/build.gradle b/window/window-rxjava3/build.gradle index 27f2064..eece733 100644 --- a/window/window-rxjava3/build.gradle +++ b/window/window-rxjava3/build.gradle
@@ -45,9 +45,9 @@ androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.mockitoKotlin, excludes.bytebuddy) + androidTestImplementation(libs.dexmakerMockito) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.mockitoKotlin) androidTestImplementation(libs.kotlinCoroutinesTest) }
diff --git a/window/window/build.gradle b/window/window/build.gradle index 004b04a..10c45a2 100644 --- a/window/window/build.gradle +++ b/window/window/build.gradle
@@ -84,9 +84,9 @@ androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testRules) - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) - androidTestImplementation(libs.mockitoKotlin, excludes.bytebuddy) + androidTestImplementation(libs.dexmakerMockito) + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.mockitoKotlin) androidTestImplementation(libs.kotlinCoroutinesTest) androidTestImplementation(libs.truth) androidTestImplementation(libs.junit) // Needed for Assert.assertThrows
diff --git a/work/work-gcm/build.gradle b/work/work-gcm/build.gradle index b316707..e06ae253 100644 --- a/work/work-gcm/build.gradle +++ b/work/work-gcm/build.gradle
@@ -49,8 +49,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.espressoCore) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has its own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) testImplementation(libs.junit) }
diff --git a/work/work-multiprocess/build.gradle b/work/work-multiprocess/build.gradle index 692e72f..364b730 100644 --- a/work/work-multiprocess/build.gradle +++ b/work/work-multiprocess/build.gradle
@@ -48,8 +48,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.espressoCore) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has its own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) }
diff --git a/work/work-runtime/build.gradle b/work/work-runtime/build.gradle index e723391..94aa053 100644 --- a/work/work-runtime/build.gradle +++ b/work/work-runtime/build.gradle
@@ -84,8 +84,8 @@ androidTestImplementation("androidx.room:room-testing:2.6.1") androidTestImplementation(libs.testRunner) androidTestImplementation(libs.espressoCore) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has its own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(project(":internal-testutils-runtime")) testImplementation(libs.junit) testImplementation(libs.truth)
diff --git a/work/work-testing/build.gradle b/work/work-testing/build.gradle index a9caf52..a972b75 100644 --- a/work/work-testing/build.gradle +++ b/work/work-testing/build.gradle
@@ -41,8 +41,8 @@ androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRunner) androidTestImplementation(libs.espressoCore) - androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker + androidTestImplementation(libs.mockitoCore) + androidTestImplementation(libs.dexmakerMockito) androidTestImplementation(libs.truth) testImplementation(libs.truth)