diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4fc48738a..502758e0a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     kotlin("android")
     kotlin("kapt")
     id("com.cookpad.android.plugin.license-tools") version "1.2.6"
-    id("com.github.ben-manes.versions") version "0.38.0"
+    id("com.github.ben-manes.versions") version "0.39.0"
     id("com.vanniktech.android.junit.jacoco") version "0.16.0"
     id("dagger.hilt.android.plugin")
 }
@@ -175,12 +175,12 @@ dependencies {
     kapt("androidx.hilt:hilt-compiler:${Versions.hilt_androidx}")
     implementation("androidx.hilt:hilt-work:${Versions.hilt_androidx}")
 
-    implementation("androidx.fragment:fragment-ktx:1.3.2")
+    implementation("androidx.fragment:fragment-ktx:1.3.4")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle}")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifecycle}")
     implementation("androidx.room:room-ktx:${Versions.room}")
     kapt("androidx.room:room-compiler:${Versions.room}")
-    implementation("androidx.appcompat:appcompat:1.3.0-rc01")
+    implementation("androidx.appcompat:appcompat:1.3.0")
     implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
     implementation("androidx.paging:paging-runtime:2.1.2")
     implementation("io.noties.markwon:core:${Versions.markwon}")
@@ -200,9 +200,9 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}")
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4")
     implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}")
-    implementation("com.google.code.gson:gson:2.8.6")
+    implementation("com.google.code.gson:gson:2.8.7")
     implementation("com.google.android.material:material:1.3.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.0-beta01")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.0-beta02")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("androidx.preference:preference:1.1.1")
     implementation("com.jakewharton.timber:timber:4.7.1")
@@ -215,8 +215,8 @@ dependencies {
     }
     implementation("me.leolin:ShortcutBadger:1.1.22@aar")
     implementation("com.google.apis:google-api-services-tasks:v1-rev20210109-1.31.0")
-    implementation("com.google.apis:google-api-services-drive:v3-rev20210419-1.31.0")
-    implementation("com.google.auth:google-auth-library-oauth2-http:0.25.5")
+    implementation("com.google.apis:google-api-services-drive:v3-rev20210524-1.31.0")
+    implementation("com.google.auth:google-auth-library-oauth2-http:0.26.0")
     implementation("androidx.work:work-runtime:${Versions.work}")
     implementation("androidx.work:work-runtime-ktx:${Versions.work}")
     implementation("com.etesync:journalmanager:1.1.1")
