Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

build.gradle

@@ -25,12 +25,12 @@ buildscript {
         work_version = '2.5.0'
 
         junit_version = '4.13.2'
-        mockitoVersion = '3.11.2'
+        mockitoVersion = '3.12.1'
         powermockVersion = '2.0.9'
         dexmakerVersion = "1.2"
         retrofit2Version = '2.9.0'
         okhttp3Version = '4.9.0'
-        byteBuddyVersion = '1.11.12'
+        byteBuddyVersion = '1.11.13'
 
         androidx_junit = '1.1.2'
         androidx_rules = '1.4.0-alpha04'

database/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
     implementation("io.reactivex.rxjava2:rxkotlin:$rxkotlin_version")
 
-    implementation "com.google.code.gson:gson:2.8.7"
+    implementation "com.google.code.gson:gson:2.8.8"
 
     api "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"

pump-common/build.gradle

@@ -12,7 +12,7 @@ dependencies {
     implementation project(':core')
     //implementation project(':database')
 
-    implementation('com.thoughtworks.xstream:xstream:1.4.17') {
+    implementation('com.thoughtworks.xstream:xstream:1.4.18') {
         exclude group: 'xmlpull', module: 'xmlpull'
     }
 }