Browse Source

Merge pull request #6768 from nextcloud/dependabot/gradle/org.mockito-mockito-android-3.5.3

Bump mockito-android from 3.4.6 to 3.5.10
Tobias Kaminsky 4 years ago
parent
commit
68efb59b5b
1 changed files with 9 additions and 4 deletions
  1. 9 4
      build.gradle

+ 9 - 4
build.gradle

@@ -64,6 +64,7 @@ ext {
     prismVersion = "2.0.0"
     prismVersion = "2.0.0"
     butterknifeVersion = "10.2.3"
     butterknifeVersion = "10.2.3"
     androidLibraryVersion = "master-SNAPSHOT"
     androidLibraryVersion = "master-SNAPSHOT"
+    mockitoVersion = "3.5.10"
     espressoVersion = "3.3.0"
     espressoVersion = "3.3.0"
 
 
     travisBuild = System.getenv("TRAVIS") == "true"
     travisBuild = System.getenv("TRAVIS") == "true"
@@ -353,7 +354,7 @@ dependencies {
 
 
     // dependencies for local unit tests
     // dependencies for local unit tests
     testImplementation 'junit:junit:4.13'
     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 'androidx.test:core:1.3.0'
     testImplementation 'org.powermock:powermock-core:2.0.7'
     testImplementation 'org.powermock:powermock-core:2.0.7'
     testImplementation 'org.powermock:powermock-module-junit4:2.0.7'
     testImplementation 'org.powermock:powermock-module-junit4:2.0.7'
@@ -380,8 +381,8 @@ dependencies {
     // Mocking support
     // Mocking support
     androidTestImplementation 'com.github.tmurakami:dexopener:2.0.5' // required to allow mocking on API 27 and older
     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 "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"
         exclude group: "net.bytebuddy", module: "byte-buddy-android"
     }
     }
     androidTestImplementation 'net.bytebuddy:byte-buddy:1.10.14'
     androidTestImplementation 'net.bytebuddy:byte-buddy:1.10.14'
@@ -413,7 +414,11 @@ spotbugs {
 }
 }
 
 
 configurations.all {
 configurations.all {
-    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    resolutionStrategy{
+        cacheChangingModulesFor 0, 'seconds'
+        force 'org.objenesis:objenesis:2.6'
+    }
+
 }
 }
 
 
 tasks.withType(Test) {
 tasks.withType(Test) {