@@ -230,7 +230,7 @@ dependencies {
     implementation("androidx.compose.material:material:${Versions.compose}")
     implementation("androidx.compose.runtime:runtime-livedata:${Versions.compose}")
     implementation("com.google.android.material:compose-theme-adapter:${Versions.compose}")
-    implementation("androidx.activity:activity-compose:1.3.0-alpha08")
+    implementation("androidx.activity:activity-compose:1.3.0-beta01")
     releaseCompileOnly("androidx.compose.ui:ui-tooling:${Versions.compose}")
 
     googleplayImplementation("com.google.firebase:firebase-crashlytics:${Versions.crashlytics}")
@@ -253,7 +253,7 @@ dependencies {
     androidTestImplementation("com.squareup.okhttp3:mockwebserver:${Versions.okhttp}")
 
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0")
     testImplementation("com.natpryce:make-it-easy:${Versions.make_it_easy}")
     testImplementation("androidx.test:core:${Versions.androidx_test}")
     testImplementation("org.mockito:mockito-core:${Versions.mockito}")
diff --git a/build.gradle.kts b/build.gradle.kts
index 25a20fbdd..d0bd43bb2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath("com.android.tools.build:gradle:7.0.0-beta03")
-        classpath("com.google.gms:google-services:4.3.5")
+        classpath("com.google.gms:google-services:4.3.8")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
         classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}")
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 6da3bbdaf..15ba1430d 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -5,11 +5,11 @@ object Versions {
     const val work = "2.5.0"
     const val leakcanary = "2.7"
     const val room = "2.3.0"
-    const val crashlytics = "17.4.1"
-    const val analytics = "18.0.3"
-    const val remote_config = "20.0.4"
+    const val crashlytics = "18.0.0"
+    const val analytics = "19.0.0"
+    const val remote_config = "21.0.0"
     const val okhttp = "4.8.1"
-    const val flipper = "0.87.0"
+    const val flipper = "0.92.0"
     const val mockito = "3.9.0"
     const val androidx_test = "1.3.0"
     const val make_it_easy = "4.0.1"
diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index ea37f6d6d..20569394d 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -31,9 +31,9 @@
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1 (*)
 +|    |    +--- androidx.arch.core:core-common:2.1.0 (*)
 +|    |    +--- androidx.arch.core:core-runtime:2.1.0 (*)
-+|    |    +--- androidx.fragment:fragment:1.2.0 -> 1.3.2
++|    |    +--- androidx.fragment:fragment:1.2.0 -> 1.3.4
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02
++|    |    |    +--- androidx.core:core:1.2.0 -> 1.5.0
 +|    |    |    |    +--- androidx.annotation:annotation:1.2.0
 +|    |    |    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.1 (*)
 +|    |    |    |    +--- androidx.versionedparcelable:versionedparcelable:1.1.1
@@ -43,13 +43,13 @@
 +|    |    |    +--- androidx.collection:collection:1.1.0 (*)
 +|    |    |    +--- androidx.viewpager:viewpager:1.0.0
 +|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |    |    \--- androidx.customview:customview:1.0.0
 +|    |    |    |         +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    |    |         \--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |    |         \--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |    +--- androidx.loader:loader:1.0.0
 +|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0
 +|    |    |    |    |    +--- androidx.arch.core:core-runtime:2.1.0 (*)
 +|    |    |    |    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 -> 2.3.1
@@ -59,9 +59,9 @@
 +|    |    |    |    |    \--- androidx.arch.core:core-common:2.1.0 (*)
 +|    |    |    |    \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.3.1
 +|    |    |    |         \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08
++|    |    |    +--- androidx.activity:activity:1.2.2 -> 1.3.0-beta01
 +|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    |    |    |    +--- androidx.lifecycle:lifecycle-runtime:2.3.1 (*)
 +|    |    |    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*)
 +|    |    |    |    +--- androidx.savedstate:savedstate:1.1.0
@@ -116,26 +116,26 @@
 +|    \--- androidx.core:core-ktx:1.3.2
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.5.10 (*)
 +|         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|         \--- androidx.core:core:1.3.2 -> 1.5.0-rc02 (*)
++|         \--- androidx.core:core:1.3.2 -> 1.5.0 (*)
 ++--- com.gitlab.bitfireAT:cert4android:26a91a729f
 +|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-beta03
 +|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-beta03 (*)
 +|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-beta03 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.10 (*)
-+|    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01
++|    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    +--- androidx.core:core:1.5.0-rc01 -> 1.5.0-rc02 (*)
++|    |    +--- androidx.core:core:1.5.0 (*)
 +|    |    +--- androidx.cursoradapter:cursoradapter:1.0.0
 +|    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08 (*)
-+|    |    +--- androidx.fragment:fragment:1.3.2 (*)
-+|    |    +--- androidx.appcompat:appcompat-resources:1.3.0-rc01
++|    |    +--- androidx.activity:activity:1.2.3 -> 1.3.0-beta01 (*)
++|    |    +--- androidx.fragment:fragment:1.3.4 (*)
++|    |    +--- androidx.appcompat:appcompat-resources:1.3.0
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.0.1 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.0.1 -> 1.5.0 (*)
 +|    |    |    +--- androidx.vectordrawable:vectordrawable:1.1.0
 +|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    |    |    |    \--- androidx.collection:collection:1.1.0 (*)
 +|    |    |    \--- androidx.vectordrawable:vectordrawable-animated:1.1.0
 +|    |    |         +--- androidx.vectordrawable:vectordrawable:1.1.0 (*)
@@ -144,7 +144,7 @@
 +|    |    |         \--- androidx.collection:collection:1.1.0 (*)
 +|    |    +--- androidx.drawerlayout:drawerlayout:1.0.0
 +|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |    \--- androidx.customview:customview:1.0.0 (*)
 +|    |    +--- androidx.savedstate:savedstate:1.1.0 (*)
 +|    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
@@ -166,24 +166,24 @@
 +|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
 +|    +--- com.google.android.material:material:1.2.1 -> 1.3.0
 +|    |    +--- androidx.annotation:annotation:1.0.1 -> 1.2.0
-+|    |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-rc01 (*)
++|    |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0 (*)
 +|    |    +--- androidx.cardview:cardview:1.0.0 (*)
 +|    |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    |    |    +--- androidx.customview:customview:1.0.0 (*)
 +|    |    |    \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
-+|    |    +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.1.0-beta01
-+|    |    |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01 (*)
-+|    |    |    +--- androidx.core:core:1.3.2 -> 1.5.0-rc02 (*)
-+|    |    |    \--- androidx.constraintlayout:constraintlayout-core:1.0.0-beta01
-+|    |    +--- androidx.core:core:1.2.0 -> 1.5.0-rc02 (*)
++|    |    +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.1.0-beta02
++|    |    |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0 (*)
++|    |    |    +--- androidx.core:core:1.3.2 -> 1.5.0 (*)
++|    |    |    \--- androidx.constraintlayout:constraintlayout-core:1.0.0-beta02
++|    |    +--- androidx.core:core:1.2.0 -> 1.5.0 (*)
 +|    |    +--- androidx.dynamicanimation:dynamicanimation:1.0.0
-+|    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |    |    \--- androidx.legacy:legacy-support-core-utils:1.0.0
 +|    |    |         +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    |         +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |         +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |         +--- androidx.documentfile:documentfile:1.0.0
 +|    |    |         |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
 +|    |    |         +--- androidx.loader:loader:1.0.0 (*)
@@ -192,23 +192,23 @@
 +|    |    |         \--- androidx.print:print:1.0.0
 +|    |    |              \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
 +|    |    +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0
-+|    |    +--- androidx.fragment:fragment:1.0.0 -> 1.3.2 (*)
++|    |    +--- androidx.fragment:fragment:1.0.0 -> 1.3.4 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.1 (*)
 +|    |    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    |    |    +--- androidx.customview:customview:1.0.0 (*)
 +|    |    |    \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |    +--- androidx.transition:transition:1.2.0
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.0.1 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.0.1 -> 1.5.0 (*)
 +|    |    |    \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |    +--- androidx.vectordrawable:vectordrawable:1.1.0 (*)
 +|    |    \--- androidx.viewpager2:viewpager2:1.0.0
 +|    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |         +--- androidx.fragment:fragment:1.1.0 -> 1.3.2 (*)
++|    |         +--- androidx.fragment:fragment:1.1.0 -> 1.3.4 (*)
 +|    |         +--- androidx.recyclerview:recyclerview:1.1.0 (*)
-+|    |         +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |         +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    |         \--- androidx.collection:collection:1.1.0 (*)
 +|    \--- org.conscrypt:conscrypt-android:2.5.1
 ++--- com.github.dmfs.opentasks:opentasks-provider:1.2.4
@@ -223,9 +223,9 @@
 +|    +--- com.google.dagger:hilt-core:2.36
 +|    |    +--- com.google.dagger:dagger:2.36 (*)
 +|    |    \--- javax.inject:javax.inject:1
-+|    +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08 (*)
++|    +--- androidx.activity:activity:1.2.2 -> 1.3.0-beta01 (*)
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- androidx.fragment:fragment:1.3.2 (*)
++|    +--- androidx.fragment:fragment:1.3.2 -> 1.3.4 (*)
 +|    +--- androidx.lifecycle:lifecycle-common:2.3.1 (*)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1 (*)
@@ -250,20 +250,20 @@
 +|    |    |    \--- androidx.annotation:annotation-experimental:1.1.0
 +|    |    +--- androidx.sqlite:sqlite:2.1.0 (*)
 +|    |    +--- androidx.sqlite:sqlite-framework:2.1.0 (*)
-+|    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    |    \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*)
 +|    \--- com.google.dagger:hilt-android:2.35 -> 2.36 (*)
