From 8380f6545a43fc255da1ffd5df6dc0d3ef871f78 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 25 May 2022 16:49:31 +0200
Subject: [PATCH] upgrade libs

---
 .../main/java/info/nightscout/androidaps/MainApp.kt    |  2 +-
 core/core_dependencies.gradle                          | 10 +++++-----
 .../omnipod/eros/driver/manager/OmnipodManager.java    |  2 +-
 .../omnipod/eros/manager/AapsOmnipodErosManager.java   |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
index 3e45a1da8e..003c52ffe9 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
@@ -13,7 +13,6 @@ import androidx.work.Data
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
-import com.uber.rxdogtag.RxDogTag
 import dagger.android.AndroidInjector
 import dagger.android.DaggerApplication
 import info.nightscout.androidaps.database.AppRepository
@@ -54,6 +53,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.exceptions.UndeliverableException
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.plugins.RxJavaPlugins
+import rxdogtag2.RxDogTag
 import java.io.IOException
 import java.net.SocketException
 import java.util.concurrent.TimeUnit
diff --git a/core/core_dependencies.gradle b/core/core_dependencies.gradle
index c73952cf2b..93596d9473 100644
--- a/core/core_dependencies.gradle
+++ b/core/core_dependencies.gradle
@@ -27,7 +27,7 @@ dependencies {
     api "com.google.dagger:dagger-android-support:$dagger_version"
 
     //Firebase
-    api platform('com.google.firebase:firebase-bom:29.3.0')
+    api platform('com.google.firebase:firebase-bom:30.0.2')
     api "com.google.firebase:firebase-analytics-ktx"
     api "com.google.firebase:firebase-crashlytics-ktx"
     api "com.google.firebase:firebase-messaging-ktx"
@@ -40,7 +40,7 @@ dependencies {
     api "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
     api "org.apache.commons:commons-lang3:$commonslang3_version"
     api "commons-codec:commons-codec:$commonscodec_version"
-    api "com.uber.rxdogtag:rxdogtag:1.0.1"
+    api "com.uber.rxdogtag2:rxdogtag:2.0.1"
 
     //CryptoUtil
     api 'com.madgag.spongycastle:core:1.58.0.0'
@@ -90,12 +90,12 @@ dependencies {
         exclude group: "org.json", module: "json"
     }
 
-    api 'com.google.guava:guava:30.0-jre'
+    api 'com.google.guava:guava:31.1-jre'
 
-    api 'org.mozilla:rhino:1.7.13'
+    api 'org.mozilla:rhino:1.7.14'
 
     api 'com.github.kenglxn.QRGen:android:2.6.0'
-    api 'com.eatthepath:java-otp:0.2.0'
+    api 'com.eatthepath:java-otp:0.3.1'
 
     api "commons-codec:commons-codec:$commonscodec_version"
 
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java
index 7295c5e3d9..fceedb167a 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java
@@ -57,7 +57,7 @@ import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
-import io.reactivex.subjects.SingleSubject;
+import io.reactivex.rxjava3.subjects.SingleSubject;
 
 public class OmnipodManager {
     private static final int ACTION_VERIFICATION_TRIES = 1;
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
index ea3402f356..04fb055951 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
@@ -82,7 +82,7 @@ import info.nightscout.androidaps.utils.T;
 import info.nightscout.androidaps.interfaces.ResourceHelper;
 import info.nightscout.androidaps.utils.rx.AapsSchedulers;
 import info.nightscout.shared.sharedPreferences.SP;
-import io.reactivex.subjects.SingleSubject;
+import io.reactivex.rxjava3.subjects.SingleSubject;
 
 @Singleton
 public class AapsOmnipodErosManager {