From cad14634ee6e03490c1edc496bd531d047325023 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 7 Sep 2020 15:07:55 +0000 Subject: [PATCH] chore: Bump mockito-android from 3.4.6 to 3.5.10 (#120) Bumps [mockito-android](https://github.com/mockito/mockito) from 3.4.6 to 3.5.10.
Release notes

Sourced from mockito-android's releases.

v3.5.10

Release notes were automatically generated by Shipkit

3.5.10

v3.5.9

Release notes were automatically generated by Shipkit

3.5.9

v3.5.8

Release notes were automatically generated by Shipkit

3.5.8

v3.5.7

Release notes were automatically generated by Shipkit

3.5.7

v3.5.6

Release notes were automatically generated by Shipkit

3.5.6

v3.5.5

Release notes were automatically generated by Shipkit

3.5.5

v3.5.2

Release notes were automatically generated by Shipkit

3.5.2

Commits

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=org.mockito:mockito-android&package-manager=gradle&previous-version=3.4.6&new-version=3.5.10)](https://dependabot.com/compatibility-score/?dependency-name=org.mockito:mockito-android&package-manager=gradle&previous-version=3.4.6&new-version=3.5.10) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in the `.dependabot/config.yml` file in this repo: - Update frequency - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired)
--- app/build.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9ba97ca6..aac15c89 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -153,8 +153,12 @@ dependencies { androidTestImplementation('com.schibsted.spain:barista:3.6.0') { exclude group: 'org.jetbrains.kotlin' } - androidTestImplementation "org.mockito:mockito-android:3.4.6" - androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0' + androidTestImplementation "org.mockito:mockito-android:3.5.10" + androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") { + // Workaround for Android API < 26: + // https://github.com/mockito/mockito/pull/2024 + exclude group: "org.mockito", module: "mockito-core" + } kaptAndroidTest 'com.google.dagger:dagger-compiler:2.28' }