From b4f352996cff17ae98c652f2eb89f0c7929aaa53 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 01:13:42 +0000 Subject: [PATCH 1/2] Bump mockito-android from 3.4.6 to 3.5.3 Bumps [mockito-android](https://github.com/mockito/mockito) from 3.4.6 to 3.5.3. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.4.6...v3.5.3) Signed-off-by: dependabot-preview[bot] Signed-off-by: thelittlefireman --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1a438bc184cd..6be92f06838a 100644 --- a/build.gradle +++ b/build.gradle @@ -381,7 +381,7 @@ dependencies { androidTestImplementation 'com.github.tmurakami:dexopener:2.0.5' // required to allow mocking on API 27 and older androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" androidTestImplementation 'org.mockito:mockito-core:3.4.4' - androidTestImplementation("org.mockito:mockito-android:3.4.6") { + androidTestImplementation("org.mockito:mockito-android:3.5.3") { exclude group: "net.bytebuddy", module: "byte-buddy-android" } androidTestImplementation 'net.bytebuddy:byte-buddy:1.10.14' From 0b392a9a0860efad32603234818882c60f375538 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Fri, 21 Aug 2020 09:30:13 +0200 Subject: [PATCH 2/2] use same version for all org.mockito releases Signed-off-by: tobiasKaminsky Signed-off-by: thelittlefireman --- build.gradle | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 6be92f06838a..e0d8df8cd617 100644 --- a/build.gradle +++ b/build.gradle @@ -64,6 +64,7 @@ ext { prismVersion = "2.0.0" butterknifeVersion = "10.2.3" androidLibraryVersion = "master-SNAPSHOT" + mockitoVersion = "3.5.10" espressoVersion = "3.3.0" travisBuild = System.getenv("TRAVIS") == "true" @@ -353,7 +354,7 @@ dependencies { // dependencies for local unit tests testImplementation 'junit:junit:4.13' - testImplementation 'org.mockito:mockito-core:3.4.6' + testImplementation "org.mockito:mockito-core:$mockitoVersion" testImplementation 'androidx.test:core:1.3.0' testImplementation 'org.powermock:powermock-core:2.0.7' testImplementation 'org.powermock:powermock-module-junit4:2.0.7' @@ -380,8 +381,8 @@ dependencies { // Mocking support androidTestImplementation 'com.github.tmurakami:dexopener:2.0.5' // required to allow mocking on API 27 and older androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" - androidTestImplementation 'org.mockito:mockito-core:3.4.4' - androidTestImplementation("org.mockito:mockito-android:3.5.3") { + androidTestImplementation "org.mockito:mockito-core:$mockitoVersion" + androidTestImplementation("org.mockito:mockito-android:$mockitoVersion") { exclude group: "net.bytebuddy", module: "byte-buddy-android" } androidTestImplementation 'net.bytebuddy:byte-buddy:1.10.14' @@ -413,7 +414,11 @@ spotbugs { } configurations.all { - resolutionStrategy.cacheChangingModulesFor 0, 'seconds' + resolutionStrategy{ + cacheChangingModulesFor 0, 'seconds' + force 'org.objenesis:objenesis:2.6' + } + } tasks.withType(Test) {