-++--- androidx.fragment:fragment-ktx:1.3.2
-+|    +--- androidx.fragment:fragment:1.3.2 (*)
-+|    +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-alpha08
-+|    |    +--- androidx.activity:activity:1.3.0-alpha08 (*)
+++--- androidx.fragment:fragment-ktx:1.3.4
++|    +--- androidx.fragment:fragment:1.3.4 (*)
++|    +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-beta01
++|    |    +--- androidx.activity:activity:1.3.0-beta01 (*)
 +|    |    +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.1 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1 (*)
 +|    |    +--- androidx.savedstate:savedstate-ktx:1.1.0
 +|    |    |    +--- androidx.savedstate:savedstate:1.1.0 (*)
 +|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.5.10 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
 +|    +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*)
 +|    +--- androidx.collection:collection-ktx:1.1.0
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.5.10 (*)
@@ -279,7 +279,7 @@
 +|    +--- androidx.room:room-runtime:2.3.0 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.5.10 (*)
 +|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
-++--- androidx.appcompat:appcompat:1.3.0-rc01 (*)
+++--- androidx.appcompat:appcompat:1.3.0 (*)
 ++--- io.reactivex.rxjava2:rxandroid:2.1.1
 +|    \--- io.reactivex.rxjava2:rxjava:2.2.6
 +|         \--- org.reactivestreams:reactive-streams:1.0.2
@@ -317,17 +317,17 @@
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.5.10 (*)
 +|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.5.10
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.5.10 (*)
-++--- com.google.code.gson:gson:2.8.6
+++--- com.google.code.gson:gson:2.8.7
 ++--- com.google.android.material:material:1.3.0 (*)
-++--- androidx.constraintlayout:constraintlayout:2.1.0-beta01 (*)
+++--- androidx.constraintlayout:constraintlayout:2.1.0-beta02 (*)
 ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    \--- androidx.interpolator:interpolator:1.0.0 (*)
 ++--- androidx.preference:preference:1.1.1
-+|    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-rc01 (*)
-+|    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
-+|    +--- androidx.fragment:fragment:1.2.4 -> 1.3.2 (*)
++|    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0 (*)
++|    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
++|    +--- androidx.fragment:fragment:1.2.4 -> 1.3.4 (*)
 +|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*)
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
@@ -338,9 +338,9 @@
 ++--- com.rubiconproject.oss:jchronic:0.2.6
 ++--- me.leolin:ShortcutBadger:1.1.22
 ++--- com.google.apis:google-api-services-tasks:v1-rev20210109-1.31.0
-+|    \--- com.google.api-client:google-api-client:1.31.1
-+|         +--- com.google.oauth-client:google-oauth-client:1.31.2
-+|         |    +--- com.google.http-client:google-http-client:1.38.0 -> 1.39.2
++|    \--- com.google.api-client:google-api-client:1.31.1 -> 1.31.5
++|         +--- com.google.oauth-client:google-oauth-client:1.31.5
++|         |    +--- com.google.http-client:google-http-client:1.39.2
 +|         |    |    +--- com.google.guava:guava:30.1.1-android
 +|         |    |    |    +--- com.google.guava:failureaccess:1.0.1
 +|         |    |    |    \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
@@ -349,17 +349,19 @@
 +|         |    |    \--- io.opencensus:opencensus-contrib-http-util:0.28.0
 +|         |    |         +--- io.opencensus:opencensus-api:0.28.0 (*)
 +|         |    |         \--- com.google.guava:guava:29.0-android -> 30.1.1-android (*)
-+|         |    \--- com.google.guava:guava:30.0-android -> 30.1.1-android (*)
-+|         \--- com.google.guava:guava:29.0-android -> 30.1.1-android (*)
-++--- com.google.apis:google-api-services-drive:v3-rev20210419-1.31.0
-+|    \--- com.google.api-client:google-api-client:1.31.1 (*)
-++--- com.google.auth:google-auth-library-oauth2-http:0.25.5
++|         |    \--- com.google.guava:guava:30.1-android -> 30.1.1-android (*)
++|         +--- com.google.http-client:google-http-client-gson:1.39.2
++|         |    +--- com.google.http-client:google-http-client:1.39.2 (*)
++|         |    \--- com.google.code.gson:gson:2.8.6 -> 2.8.7
++|         +--- com.google.guava:guava:30.1.1-android (*)
++|         \--- com.google.http-client:google-http-client:1.39.2 (*)
+++--- com.google.apis:google-api-services-drive:v3-rev20210524-1.31.0
++|    \--- com.google.api-client:google-api-client:1.31.5 (*)
+++--- com.google.auth:google-auth-library-oauth2-http:0.26.0
 +|    +--- com.google.auto.value:auto-value-annotations:1.8.1
-+|    +--- com.google.auth:google-auth-library-credentials:0.25.5
++|    +--- com.google.auth:google-auth-library-credentials:0.26.0
 +|    +--- com.google.http-client:google-http-client:1.39.2 (*)
-+|    +--- com.google.http-client:google-http-client-gson:1.39.2
-+|    |    +--- com.google.http-client:google-http-client:1.39.2 (*)
-+|    |    \--- com.google.code.gson:gson:2.8.6
++|    +--- com.google.http-client:google-http-client-gson:1.39.2 (*)
 +|    \--- com.google.guava:guava:30.1.1-android (*)
 ++--- androidx.work:work-runtime:2.5.0 (*)
 ++--- androidx.work:work-runtime-ktx:2.5.0
@@ -373,7 +375,7 @@
 +|    |    \--- com.madgag.spongycastle:core:1.54.0.0
 +|    +--- com.squareup.okhttp3:logging-interceptor:3.12.1
 +|    |    \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.8.1 (*)
-+|    +--- com.google.code.gson:gson:1.7.2 -> 2.8.6
++|    +--- com.google.code.gson:gson:1.7.2 -> 2.8.7
 +|    +--- org.apache.commons:commons-collections4:4.1
 +|    +--- org.apache.commons:commons-lang3:3.8.1
 +|    \--- commons-codec:commons-codec:1.7 -> 1.11
@@ -381,7 +383,7 @@
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    \--- com.squareup.okhttp3:logging-interceptor:3.12.1 (*)
 ++--- com.github.QuadFlask:colorpicker:0.0.15
-+|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-rc01 (*)
++|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0 (*)
 ++--- net.openid:appauth:0.8.1
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    \--- androidx.browser:browser:1.3.0
@@ -390,7 +392,7 @@
 +|         |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         +--- androidx.interpolator:interpolator:1.0.0 (*)
