From 2b0bfe0f7c3aaafcaad917ec0aa07c81e5fea59a Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 30 Nov 2020 08:54:47 +0100 Subject: [PATCH] upgrade libs --- app/build.gradle | 4 ++-- build.gradle | 9 ++++++--- core/core_dependencies.gradle | 6 +++--- dana/build.gradle | 4 ++-- danar/build.gradle | 4 ++-- danars/build.gradle | 4 ++-- medtronic/build.gradle | 4 ++-- omnipod/build.gradle | 5 ++--- rileylink/build.gradle | 4 ++-- 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a9e7875666..8d72d49d2e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -257,8 +257,8 @@ dependencies { testImplementation "org.hamcrest:hamcrest-all:1.3" androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha03' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test:rules:1.3.0-beta01' + androidTestImplementation "androidx.test.ext:junit:$androidx_junit" + androidTestImplementation "androidx.test:rules:$androidx_rules" androidTestImplementation 'com.google.code.findbugs:jsr305:3.0.2' /* Dagger2 - We are going to use dagger.android which includes diff --git a/build.gradle b/build.gradle index c8042d3613..a7ce6acdb8 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlin_version = '1.4.10' + kotlin_version = '1.4.20' coreVersion = '1.3.2' rxjava_version = '2.2.19' rxandroid_version = '2.1.1' @@ -17,7 +17,7 @@ buildscript { nav_version = '2.3.1' appcompat_verison = '1.2.0' material_version = '1.2.1' - constraintlayout_version = '2.0.2' + constraintlayout_version = '2.0.4' preferencektx_version = '1.1.1' commonslang3_version = '3.11' work_version = '2.4.0' @@ -27,6 +27,9 @@ buildscript { dexmakerVersion = "1.2" retrofit2Version = '2.9.0' okhttp3Version = '4.9.0' + + androidx_junit = '1.1.2' + androidx_rules = '1.3.1-alpha02' } repositories { google() @@ -35,7 +38,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:4.1.1' classpath 'com.google.gms:google-services:4.3.4' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/core/core_dependencies.gradle b/core/core_dependencies.gradle index 4c883de834..70958b09a8 100644 --- a/core/core_dependencies.gradle +++ b/core/core_dependencies.gradle @@ -69,7 +69,7 @@ dependencies { api "androidx.work:work-runtime:$work_version" api "androidx.work:work-runtime-ktx:$work_version" api "androidx.work:work-rxjava2:$work_version" - api 'com.google.androidbrowserhelper:androidbrowserhelper:2.0.0' + api 'com.google.androidbrowserhelper:androidbrowserhelper:2.0.1' api 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' // new for tidepool @@ -115,6 +115,6 @@ dependencies { api 'com.scottyab:rootbeer-lib:0.0.8' testImplementation "junit:junit:$junit_version" - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation "androidx.test.ext:junit:$androidx_junit" + androidTestImplementation "androidx.test:rules:$androidx_rules" } \ No newline at end of file diff --git a/dana/build.gradle b/dana/build.gradle index 1963c76e5a..cdeb8d9bc3 100644 --- a/dana/build.gradle +++ b/dana/build.gradle @@ -50,6 +50,6 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" testImplementation "junit:junit:$junit_version" - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation "androidx.test.ext:junit:$androidx_junit" + androidTestImplementation "androidx.test:rules:$androidx_rules" } diff --git a/danar/build.gradle b/danar/build.gradle index db0420b0ea..f4583508f7 100644 --- a/danar/build.gradle +++ b/danar/build.gradle @@ -52,6 +52,6 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" testImplementation "junit:junit:$junit_version" - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation "androidx.test.ext:junit:$androidx_junit" + androidTestImplementation "androidx.test:rules:$androidx_rules" } diff --git a/danars/build.gradle b/danars/build.gradle index 0cefa939d9..87b0026fab 100644 --- a/danars/build.gradle +++ b/danars/build.gradle @@ -53,7 +53,7 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" testImplementation "junit:junit:$junit_version" - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation "androidx.test.ext:junit:$androidx_junit" + androidTestImplementation "androidx.test:rules:$androidx_rules" } diff --git a/medtronic/build.gradle b/medtronic/build.gradle index d1cf679432..d45bced541 100644 --- a/medtronic/build.gradle +++ b/medtronic/build.gradle @@ -51,6 +51,6 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" testImplementation "junit:junit:$junit_version" - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation "androidx.test.ext:junit:$androidx_junit" + androidTestImplementation "androidx.test:rules:$androidx_rules" } diff --git a/omnipod/build.gradle b/omnipod/build.gradle index 9ec0f706e1..5e2efbf15b 100644 --- a/omnipod/build.gradle +++ b/omnipod/build.gradle @@ -63,7 +63,6 @@ dependencies { testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion" testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}" testImplementation 'joda-time:joda-time:2.10.6' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - + androidTestImplementation "androidx.test.ext:junit:$androidx_junit" + androidTestImplementation "androidx.test:rules:$androidx_rules" } diff --git a/rileylink/build.gradle b/rileylink/build.gradle index 1963c76e5a..cdeb8d9bc3 100644 --- a/rileylink/build.gradle +++ b/rileylink/build.gradle @@ -50,6 +50,6 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" testImplementation "junit:junit:$junit_version" - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation "androidx.test.ext:junit:$androidx_junit" + androidTestImplementation "androidx.test:rules:$androidx_rules" }