Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Bump mockito-android from 3.4.6 to 3.5.10 #120

Merged
merged 4 commits into from Sep 7, 2020
Merged

chore: Bump mockito-android from 3.4.6 to 3.5.10 #120

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc53e04
chore: Bump mockito-android from 3.4.6 to 3.5.10
dependabot-preview[bot] Sep 7, 2020
9a5dec1
Merge branch 'master' into dependabot/gradle/org.mockito-mockito-andr…
gnarea Sep 7, 2020
ef8bd41
Workaround
gnarea Sep 7, 2020
ad5c0b0
Fix typo
gnarea Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions app/build.gradle
View file
Open in desktop
Expand Up @@ -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") {
gnarea marked this conversation as resolved.
Show resolved Hide resolved
// 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'
}

Expand Down