Merge pull request #5025 from nextcloud/dependabot/gradle/org.mockito-mockito-core-3.2.4

This commit is contained in:
dependabot-preview[bot] 2019-12-18 12:21:53 +00:00 committed by GitHub
commit 447f747927
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -344,7 +344,7 @@ dependencies {
// dependencies for local unit tests
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:3.2.0'
testImplementation 'org.mockito:mockito-core:3.2.4'
testImplementation 'androidx.test:core:1.2.0'
testImplementation 'org.powermock:powermock-core:2.0.4'
testImplementation 'org.powermock:powermock-module-junit4:2.0.4'
@ -364,7 +364,7 @@ dependencies {
// Espresso core
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
androidTestImplementation 'org.mockito:mockito-core:3.1.0'
androidTestImplementation 'org.mockito:mockito-core:3.2.4'
// UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests
// androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
// fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details