Skip to content

Commit

Permalink
Merge pull request nextcloud#6768 from nextcloud/dependabot/gradle/or…
Browse files Browse the repository at this point in the history
…g.mockito-mockito-android-3.5.3

Bump mockito-android from 3.4.6 to 3.5.10
Signed-off-by: thelittlefireman <thelittlefireman@users.noreply.github.com>
  • Loading branch information
tobiasKaminsky committed Sep 9, 2020
2 parents 1dad7ae + 0b392a9 commit 6c02dd4
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions build.gradle
Expand Up @@ -64,6 +64,7 @@ ext {
prismVersion = "2.0.0"
butterknifeVersion = "10.2.3"
androidLibraryVersion = "master-SNAPSHOT"
mockitoVersion = "3.5.10"
espressoVersion = "3.3.0"

travisBuild = System.getenv("TRAVIS") == "true"
Expand Down Expand Up @@ -353,7 +354,7 @@ dependencies {

// dependencies for local unit tests
testImplementation 'junit:junit:4.13'
testImplementation 'org.mockito:mockito-core:3.4.6'
testImplementation "org.mockito:mockito-core:$mockitoVersion"
testImplementation 'androidx.test:core:1.3.0'
testImplementation 'org.powermock:powermock-core:2.0.7'
testImplementation 'org.powermock:powermock-module-junit4:2.0.7'
Expand All @@ -380,8 +381,8 @@ dependencies {
// Mocking support
androidTestImplementation 'com.github.tmurakami:dexopener:2.0.5' // required to allow mocking on API 27 and older
androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
androidTestImplementation 'org.mockito:mockito-core:3.4.4'
androidTestImplementation("org.mockito:mockito-android:3.4.6") {
androidTestImplementation "org.mockito:mockito-core:$mockitoVersion"
androidTestImplementation("org.mockito:mockito-android:$mockitoVersion") {
exclude group: "net.bytebuddy", module: "byte-buddy-android"
}
androidTestImplementation 'net.bytebuddy:byte-buddy:1.10.14'
Expand Down Expand Up @@ -413,7 +414,11 @@ spotbugs {
}

configurations.all {
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
resolutionStrategy{
cacheChangingModulesFor 0, 'seconds'
force 'org.objenesis:objenesis:2.6'
}

}

tasks.withType(Test) {
Expand Down

0 comments on commit 6c02dd4

Please sign in to comment.