-+|         +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|         +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 ++--- org.osmdroid:osmdroid-android:6.1.10
@@ -436,7 +438,7 @@
 +|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
 +|    |    +--- androidx.collection:collection:1.1.0 (*)
-+|    |    \--- androidx.core:core:1.5.0-rc02 (*)
++|    |    \--- androidx.core:core:1.5.0-rc02 -> 1.5.0 (*)
 +|    +--- androidx.compose.ui:ui-unit:1.0.0-beta08 (*)
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10
@@ -445,7 +447,7 @@
 +|    +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
 +|    +--- androidx.autofill:autofill:1.0.0
-+|    |    \--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |    \--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3 (*)
 +|    +--- androidx.savedstate:savedstate:1.1.0 (*)
 +|    +--- androidx.lifecycle:lifecycle-runtime:2.3.0 -> 2.3.1 (*)
@@ -497,15 +499,15 @@
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
 +|    \--- androidx.compose.ui:ui:1.0.0-beta08 (*)
 ++--- com.google.android.material:compose-theme-adapter:1.0.0-beta08
-+|    +--- androidx.appcompat:appcompat:1.3.0-beta01 -> 1.3.0-rc01 (*)
++|    +--- androidx.appcompat:appcompat:1.3.0-beta01 -> 1.3.0 (*)
 +|    +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*)
 +|    +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*)
 +|    +--- androidx.compose.material:material:1.0.0-beta08 (*)
 +|    +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
-+\--- androidx.activity:activity-compose:1.3.0-alpha08
-+     +--- androidx.compose.runtime:runtime:1.0.0-beta07 -> 1.0.0-beta08 (*)
-+     +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta07 -> 1.0.0-beta08 (*)
-+     +--- androidx.activity:activity-ktx:1.3.0-alpha08 (*)
-+     +--- androidx.compose.ui:ui:1.0.0-beta07 -> 1.0.0-beta08 (*)
-+     \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.5.10 (*)
++\--- androidx.activity:activity-compose:1.3.0-beta01
++     +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*)
++     +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta08 (*)
++     +--- androidx.activity:activity-ktx:1.3.0-beta01 (*)
++     +--- androidx.compose.ui:ui:1.0.0-beta08 (*)
++     \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 7026032d4..f25080a25 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -31,9 +31,9 @@
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1 (*)
 +|    |    +--- androidx.arch.core:core-common:2.1.0 (*)
 +|    |    +--- androidx.arch.core:core-runtime:2.1.0 (*)
-+|    |    +--- androidx.fragment:fragment:1.2.0 -> 1.3.2
++|    |    +--- androidx.fragment:fragment:1.2.0 -> 1.3.4
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02
++|    |    |    +--- androidx.core:core:1.2.0 -> 1.5.0
 +|    |    |    |    +--- androidx.annotation:annotation:1.2.0
 +|    |    |    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.1 (*)
 +|    |    |    |    +--- androidx.versionedparcelable:versionedparcelable:1.1.1
@@ -43,13 +43,13 @@
 +|    |    |    +--- androidx.collection:collection:1.1.0 (*)
 +|    |    |    +--- androidx.viewpager:viewpager:1.0.0
 +|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |    |    \--- androidx.customview:customview:1.0.0
 +|    |    |    |         +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    |    |         \--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |    |         \--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |    +--- androidx.loader:loader:1.0.0
 +|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0
 +|    |    |    |    |    +--- androidx.arch.core:core-runtime:2.1.0 (*)
 +|    |    |    |    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 -> 2.3.1
@@ -59,9 +59,9 @@
 +|    |    |    |    |    \--- androidx.arch.core:core-common:2.1.0 (*)
 +|    |    |    |    \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.3.1
 +|    |    |    |         \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08
++|    |    |    +--- androidx.activity:activity:1.2.2 -> 1.3.0-beta01
 +|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    |    |    |    +--- androidx.lifecycle:lifecycle-runtime:2.3.1 (*)
 +|    |    |    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*)
 +|    |    |    |    +--- androidx.savedstate:savedstate:1.1.0
@@ -98,52 +98,54 @@
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
 +|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.10
 +|              \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
-++--- com.google.firebase:firebase-crashlytics:17.4.1
-+|    +--- com.google.android.datatransport:transport-api:2.2.1
+++--- com.google.firebase:firebase-crashlytics:18.0.0
++|    +--- com.google.android.datatransport:transport-api:3.0.0
 +|    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- com.google.android.datatransport:transport-backend-cct:2.3.3
++|    +--- com.google.android.datatransport:transport-backend-cct:3.0.0
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    +--- com.google.android.datatransport:transport-api:2.2.1 (*)
-+|    |    +--- com.google.android.datatransport:transport-runtime:2.2.5 -> 2.2.6
++|    |    +--- com.google.android.datatransport:transport-api:3.0.0 (*)
++|    |    +--- com.google.android.datatransport:transport-runtime:3.0.0
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- com.google.android.datatransport:transport-api:2.2.1 (*)
++|    |    |    +--- com.google.android.datatransport:transport-api:3.0.0 (*)
 +|    |    |    \--- javax.inject:javax.inject:1
-+|    |    +--- com.google.firebase:firebase-encoders:16.1.0
++|    |    +--- com.google.firebase:firebase-encoders:17.0.0
 +|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    \--- com.google.firebase:firebase-encoders-json:17.1.0
++|    |    \--- com.google.firebase:firebase-encoders-json:18.0.0
 +|    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |         \--- com.google.firebase:firebase-encoders:16.1.0 (*)
-+|    +--- com.google.android.datatransport:transport-runtime:2.2.6 (*)
++|    |         \--- com.google.firebase:firebase-encoders:17.0.0 (*)
++|    +--- com.google.android.datatransport:transport-runtime:3.0.0 (*)
 +|    +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0
 +|    |    \--- com.google.android.gms:play-services-basement:17.4.0 -> 17.5.0
 +|    |         +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
-+|    |         +--- androidx.core:core:1.2.0 -> 1.5.0-rc02 (*)
-+|    |         \--- androidx.fragment:fragment:1.0.0 -> 1.3.2 (*)
-+|    +--- com.google.firebase:firebase-common:19.5.0
++|    |         +--- androidx.core:core:1.2.0 -> 1.5.0 (*)
++|    |         \--- androidx.fragment:fragment:1.0.0 -> 1.3.4 (*)
++|    +--- com.google.firebase:firebase-annotations:16.0.0
++|    +--- com.google.firebase:firebase-common:20.0.0
 +|    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
 +|    |    +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0 (*)
