summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle9
-rw-r--r--common.gradle2
-rw-r--r--core/build.gradle2
-rw-r--r--gradle.properties1
4 files changed, 8 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index 000cf1804..c806f52c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,10 +53,11 @@ project.ext {
//Tests
awaitilityVersion = "3.1.6"
junitVersion = "4.13"
- robolectricVersion = "4.5-alpha-1"
- espressoVersion = "3.2.0"
- runnerVersion = "1.2.0"
- rulesVersion = "1.2.0"
+ robolectricVersion = "4.9"
+ espressoVersion = "3.5.0"
+ runnerVersion = "1.5.0"
+ rulesVersion = "1.5.0"
+ testCoreVersion = "1.5.0"
}
apply plugin: "checkstyle"
diff --git a/common.gradle b/common.gradle
index 060b7c5ff..bff699af9 100644
--- a/common.gradle
+++ b/common.gradle
@@ -3,7 +3,7 @@ android {
defaultConfig {
minSdk 19
- targetSdk 30
+ targetSdk 31
multiDexEnabled true
vectorDrawables.useSupportLibrary true
diff --git a/core/build.gradle b/core/build.gradle
index c67065722..e4b9542c7 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -71,7 +71,7 @@ dependencies {
playApi "com.google.android.support:wearable:$wearableSupportVersion"
compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion"
- testImplementation 'androidx.test:core:1.2.0'
+ testImplementation "androidx.test:core:$testCoreVersion"
testImplementation "org.awaitility:awaitility:$awaitilityVersion"
testImplementation "junit:junit:$junitVersion"
testImplementation 'org.mockito:mockito-inline:3.5.13'
diff --git a/gradle.properties b/gradle.properties
index 431e485f2..4217706ec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
android.useAndroidX=true
android.enableJetifier=true
+android.jetifier.blacklist=bcprov-jdk15on
org.gradle.jvmargs=-Xmx4096m