Merge pull request #4591 from nextcloud/dependabot/gradle/org.mockito-mockito-core-3.1.0

Bump mockito-core from 3.0.0 to 3.1.0
This commit is contained in:
Tobias Kaminsky 2019-10-02 08:05:02 +02:00 committed by GitHub
commit 9a580b3a39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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