-+|    |    \--- com.google.firebase:firebase-components:16.1.0
++|    |    \--- com.google.firebase:firebase-components:17.0.0
 +|    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    |         \--- com.google.firebase:firebase-annotations:16.0.0
-+|    +--- com.google.firebase:firebase-components:16.1.0 (*)
-+|    +--- com.google.firebase:firebase-encoders:16.1.0 (*)
-+|    +--- com.google.firebase:firebase-encoders-json:17.1.0 (*)
-+|    +--- com.google.firebase:firebase-installations:16.3.5
++|    +--- com.google.firebase:firebase-components:17.0.0 (*)
++|    +--- com.google.firebase:firebase-encoders:17.0.0 (*)
++|    +--- com.google.firebase:firebase-encoders-json:18.0.0 (*)
++|    +--- com.google.firebase:firebase-installations:17.0.0
 +|    |    +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0 (*)
-+|    |    +--- com.google.firebase:firebase-common:19.5.0 (*)
-+|    |    +--- com.google.firebase:firebase-components:16.1.0 (*)
-+|    |    \--- com.google.firebase:firebase-installations-interop:16.0.1
++|    |    +--- com.google.firebase:firebase-common:20.0.0 (*)
++|    |    +--- com.google.firebase:firebase-components:17.0.0 (*)
++|    |    \--- com.google.firebase:firebase-installations-interop:17.0.0
 +|    |         +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0 (*)
 +|    |         \--- com.google.firebase:firebase-annotations:16.0.0
-+|    +--- com.google.firebase:firebase-installations-interop:16.0.1 (*)
-+|    \--- com.google.firebase:firebase-measurement-connector:18.0.0
-+|         \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
-++--- com.google.firebase:firebase-analytics:18.0.3
-+|    +--- com.google.android.gms:play-services-measurement:18.0.3
++|    +--- com.google.firebase:firebase-installations-interop:17.0.0 (*)
++|    \--- com.google.firebase:firebase-measurement-connector:18.0.2 -> 19.0.0
++|         +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
++|         \--- com.google.firebase:firebase-annotations:16.0.0
+++--- com.google.firebase:firebase-analytics:19.0.0
++|    +--- com.google.android.gms:play-services-measurement:19.0.0
 +|    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |    +--- androidx.legacy:legacy-support-core-utils:1.0.0
 +|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |    +--- androidx.documentfile:documentfile:1.0.0
 +|    |    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
 +|    |    |    +--- androidx.loader:loader:1.0.0 (*)
@@ -152,64 +154,64 @@
 +|    |    |    \--- androidx.print:print:1.0.0
 +|    |    |         \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
 +|    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
-+|    |    +--- com.google.android.gms:play-services-measurement-base:18.0.3
++|    |    +--- com.google.android.gms:play-services-measurement-base:19.0.0
 +|    |    |    \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
-+|    |    +--- com.google.android.gms:play-services-measurement-impl:18.0.3
++|    |    +--- com.google.android.gms:play-services-measurement-impl:19.0.0
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
-+|    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
-+|    |    |    +--- com.google.android.gms:play-services-measurement-base:18.0.3 (*)
++|    |    |    +--- com.google.android.gms:play-services-measurement-base:19.0.0 (*)
 +|    |    |    \--- com.google.android.gms:play-services-stats:17.0.0
 +|    |    |         +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
 +|    |    |         \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
 +|    |    \--- com.google.android.gms:play-services-stats:17.0.0 (*)
-+|    +--- com.google.android.gms:play-services-measurement-api:18.0.3
++|    +--- com.google.android.gms:play-services-measurement-api:19.0.0
 +|    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
-+|    |    +--- com.google.android.gms:play-services-measurement-base:18.0.3 (*)
-+|    |    +--- com.google.android.gms:play-services-measurement-sdk-api:18.0.3
++|    |    +--- com.google.android.gms:play-services-measurement-base:19.0.0 (*)
++|    |    +--- com.google.android.gms:play-services-measurement-sdk-api:19.0.0
 +|    |    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
-+|    |    |    \--- com.google.android.gms:play-services-measurement-base:18.0.3 (*)
++|    |    |    \--- com.google.android.gms:play-services-measurement-base:19.0.0 (*)
 +|    |    +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0 (*)
-+|    |    +--- com.google.firebase:firebase-common:19.3.0 -> 19.5.0 (*)
-+|    |    +--- com.google.firebase:firebase-components:16.0.0 -> 16.1.0 (*)
-+|    |    +--- com.google.firebase:firebase-installations:16.3.2 -> 16.3.5 (*)
-+|    |    +--- com.google.firebase:firebase-installations-interop:16.0.0 -> 16.0.1 (*)
-+|    |    \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*)
-+|    \--- com.google.android.gms:play-services-measurement-sdk:18.0.3
++|    |    +--- com.google.firebase:firebase-common:20.0.0 (*)
++|    |    +--- com.google.firebase:firebase-components:17.0.0 (*)
++|    |    +--- com.google.firebase:firebase-installations:17.0.0 (*)
++|    |    +--- com.google.firebase:firebase-installations-interop:17.0.0 (*)
++|    |    \--- com.google.firebase:firebase-measurement-connector:19.0.0 (*)
++|    \--- com.google.android.gms:play-services-measurement-sdk:19.0.0
 +|         +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|         +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
-+|         +--- com.google.android.gms:play-services-measurement-base:18.0.3 (*)
-+|         \--- com.google.android.gms:play-services-measurement-impl:18.0.3 (*)
-++--- com.google.firebase:firebase-config-ktx:20.0.4
++|         +--- com.google.android.gms:play-services-measurement-base:19.0.0 (*)
++|         \--- com.google.android.gms:play-services-measurement-impl:19.0.0 (*)
+++--- com.google.firebase:firebase-config-ktx:21.0.0
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- com.google.firebase:firebase-abt:20.0.0
++|    +--- com.google.firebase:firebase-abt:21.0.0
 +|    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
