summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarsh Shandilya <msfjarvis@gmail.com>2019-05-01 17:03:58 +0530
committerHarsh Shandilya <msfjarvis@gmail.com>2019-05-01 17:03:58 +0530
commit127a8b8c8a10d9c93bfc7e91e94b4bcb252eddeb (patch)
treee456726b25eb37dfbad4efeac51eda049440237d
parenta832a60c11f36f637e989b9b3c8fa9c19be6a4ab (diff)
Update mockito and fix dependency updates task
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
-rw-r--r--app/build.gradle.kts2
-rw-r--r--build.gradle.kts2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4c90a102..1fc4f570 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -87,7 +87,7 @@ dependencies {
// Testing-only dependencies
androidTestImplementation("junit:junit:4.12")
- androidTestImplementation("org.mockito:mockito-core:2.25.0")
+ androidTestImplementation("org.mockito:mockito-core:2.27.0")
androidTestImplementation("androidx.test:runner:1.1.1")
androidTestImplementation("androidx.test:rules:1.1.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.1.1")
diff --git a/build.gradle.kts b/build.gradle.kts
index 70964e6a..21ea2d4a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -31,7 +31,7 @@ tasks {
val blacklistedGroups = listOf("commons-io", "org.eclipse.jgit")
val rejected = listOf("alpha", "beta", "rc", "cr", "m", "preview")
.map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-]*") }
- .any { it.matches(candidate.version) && blacklistedGroups.contains(candidate.group) }
+ .any { it.matches(candidate.version) || blacklistedGroups.contains(candidate.group) }
if (rejected) {
reject("Release candidate")
}