caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

libs update

Browse source
This commit is contained in:
Milos Kozak 2020-10-19 21:51:13 +02:00
parent f79e3f5282
commit 955844f319
11 changed files with 78 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/build.gradle
View file

@ -26,7 +26,7 @@ ext {
powermockVersion = "1.7.3"
dexmakerVersion = "1.2"
retrofit2Version = '2.9.0'
okhttp3Version = '4.7.2'
okhttp3Version = '4.9.0'
}
@ -251,12 +251,12 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.google.android.gms:play-services-wearable:17.0.0'
implementation "com.google.android.gms:play-services-location:17.0.0"
implementation 'com.google.android.gms:play-services-location:17.1.0'
implementation 'com.google.firebase:firebase-core:17.4.3'
implementation 'com.google.firebase:firebase-auth:19.3.1'
implementation 'com.google.firebase:firebase-database:19.3.1'
implementation 'com.google.firebase:firebase-auth:19.4.0'
implementation 'com.google.firebase:firebase-database:19.5.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.appcompat:appcompat:$appcompat_verison"
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
@ -264,13 +264,13 @@ dependencies {
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.percentlayout:percentlayout:1.0.0'
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "androidx.preference:preference-ktx:$preferencektx_version"
implementation "androidx.activity:activity-ktx:${activityVersion}"
implementation "androidx.fragment:fragment:${fragmentVersion}"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
implementation 'com.google.android.material:material:1.1.0'
implementation "com.google.android.material:material:$material_version"
implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
@ -279,7 +279,7 @@ dependencies {
implementation("com.github.tony19:logback-android-classic:1.1.1-6") {
exclude group: "com.google.android", module: "android"
}
implementation 'org.apache.commons:commons-lang3:3.10'
implementation "org.apache.commons:commons-lang3:$commonslang3_version"
implementation 'org.slf4j:slf4j-api:1.7.30'
// Graphview cannot be upgraded
implementation "com.jjoe64:graphview:4.0.1"
@ -293,21 +293,21 @@ dependencies {
exclude group: "org.json", module: "json"
}
implementation "com.google.code.gson:gson:2.8.6"
implementation('com.google.guava:guava:29.0-jre') {
implementation('com.google.guava:guava:30.0-jre') {
exclude group: "com.google.code.findbugs", module: "jsr305"
}
implementation 'com.google.code.findbugs:jsr305:3.0.2'
implementation 'net.danlew:android.joda:2.10.6'
implementation 'org.mozilla:rhino:1.7.12'
implementation 'org.mozilla:rhino:1.7.13'
implementation 'com.github.DavidProdinger:weekdays-selector:1.1.0'
implementation 'com.github.kenglxn.QRGen:android:2.6.0'
implementation 'com.eatthepath:java-otp:0.2.0'
testImplementation "junit:junit:4.13"
testImplementation "junit:junit:$junit_version"
testImplementation 'org.json:json:20200518'
testImplementation "org.mockito:mockito-core:2.8.47"
testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
@ -358,7 +358,7 @@ dependencies {
//WorkManager
implementation 'androidx.work:work-runtime:2.3.4'
implementation 'androidx.work:work-runtime-ktx:2.3.4'
implementation 'androidx.work:work-runtime-ktx:2.4.0'
implementation 'androidx.work:work-rxjava2:2.3.4'
implementation 'com.google.androidbrowserhelper:androidbrowserhelper:1.1.0'

25
build.gradle
View file

@ -2,19 +2,28 @@
buildscript {
ext {
kotlin_version = '1.3.72'
coreVersion = '1.3.0'
kotlin_version = '1.4.10'
coreVersion = '1.3.2'
rxjava_version = '2.2.19'
rxandroid_version = '2.1.1'
rxkotlin_version = '2.4.0'
room_version = '2.2.5'
lifecycle_version = '2.2.0'
dagger_version = '2.28.1'
dagger_version = '2.29.1'
coroutinesVersion = '1.3.7'
activityVersion = '1.2.0-alpha06'
fragmentVersion = '1.3.0-alpha07'
activityVersion = '1.2.0-beta01'
fragmentVersion = '1.3.0-beta01'
ormLiteVersion = '4.46'
nav_version = '2.3.0'
nav_version = '2.3.1'
appcompat_verison = '1.2.0'
material_version = '1.2.1'
constraintlayout_version = '2.0.2'
preferencektx_version = '1.1.1'
firebaseanalyticsktx_version = '17.4.3'
firebasecrashlytics_version = '17.2.2'
commonslang3_version = '3.11'
junit_version = '4.13.1'
}
repositories {
google()
@ -22,8 +31,8 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
classpath 'com.google.gms:google-services:4.3.4'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

14
core/build.gradle
View file

@ -42,12 +42,12 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "androidx.appcompat:appcompat:$appcompat_verison"
implementation "androidx.preference:preference-ktx:$preferencektx_version"
implementation 'androidx.biometric:biometric:1.0.1'
implementation "androidx.activity:activity:${activityVersion}"
implementation "androidx.activity:activity-ktx:${activityVersion}"
implementation 'com.google.android.material:material:1.1.0'
implementation "com.google.android.material:material:$material_version"
implementation "com.google.dagger:dagger-android:$dagger_version"
implementation "com.google.dagger:dagger-android-support:$dagger_version"
@ -59,12 +59,12 @@ dependencies {
//Logger
implementation 'org.slf4j:slf4j-api:1.7.30'
//Fabric
implementation 'com.google.firebase:firebase-analytics-ktx:17.4.3'
implementation 'com.google.firebase:firebase-crashlytics:17.1.0'
implementation "com.google.firebase:firebase-analytics-ktx:$firebaseanalyticsktx_version"
implementation "com.google.firebase:firebase-crashlytics:$firebasecrashlytics_version"
//RxBus
implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
implementation 'org.apache.commons:commons-lang3:3.10'
implementation "org.apache.commons:commons-lang3:$commonslang3_version"
//CryptoUtil
implementation 'com.madgag.spongycastle:core:1.58.0.0'
@ -82,7 +82,7 @@ dependencies {
// pumpCommon
implementation "com.google.code.gson:gson:2.8.6"
testImplementation 'junit:junit:4.13'
testImplementation "junit:junit:$junit_version"
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}

8
dana/build.gradle
View file

@ -48,9 +48,9 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.core:core-ktx:${coreVersion}"
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "androidx.appcompat:appcompat:$appcompat_verison"
implementation "androidx.core:core-ktx:$coreVersion"
implementation "androidx.preference:preference-ktx:$preferencektx_version"
implementation "androidx.activity:activity-ktx:${activityVersion}"
implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
@ -69,7 +69,7 @@ dependencies {
kapt "com.google.dagger:dagger-android-processor:$dagger_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version"
testImplementation 'junit:junit:4.13'
testImplementation "junit:junit:$junit_version"
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}

8
danar/build.gradle
View file

@ -50,9 +50,9 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.core:core-ktx:${coreVersion}"
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "androidx.appcompat:appcompat:$appcompat_verison"
implementation "androidx.core:core-ktx:$coreVersion"
implementation "androidx.preference:preference-ktx:$preferencektx_version"
implementation "androidx.activity:activity-ktx:${activityVersion}"
// Graphview cannot be upgraded
@ -70,7 +70,7 @@ dependencies {
//RxBus
implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
testImplementation 'junit:junit:4.13'
testImplementation "junit:junit:$junit_version"
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}

8
danars/build.gradle
View file

@ -49,9 +49,9 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.core:core-ktx:${coreVersion}"
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "androidx.appcompat:appcompat:$appcompat_verison"
implementation "androidx.core:core-ktx:$coreVersion"
implementation "androidx.preference:preference-ktx:$preferencektx_version"
implementation "androidx.activity:activity-ktx:${activityVersion}"
// Graphview cannot be upgraded
@ -69,7 +69,7 @@ dependencies {
//RxBus
implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
testImplementation 'junit:junit:4.13'
testImplementation "junit:junit:$junit_version"
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}

12
medtronic/build.gradle
View file

@ -49,12 +49,12 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.appcompat:appcompat:$appcompat_verison"
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'androidx.core:core-ktx:1.2.0'
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "androidx.core:core-ktx:$coreVersion"
implementation "androidx.preference:preference-ktx:$preferencektx_version"
implementation "androidx.activity:activity-ktx:${activityVersion}"
implementation 'com.google.android.material:material:1.1.0'
implementation "com.google.android.material:material:$material_version"
implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
@ -64,7 +64,7 @@ dependencies {
implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
// medtronic - start
implementation 'org.apache.commons:commons-lang3:3.10'
implementation "org.apache.commons:commons-lang3:$commonslang3_version"
implementation 'net.danlew:android.joda:2.10.6'
implementation 'org.slf4j:slf4j-api:1.7.30'
implementation "com.google.code.gson:gson:2.8.6"
@ -77,7 +77,7 @@ dependencies {
kapt "com.google.dagger:dagger-android-processor:$dagger_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version"
testImplementation 'junit:junit:4.13'
testImplementation "junit:junit:$junit_version"
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}

20
omnipod/build.gradle
View file

@ -70,16 +70,16 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.appcompat:appcompat:$appcompat_verison"
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'androidx.core:core-ktx:1.2.0'
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "androidx.core:core-ktx:$coreVersion"
implementation "androidx.preference:preference-ktx:$preferencektx_version"
implementation "androidx.activity:activity-ktx:${activityVersion}"
implementation "androidx.fragment:fragment:${fragmentVersion}"
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
implementation 'com.google.android.material:material:1.1.0'
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
implementation "com.google.android.material:material:$material_version"
implementation 'com.google.firebase:firebase-analytics-ktx:17.4.3'
implementation "com.google.firebase:firebase-analytics-ktx:$firebaseanalyticsktx_version"
implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
@ -88,13 +88,13 @@ dependencies {
implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
implementation 'org.apache.commons:commons-lang3:3.10'
implementation "org.apache.commons:commons-lang3:$commonslang3_version"
implementation 'net.danlew:android.joda:2.10.6'
implementation "com.google.code.gson:gson:2.8.6"
implementation "com.google.dagger:dagger-android:$dagger_version"
implementation "com.google.dagger:dagger-android-support:$dagger_version"
implementation 'androidx.navigation:navigation-runtime:2.2.2'
implementation 'androidx.navigation:navigation-runtime:2.3.1'
annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
kapt "com.google.dagger:dagger-android-processor:$dagger_version"
@ -104,9 +104,9 @@ dependencies {
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
implementation 'com.google.android.material:material:1.1.0'
implementation "com.google.android.material:material:$material_version"
testImplementation 'junit:junit:4.13'
testImplementation "junit:junit:$junit_version"
testImplementation "org.mockito:mockito-core:2.8.47"
testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion"
testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"

12
rileylink/build.gradle
View file

@ -48,12 +48,12 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.appcompat:appcompat:$appcompat_verison"
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'androidx.core:core-ktx:1.2.0'
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "androidx.core:core-ktx:$coreVersion"
implementation "androidx.preference:preference-ktx:$preferencektx_version"
implementation "androidx.activity:activity-ktx:${activityVersion}"
implementation 'com.google.android.material:material:1.1.0'
implementation "com.google.android.material:material:$material_version"
implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
@ -63,7 +63,7 @@ dependencies {
implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
// rileylink - start
implementation 'org.apache.commons:commons-lang3:3.10'
implementation "org.apache.commons:commons-lang3:$commonslang3_version"
implementation 'net.danlew:android.joda:2.10.6'
implementation 'org.slf4j:slf4j-api:1.7.30'
// rileylink - end
@ -75,7 +75,7 @@ dependencies {
kapt "com.google.dagger:dagger-android-processor:$dagger_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version"
testImplementation 'junit:junit:4.13'
testImplementation "junit:junit:$junit_version"
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}

1
runtests.bat Normal file
View file

@ -0,0 +1 @@
gradlew -Pcoverage -PfirebaseDisable testFullDebugUnitTest

12
wear/build.gradle
View file

@ -113,7 +113,7 @@ dependencies {
//implementation files("libs/hellocharts-library-1.5.5.jar")
//compile "com.ustwo.android:clockwise-wearable:1.0.2"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.appcompat:appcompat:$appcompat_verison"
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
compileOnly "com.google.android.wearable:wearable:${wearableVersion}"
@ -122,11 +122,11 @@ dependencies {
implementation(name: 'ustwo-clockwise-debug', ext: 'aar')
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.percentlayout:percentlayout:1.0.0'
implementation 'androidx.wear:wear:1.0.0'
implementation 'androidx.wear:wear:1.1.0'
implementation('me.denley.wearpreferenceactivity:wearpreferenceactivity:0.5.0')
implementation('com.github.lecho:hellocharts-library:1.5.8@aar')
testImplementation 'junit:junit:4.13'
testImplementation "junit:junit:$junit_version"
testImplementation 'org.json:json:20200518'
testImplementation("org.mockito:mockito-core:2.8.47") {
exclude group: 'net.bytebuddy', module: 'byte-buddy'
@ -134,9 +134,9 @@ dependencies {
exclude group: 'net.bytebuddy', module: 'byte-buddy-agent'
}
// to fix org.mockito:mockito-core dependency issues, fixed in mockito 3+
testImplementation 'net.bytebuddy:byte-buddy:1.8.22'
testImplementation 'net.bytebuddy:byte-buddy-android:1.8.22'
testImplementation 'net.bytebuddy:byte-buddy-agent:1.8.22'
testImplementation 'net.bytebuddy:byte-buddy:1.10.17'
testImplementation 'net.bytebuddy:byte-buddy-android:1.10.17'
testImplementation 'net.bytebuddy:byte-buddy-agent:1.10.17'
testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"