-+|    |    +--- com.google.firebase:firebase-common:19.3.1 -> 19.5.0 (*)
-+|    |    +--- com.google.firebase:firebase-components:16.0.0 -> 16.1.0 (*)
-+|    |    \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*)
-+|    +--- com.google.firebase:firebase-common:19.5.0 (*)
-+|    +--- com.google.firebase:firebase-common-ktx:19.5.0
++|    |    +--- com.google.firebase:firebase-common:20.0.0 (*)
++|    |    +--- com.google.firebase:firebase-components:17.0.0 (*)
++|    |    \--- com.google.firebase:firebase-measurement-connector:18.0.0 -> 19.0.0 (*)
++|    +--- com.google.firebase:firebase-common:20.0.0 (*)
++|    +--- com.google.firebase:firebase-common-ktx:20.0.0
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    +--- com.google.firebase:firebase-common:19.5.0 (*)
-+|    |    +--- com.google.firebase:firebase-components:16.1.0 (*)
++|    |    +--- com.google.firebase:firebase-common:20.0.0 (*)
++|    |    +--- com.google.firebase:firebase-components:17.0.0 (*)
 +|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.10 (*)
-+|    +--- com.google.firebase:firebase-components:16.1.0 (*)
-+|    +--- com.google.firebase:firebase-config:20.0.4
++|    +--- com.google.firebase:firebase-components:17.0.0 (*)
++|    +--- com.google.firebase:firebase-config:21.0.0
 +|    |    +--- com.google.android.gms:play-services-tasks:17.0.2 -> 17.2.0 (*)
-+|    |    +--- com.google.firebase:firebase-abt:20.0.0 (*)
-+|    |    +--- com.google.firebase:firebase-common:19.5.0 (*)
-+|    |    +--- com.google.firebase:firebase-components:16.1.0 (*)
-+|    |    +--- com.google.firebase:firebase-installations:16.3.5 (*)
-+|    |    +--- com.google.firebase:firebase-installations-interop:16.0.1 (*)
-+|    |    \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*)
-+|    +--- com.google.firebase:firebase-installations:16.3.5 (*)
-+|    +--- com.google.firebase:firebase-installations-interop:16.0.1 (*)
++|    |    +--- com.google.firebase:firebase-abt:21.0.0 (*)
++|    |    +--- com.google.firebase:firebase-common:20.0.0 (*)
++|    |    +--- com.google.firebase:firebase-components:17.0.0 (*)
++|    |    +--- com.google.firebase:firebase-installations:17.0.0 (*)
++|    |    +--- com.google.firebase:firebase-installations-interop:17.0.0 (*)
++|    |    \--- com.google.firebase:firebase-measurement-connector:18.0.0 -> 19.0.0 (*)
++|    +--- com.google.firebase:firebase-installations:17.0.0 (*)
++|    +--- com.google.firebase:firebase-installations-interop:17.0.0 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.10 (*)
 ++--- com.google.android.gms:play-services-location:18.0.0
 +|    +--- com.google.android.gms:play-services-base:17.5.0
 +|    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
-+|    |    +--- androidx.core:core:1.2.0 -> 1.5.0-rc02 (*)
-+|    |    +--- androidx.fragment:fragment:1.0.0 -> 1.3.2 (*)
++|    |    +--- androidx.core:core:1.2.0 -> 1.5.0 (*)
++|    |    +--- androidx.fragment:fragment:1.0.0 -> 1.3.4 (*)
 +|    |    +--- com.google.android.gms:play-services-basement:17.5.0 (*)
 +|    |    \--- com.google.android.gms:play-services-tasks:17.2.0 (*)
 +|    +--- com.google.android.gms:play-services-basement:17.5.0 (*)
@@ -217,7 +219,7 @@
 +|    |    \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
 +|    \--- com.google.android.gms:play-services-tasks:17.1.0 -> 17.2.0 (*)
 ++--- com.google.android.gms:play-services-maps:17.0.1
-+|    +--- androidx.fragment:fragment:1.0.0 -> 1.3.2 (*)
++|    +--- androidx.fragment:fragment:1.0.0 -> 1.3.4 (*)
 +|    +--- com.google.android.gms:play-services-base:17.0.0 -> 17.5.0 (*)
 +|    \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
 ++--- com.android.billingclient:billing-ktx:3.0.3
@@ -242,26 +244,26 @@
 +|    \--- androidx.core:core-ktx:1.3.2
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.5.10 (*)
 +|         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|         \--- androidx.core:core:1.3.2 -> 1.5.0-rc02 (*)
++|         \--- androidx.core:core:1.3.2 -> 1.5.0 (*)
 ++--- com.gitlab.bitfireAT:cert4android:26a91a729f
 +|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-beta03
 +|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-beta03 (*)
 +|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-beta03 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.10 (*)
-+|    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01
++|    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    +--- androidx.core:core:1.5.0-rc01 -> 1.5.0-rc02 (*)
++|    |    +--- androidx.core:core:1.5.0 (*)
 +|    |    +--- androidx.cursoradapter:cursoradapter:1.0.0
 +|    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08 (*)
-+|    |    +--- androidx.fragment:fragment:1.3.2 (*)
-+|    |    +--- androidx.appcompat:appcompat-resources:1.3.0-rc01
++|    |    +--- androidx.activity:activity:1.2.3 -> 1.3.0-beta01 (*)
++|    |    +--- androidx.fragment:fragment:1.3.4 (*)
++|    |    +--- androidx.appcompat:appcompat-resources:1.3.0
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.0.1 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.0.1 -> 1.5.0 (*)
 +|    |    |    +--- androidx.vectordrawable:vectordrawable:1.1.0
 +|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    |    |    |    \--- androidx.collection:collection:1.1.0 (*)
 +|    |    |    \--- androidx.vectordrawable:vectordrawable-animated:1.1.0
 +|    |    |         +--- androidx.vectordrawable:vectordrawable:1.1.0 (*)
@@ -270,7 +272,7 @@
 +|    |    |         \--- androidx.collection:collection:1.1.0 (*)
 +|    |    +--- androidx.drawerlayout:drawerlayout:1.0.0
 +|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |    \--- androidx.customview:customview:1.0.0 (*)
 +|    |    +--- androidx.savedstate:savedstate:1.1.0 (*)
 +|    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
