From cc53e04c10ffddb7a982c0eb11d0dd801ef27a23 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 7 Sep 2020 08:20:32 +0000 Subject: [PATCH 1/3] chore: Bump mockito-android from 3.4.6 to 3.5.10 Bumps [mockito-android](https://github.com/mockito/mockito) from 3.4.6 to 3.5.10. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.4.6...v3.5.10) Signed-off-by: dependabot-preview[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 8f715edc..75b7a47d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -153,7 +153,7 @@ dependencies { androidTestImplementation('com.schibsted.spain:barista:3.6.0') { exclude group: 'org.jetbrains.kotlin' } - androidTestImplementation "org.mockito:mockito-android:3.4.6" + androidTestImplementation "org.mockito:mockito-android:3.5.10" androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0' kaptAndroidTest 'com.google.dagger:dagger-compiler:2.28' } From ef8bd41452249eff6b28576fcd56811cdfe90079 Mon Sep 17 00:00:00 2001 From: Gus Narea Date: Mon, 7 Sep 2020 14:57:21 +0100 Subject: [PATCH 2/3] Workaround --- app/build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 43ae1c9f..3e33c1d1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -154,7 +154,11 @@ dependencies { exclude group: 'org.jetbrains.kotlin' } androidTestImplementation "org.mockito:mockito-android:3.5.10" - androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0' + androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") { + // Workaround for Androdi API < 26: + // https://github.com/mockito/mockito/pull/2024 + exclude group: "org.mockito", module: "mockito-core" + } kaptAndroidTest 'com.google.dagger:dagger-compiler:2.28' } From ad5c0b0719a05d2fd99c4c9e8ff29f38b8c7f51f Mon Sep 17 00:00:00 2001 From: Gus Narea Date: Mon, 7 Sep 2020 15:00:26 +0100 Subject: [PATCH 3/3] Fix typo --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 3e33c1d1..aac15c89 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -155,7 +155,7 @@ dependencies { } androidTestImplementation "org.mockito:mockito-android:3.5.10" androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") { - // Workaround for Androdi API < 26: + // Workaround for Android API < 26: // https://github.com/mockito/mockito/pull/2024 exclude group: "org.mockito", module: "mockito-core" }