libs update & cleanup

app/build.gradle

@@ -22,8 +22,8 @@ jacoco {
 ext {
     powermockVersion = "1.7.3"
     dexmakerVersion = "1.2"
-    retrofit2Version = '2.8.1'
+    retrofit2Version = '2.9.0'
-    okhttp3Version = '4.6.0'
+    okhttp3Version = '4.7.2'
 }
 
 
@@ -256,12 +256,11 @@ dependencies {
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.1.0'
 
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
 
     implementation "com.j256.ormlite:ormlite-core:${ormLiteVersion}"
     implementation "com.j256.ormlite:ormlite-android:${ormLiteVersion}"
@@ -274,6 +273,7 @@ dependencies {
     implementation "com.jjoe64:graphview:4.0.1"
     implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
     implementation 'com.madgag.spongycastle:core:1.58.0.0'
+    // Omnipod wizard
     implementation(name: "com.atech-software.android.library.wizardpager-1.1.1", ext: "aar")
 
     implementation("com.google.android:flexbox:0.3.0") {
@@ -299,7 +299,7 @@ dependencies {
     implementation 'com.eatthepath:java-otp:0.2.0'
 
     testImplementation "junit:junit:4.13"
-    testImplementation "org.json:json:20190722"
+    testImplementation 'org.json:json:20200518'
     testImplementation "org.mockito:mockito-core:2.8.47"
     testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
     testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt

@@ -7,7 +7,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.provider.Settings
-import androidx.activity.invoke
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
@@ -221,7 +220,7 @@ class ImportExportPrefs @Inject constructor(
                     importSharedPreferences(fragmentAct, it)
                 }
             }
-            callForPrefFile.invoke()
+            callForPrefFile.launch(null)
         }
     }
 
@@ -231,7 +230,7 @@ class ImportExportPrefs @Inject constructor(
                 importSharedPreferences(activity, it)
             }
         }
-        callForPrefFile.invoke()
+        callForPrefFile.launch(null)
     }
 
     private fun importSharedPreferences(activity: Activity, importFile: PrefsFile) {

build.gradle

@@ -9,9 +9,9 @@ buildscript {
         rxkotlin_version = '2.4.0'
         room_version = '2.2.5'
         lifecycle_version = '2.2.0'
-        dagger_version = '2.27'
+        dagger_version = '2.28'
-        coroutinesVersion = '1.3.5'
+        coroutinesVersion = '1.3.7'
-        activityVersion = '1.2.0-alpha04'
+        activityVersion = '1.2.0-alpha05'
         ormLiteVersion = "4.46"
     }
     repositories {

core/build.gradle

@@ -62,7 +62,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-crashlytics:17.0.0'
 
     //RxBus
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
     implementation 'org.apache.commons:commons-lang3:3.10'
 
     // Graphview cannot be upgraded

dana/build.gradle

@@ -51,10 +51,9 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
 
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
 
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"

danar/build.gradle

@@ -53,14 +53,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
 
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-
-    // remove after conversion to aapslogger
-    implementation 'org.slf4j:slf4j-api:1.7.30'
-
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
 
@@ -74,7 +68,7 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
 
     //RxBus
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
 
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

danars/build.gradle

@@ -52,11 +52,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
 
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
 
@@ -70,7 +67,7 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
 
     //RxBus
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
 
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

wear/build.gradle

@@ -124,7 +124,7 @@ dependencies {
     implementation('com.github.lecho:hellocharts-library:1.5.8@aar')
 
     testImplementation 'junit:junit:4.13'
-    testImplementation 'org.json:json:20190722'
+    testImplementation 'org.json:json:20200518'
     testImplementation ("org.mockito:mockito-core:2.8.47") {
         exclude group: 'net.bytebuddy', module: 'byte-buddy'
         exclude group: 'net.bytebuddy', module: 'byte-buddy-android'