@@ -292,40 +294,40 @@
 +|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
 +|    +--- com.google.android.material:material:1.2.1 -> 1.3.0
 +|    |    +--- androidx.annotation:annotation:1.0.1 -> 1.2.0
-+|    |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-rc01 (*)
++|    |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0 (*)
 +|    |    +--- androidx.cardview:cardview:1.0.0 (*)
 +|    |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    |    |    +--- androidx.customview:customview:1.0.0 (*)
 +|    |    |    \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
-+|    |    +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.1.0-beta01
-+|    |    |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01 (*)
-+|    |    |    +--- androidx.core:core:1.3.2 -> 1.5.0-rc02 (*)
-+|    |    |    \--- androidx.constraintlayout:constraintlayout-core:1.0.0-beta01
-+|    |    +--- androidx.core:core:1.2.0 -> 1.5.0-rc02 (*)
++|    |    +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.1.0-beta02
++|    |    |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0 (*)
++|    |    |    +--- androidx.core:core:1.3.2 -> 1.5.0 (*)
++|    |    |    \--- androidx.constraintlayout:constraintlayout-core:1.0.0-beta02
++|    |    +--- androidx.core:core:1.2.0 -> 1.5.0 (*)
 +|    |    +--- androidx.dynamicanimation:dynamicanimation:1.0.0
-+|    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |    |    \--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
 +|    |    +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0
-+|    |    +--- androidx.fragment:fragment:1.0.0 -> 1.3.2 (*)
++|    |    +--- androidx.fragment:fragment:1.0.0 -> 1.3.4 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.1 (*)
 +|    |    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    |    |    +--- androidx.customview:customview:1.0.0 (*)
 +|    |    |    \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |    +--- androidx.transition:transition:1.2.0
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.core:core:1.0.1 -> 1.5.0-rc02 (*)
++|    |    |    +--- androidx.core:core:1.0.1 -> 1.5.0 (*)
 +|    |    |    \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |    +--- androidx.vectordrawable:vectordrawable:1.1.0 (*)
 +|    |    \--- androidx.viewpager2:viewpager2:1.0.0
 +|    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |         +--- androidx.fragment:fragment:1.1.0 -> 1.3.2 (*)
++|    |         +--- androidx.fragment:fragment:1.1.0 -> 1.3.4 (*)
 +|    |         +--- androidx.recyclerview:recyclerview:1.1.0 (*)
-+|    |         +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |         +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    |         \--- androidx.collection:collection:1.1.0 (*)
 +|    \--- org.conscrypt:conscrypt-android:2.5.1
 ++--- com.github.dmfs.opentasks:opentasks-provider:1.2.4
@@ -340,9 +342,9 @@
 +|    +--- com.google.dagger:hilt-core:2.36
 +|    |    +--- com.google.dagger:dagger:2.36 (*)
 +|    |    \--- javax.inject:javax.inject:1
-+|    +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08 (*)
++|    +--- androidx.activity:activity:1.2.2 -> 1.3.0-beta01 (*)
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- androidx.fragment:fragment:1.3.2 (*)
++|    +--- androidx.fragment:fragment:1.3.2 -> 1.3.4 (*)
 +|    +--- androidx.lifecycle:lifecycle-common:2.3.1 (*)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1 (*)
@@ -367,20 +369,20 @@
 +|    |    |    \--- androidx.annotation:annotation-experimental:1.1.0
 +|    |    +--- androidx.sqlite:sqlite:2.1.0 (*)
 +|    |    +--- androidx.sqlite:sqlite-framework:2.1.0 (*)
-+|    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    |    \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*)
 +|    \--- com.google.dagger:hilt-android:2.35 -> 2.36 (*)
-++--- androidx.fragment:fragment-ktx:1.3.2
-+|    +--- androidx.fragment:fragment:1.3.2 (*)
-+|    +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-alpha08
-+|    |    +--- androidx.activity:activity:1.3.0-alpha08 (*)
+++--- androidx.fragment:fragment-ktx:1.3.4
++|    +--- androidx.fragment:fragment:1.3.4 (*)
++|    +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-beta01
++|    |    +--- androidx.activity:activity:1.3.0-beta01 (*)
 +|    |    +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.1 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1 (*)
 +|    |    +--- androidx.savedstate:savedstate-ktx:1.1.0
 +|    |    |    +--- androidx.savedstate:savedstate:1.1.0 (*)
 +|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.5.10 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
 +|    +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*)
 +|    +--- androidx.collection:collection-ktx:1.1.0
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.5.10 (*)
@@ -396,7 +398,7 @@
 +|    +--- androidx.room:room-runtime:2.3.0 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.5.10 (*)
 +|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
-++--- androidx.appcompat:appcompat:1.3.0-rc01 (*)
+++--- androidx.appcompat:appcompat:1.3.0 (*)
 ++--- io.reactivex.rxjava2:rxandroid:2.1.1
 +|    \--- io.reactivex.rxjava2:rxjava:2.2.6
 +|         \--- org.reactivestreams:reactive-streams:1.0.2
@@ -434,17 +436,17 @@
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.5.10 (*)
 +|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.5.10
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.5.10 (*)
-++--- com.google.code.gson:gson:2.8.6
+++--- com.google.code.gson:gson:2.8.7
 ++--- com.google.android.material:material:1.3.0 (*)
-++--- androidx.constraintlayout:constraintlayout:2.1.0-beta01 (*)
+++--- androidx.constraintlayout:constraintlayout:2.1.0-beta02 (*)
 ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    \--- androidx.interpolator:interpolator:1.0.0 (*)
 ++--- androidx.preference:preference:1.1.1
-+|    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-rc01 (*)
-+|    +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
-+|    +--- androidx.fragment:fragment:1.2.4 -> 1.3.2 (*)
++|    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0 (*)
++|    +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
++|    +--- androidx.fragment:fragment:1.2.4 -> 1.3.4 (*)
 +|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*)
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
@@ -455,9 +457,9 @@
 ++--- com.rubiconproject.oss:jchronic:0.2.6
 ++--- me.leolin:ShortcutBadger:1.1.22
 ++--- com.google.apis:google-api-services-tasks:v1-rev20210109-1.31.0
