Skip to content

Commit

Permalink
upgrade libs
Browse files Browse the repository at this point in the history
  • Loading branch information
MilosKozak committed Nov 30, 2020
1 parent 853679e commit 2b0bfe0
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 21 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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()
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions core/core_dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
}
4 changes: 2 additions & 2 deletions dana/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 2 additions & 2 deletions danar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 2 additions & 2 deletions danars/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

4 changes: 2 additions & 2 deletions medtronic/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
5 changes: 2 additions & 3 deletions omnipod/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 2 additions & 2 deletions rileylink/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

0 comments on commit 2b0bfe0

Please sign in to comment.