-+|    \--- com.google.api-client:google-api-client:1.31.1
-+|         +--- com.google.oauth-client:google-oauth-client:1.31.2
-+|         |    +--- com.google.http-client:google-http-client:1.38.0 -> 1.39.2
++|    \--- com.google.api-client:google-api-client:1.31.1 -> 1.31.5
++|         +--- com.google.oauth-client:google-oauth-client:1.31.5
++|         |    +--- com.google.http-client:google-http-client:1.39.2
 +|         |    |    +--- com.google.guava:guava:30.1.1-android
 +|         |    |    |    +--- com.google.guava:failureaccess:1.0.1
 +|         |    |    |    \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
@@ -466,17 +468,19 @@
 +|         |    |    \--- io.opencensus:opencensus-contrib-http-util:0.28.0
 +|         |    |         +--- io.opencensus:opencensus-api:0.28.0 (*)
 +|         |    |         \--- com.google.guava:guava:29.0-android -> 30.1.1-android (*)
-+|         |    \--- com.google.guava:guava:30.0-android -> 30.1.1-android (*)
-+|         \--- com.google.guava:guava:29.0-android -> 30.1.1-android (*)
-++--- com.google.apis:google-api-services-drive:v3-rev20210419-1.31.0
-+|    \--- com.google.api-client:google-api-client:1.31.1 (*)
-++--- com.google.auth:google-auth-library-oauth2-http:0.25.5
++|         |    \--- com.google.guava:guava:30.1-android -> 30.1.1-android (*)
++|         +--- com.google.http-client:google-http-client-gson:1.39.2
++|         |    +--- com.google.http-client:google-http-client:1.39.2 (*)
++|         |    \--- com.google.code.gson:gson:2.8.6 -> 2.8.7
++|         +--- com.google.guava:guava:30.1.1-android (*)
++|         \--- com.google.http-client:google-http-client:1.39.2 (*)
+++--- com.google.apis:google-api-services-drive:v3-rev20210524-1.31.0
++|    \--- com.google.api-client:google-api-client:1.31.5 (*)
+++--- com.google.auth:google-auth-library-oauth2-http:0.26.0
 +|    +--- com.google.auto.value:auto-value-annotations:1.8.1
-+|    +--- com.google.auth:google-auth-library-credentials:0.25.5
++|    +--- com.google.auth:google-auth-library-credentials:0.26.0
 +|    +--- com.google.http-client:google-http-client:1.39.2 (*)
-+|    +--- com.google.http-client:google-http-client-gson:1.39.2
-+|    |    +--- com.google.http-client:google-http-client:1.39.2 (*)
-+|    |    \--- com.google.code.gson:gson:2.8.6
++|    +--- com.google.http-client:google-http-client-gson:1.39.2 (*)
 +|    \--- com.google.guava:guava:30.1.1-android (*)
 ++--- androidx.work:work-runtime:2.5.0 (*)
 ++--- androidx.work:work-runtime-ktx:2.5.0
@@ -490,7 +494,7 @@
 +|    |    \--- com.madgag.spongycastle:core:1.54.0.0
 +|    +--- com.squareup.okhttp3:logging-interceptor:3.12.1
 +|    |    \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.8.1 (*)
-+|    +--- com.google.code.gson:gson:1.7.2 -> 2.8.6
++|    +--- com.google.code.gson:gson:1.7.2 -> 2.8.7
 +|    +--- org.apache.commons:commons-collections4:4.1
 +|    +--- org.apache.commons:commons-lang3:3.8.1
 +|    \--- commons-codec:commons-codec:1.7 -> 1.11
@@ -498,7 +502,7 @@
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    \--- com.squareup.okhttp3:logging-interceptor:3.12.1 (*)
 ++--- com.github.QuadFlask:colorpicker:0.0.15
-+|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-rc01 (*)
++|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0 (*)
 ++--- net.openid:appauth:0.8.1
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    \--- androidx.browser:browser:1.3.0
@@ -507,7 +511,7 @@
 +|         |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         +--- androidx.interpolator:interpolator:1.0.0 (*)
-+|         +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|         +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 ++--- org.osmdroid:osmdroid-android:6.1.10
@@ -553,7 +557,7 @@
 +|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
 +|    |    +--- androidx.collection:collection:1.1.0 (*)
-+|    |    \--- androidx.core:core:1.5.0-rc02 (*)
++|    |    \--- androidx.core:core:1.5.0-rc02 -> 1.5.0 (*)
 +|    +--- androidx.compose.ui:ui-unit:1.0.0-beta08 (*)
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10
@@ -562,7 +566,7 @@
 +|    +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
 +|    +--- androidx.autofill:autofill:1.0.0
-+|    |    \--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*)
++|    |    \--- androidx.core:core:1.1.0 -> 1.5.0 (*)
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3 (*)
 +|    +--- androidx.savedstate:savedstate:1.1.0 (*)
 +|    +--- androidx.lifecycle:lifecycle-runtime:2.3.0 -> 2.3.1 (*)
@@ -614,15 +618,15 @@
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
 +|    \--- androidx.compose.ui:ui:1.0.0-beta08 (*)
 ++--- com.google.android.material:compose-theme-adapter:1.0.0-beta08
-+|    +--- androidx.appcompat:appcompat:1.3.0-beta01 -> 1.3.0-rc01 (*)
++|    +--- androidx.appcompat:appcompat:1.3.0-beta01 -> 1.3.0 (*)
 +|    +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*)
 +|    +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*)
 +|    +--- androidx.compose.material:material:1.0.0-beta08 (*)
 +|    +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)
-+\--- androidx.activity:activity-compose:1.3.0-alpha08
-+     +--- androidx.compose.runtime:runtime:1.0.0-beta07 -> 1.0.0-beta08 (*)
-+     +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta07 -> 1.0.0-beta08 (*)
-+     +--- androidx.activity:activity-ktx:1.3.0-alpha08 (*)
-+     +--- androidx.compose.ui:ui:1.0.0-beta07 -> 1.0.0-beta08 (*)
-+     \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.5.10 (*)
++\--- androidx.activity:activity-compose:1.3.0-beta01
++     +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*)
++     +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta08 (*)
++     +--- androidx.activity:activity-ktx:1.3.0-beta01 (*)
++     +--- androidx.compose.ui:ui:1.0.0-beta08 (*)
++     \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*)