From 6b2f8a8ea1c40a408563bc2bcf764849bc0056c0 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 23 Feb 2021 15:11:06 -0600 Subject: [PATCH] Update dependencies --- app/build.gradle.kts | 12 +- app/licenses.yml | 12 + app/src/main/assets/licenses.json | 28 +++ .../org/tasks/dialogs/ThemePickerDialog.kt | 1 - buildSrc/src/main/kotlin/Versions.kt | 8 +- deps_fdroid.txt | 176 ++++++------- deps_googleplay.txt | 234 +++++++++--------- 7 files changed, 265 insertions(+), 206 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c9c855a28..8cf15ca0f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -160,7 +160,7 @@ dependencies { implementation("androidx.hilt:hilt-work:${Versions.hilt_androidx}") implementation("androidx.hilt:hilt-lifecycle-viewmodel:${Versions.hilt_androidx}") - implementation("androidx.fragment:fragment-ktx:1.2.5") + implementation("androidx.fragment:fragment-ktx:1.3.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle}") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifecycle}") implementation("androidx.room:room-ktx:${Versions.room}") @@ -198,9 +198,9 @@ dependencies { } implementation("com.wdullaer:materialdatetimepicker:4.2.3") implementation("me.leolin:ShortcutBadger:1.1.22@aar") - implementation("com.google.apis:google-api-services-tasks:v1-rev20200905-1.31.0") - implementation("com.google.apis:google-api-services-drive:v3-rev20201130-1.31.0") - implementation("com.google.auth:google-auth-library-oauth2-http:0.23.0") + implementation("com.google.apis:google-api-services-tasks:v1-rev20210109-1.31.0") + implementation("com.google.apis:google-api-services-drive:v3-rev20210207-1.31.0") + implementation("com.google.auth:google-auth-library-oauth2-http:0.24.0") implementation("androidx.work:work-runtime:${Versions.work}") implementation("androidx.work:work-runtime-ktx:${Versions.work}") implementation("com.etesync:journalmanager:1.1.1") @@ -214,7 +214,7 @@ dependencies { exclude("com.google.android.gms", "play-services-ads-identifier") } googleplayImplementation("com.google.firebase:firebase-config-ktx:${Versions.remote_config}") - googleplayImplementation("com.google.android.gms:play-services-location:17.1.0") + googleplayImplementation("com.google.android.gms:play-services-location:18.0.0") googleplayImplementation("com.google.android.gms:play-services-maps:17.0.0") googleplayImplementation("com.android.billingclient:billing:1.2.2") @@ -230,7 +230,7 @@ dependencies { androidTestImplementation("androidx.annotation:annotation:1.1.0") androidTestImplementation("com.squareup.okhttp3:mockwebserver:${Versions.okhttp}") - testImplementation("junit:junit:4.13.1") + testImplementation("junit:junit:4.13.2") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") testImplementation("com.natpryce:make-it-easy:${Versions.make_it_easy}") testImplementation("androidx.test:core:${Versions.androidx_test}") diff --git a/app/licenses.yml b/app/licenses.yml index f20fa5456..633e6b6d6 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -815,3 +815,15 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0 url: https://github.com/osmdroid/osmdroid +- artifact: androidx.savedstate:savedstate-ktx:+ + name: savedstate-ktx + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://developer.android.com/jetpack/androidx/releases/savedstate#1.1.0 +- artifact: androidx.tracing:tracing:+ + name: tracing + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://developer.android.com/jetpack/androidx/releases/tracing#1.0.0 diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index 46d5b3864..f19b4d7c1 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -1950,6 +1950,34 @@ "normalizedLicense": "apache2", "url": "https://github.com/osmdroid/osmdroid", "libraryName": "osmdroid-android" + }, + { + "artifactId": { + "name": "savedstate-ktx", + "group": "androidx.savedstate", + "version": "+" + }, + "copyrightHolder": "Android Open Source Project", + "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.", + "license": "The Apache Software License, Version 2.0", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", + "normalizedLicense": "apache2", + "url": "https://developer.android.com/jetpack/androidx/releases/savedstate#1.1.0", + "libraryName": "savedstate-ktx" + }, + { + "artifactId": { + "name": "tracing", + "group": "androidx.tracing", + "version": "+" + }, + "copyrightHolder": "Android Open Source Project", + "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.", + "license": "The Apache Software License, Version 2.0", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", + "normalizedLicense": "apache2", + "url": "https://developer.android.com/jetpack/androidx/releases/tracing#1.0.0", + "libraryName": "tracing" } ] } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/dialogs/ThemePickerDialog.kt b/app/src/main/java/org/tasks/dialogs/ThemePickerDialog.kt index 43111fa61..3ca1bddba 100644 --- a/app/src/main/java/org/tasks/dialogs/ThemePickerDialog.kt +++ b/app/src/main/java/org/tasks/dialogs/ThemePickerDialog.kt @@ -88,7 +88,6 @@ class ThemePickerDialog : DialogFragment() { Handler().post { ThemeBase(which).setDefaultNightMode() activity?.recreate() - activity?.overridePendingTransition(R.anim.fragment_fade_enter, R.anim.fragment_fade_exit) } } } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 91500f23b..2b837cc21 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -11,11 +11,11 @@ object Versions { const val remote_config = "20.0.3" const val okhttp = "4.8.1" const val flipper = "0.74.0" - const val mockito = "3.7.7" + const val mockito = "3.8.0" const val androidx_test = "1.3.0" const val make_it_easy = "4.0.1" - const val hilt = "2.31.2-alpha" + const val hilt = "2.32-alpha" const val hilt_androidx = "1.0.0-alpha03" - const val lifecycle = "2.2.0" - const val markwon = "4.6.1" + const val lifecycle = "2.3.0" + const val markwon = "4.6.2" } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 7ea4363a5..e9ee72c88 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -3,11 +3,14 @@ ++--- androidx.databinding:databinding-common:4.1.2 ++--- androidx.databinding:databinding-runtime:4.1.2 +| +--- androidx.databinding:viewbinding:4.1.2 (*) -+| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 -+| | +--- androidx.lifecycle:lifecycle-common:2.2.0 -+| | | \--- androidx.annotation:annotation:1.1.0 -+| | +--- androidx.arch.core:core-common:2.1.0 ++| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.0 ++| | +--- androidx.arch.core:core-runtime:2.1.0 ++| | | +--- androidx.annotation:annotation:1.1.0 ++| | | \--- androidx.arch.core:core-common:2.1.0 ++| | | \--- androidx.annotation:annotation:1.1.0 ++| | +--- androidx.lifecycle:lifecycle-common:2.3.0 +| | | \--- androidx.annotation:annotation:1.1.0 ++| | +--- androidx.arch.core:core-common:2.1.0 (*) +| | \--- androidx.annotation:annotation:1.1.0 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| | \--- androidx.annotation:annotation:1.1.0 @@ -38,7 +41,7 @@ +| +--- androidx.annotation:annotation:1.1.0 +| \--- androidx.core:core:1.3.2 +| +--- androidx.annotation:annotation:1.1.0 -+| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 (*) ++| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.0 (*) +| +--- androidx.versionedparcelable:versionedparcelable:1.1.0 +| | +--- androidx.annotation:annotation:1.1.0 +| | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -53,7 +56,7 @@ +| | +--- androidx.core:core:1.3.0 -> 1.3.2 (*) +| | +--- androidx.cursoradapter:cursoradapter:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | +--- androidx.fragment:fragment:1.1.0 -> 1.2.5 ++| | +--- androidx.fragment:fragment:1.1.0 -> 1.3.0 +| | | +--- androidx.annotation:annotation:1.1.0 +| | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) +| | | +--- androidx.collection:collection:1.1.0 (*) @@ -67,33 +70,36 @@ +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) +| | | | +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0 -+| | | | | +--- androidx.arch.core:core-runtime:2.1.0 -+| | | | | | +--- androidx.annotation:annotation:1.1.0 -+| | | | | | \--- androidx.arch.core:core-common:2.1.0 (*) -+| | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 -+| | | | | | +--- androidx.lifecycle:lifecycle-common:2.2.0 (*) ++| | | | | +--- androidx.arch.core:core-runtime:2.1.0 (*) ++| | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 -> 2.3.0 +| | | | | | +--- androidx.arch.core:core-common:2.1.0 (*) -+| | | | | | \--- androidx.arch.core:core-runtime:2.1.0 (*) ++| | | | | | +--- androidx.arch.core:core-runtime:2.1.0 (*) ++| | | | | | \--- androidx.lifecycle:lifecycle-common:2.3.0 (*) +| | | | | \--- androidx.arch.core:core-common:2.1.0 (*) -+| | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.2.0 ++| | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.3.0 +| | | | \--- androidx.annotation:annotation:1.1.0 -+| | | +--- androidx.activity:activity:1.1.0 ++| | | +--- androidx.activity:activity:1.2.0 +| | | | +--- androidx.annotation:annotation:1.1.0 +| | | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) -+| | | | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) -+| | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) -+| | | | +--- androidx.savedstate:savedstate:1.0.0 ++| | | | +--- androidx.lifecycle:lifecycle-runtime:2.3.0 (*) ++| | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) ++| | | | +--- androidx.savedstate:savedstate:1.1.0 +| | | | | +--- androidx.annotation:annotation:1.1.0 +| | | | | +--- androidx.arch.core:core-common:2.0.1 -> 2.1.0 (*) -+| | | | | \--- androidx.lifecycle:lifecycle-common:2.0.0 -> 2.2.0 (*) -+| | | | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0 -> 2.2.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | | +--- androidx.savedstate:savedstate:1.0.0 (*) -+| | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 (*) -+| | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) -+| | | +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 (*) -+| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) -+| | | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*) ++| | | | | \--- androidx.lifecycle:lifecycle-common:2.0.0 -> 2.3.0 (*) ++| | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0 ++| | | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | | +--- androidx.savedstate:savedstate:1.1.0 (*) ++| | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.3.0 (*) ++| | | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) ++| | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++| | | | \--- androidx.tracing:tracing:1.0.0 ++| | | | \--- androidx.annotation:annotation:1.1.0 ++| | | +--- androidx.lifecycle:lifecycle-livedata-core:2.3.0 (*) ++| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) ++| | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0 (*) ++| | | +--- androidx.savedstate:savedstate:1.1.0 (*) ++| | | \--- androidx.annotation:annotation-experimental:1.0.0 +| | +--- androidx.appcompat:appcompat-resources:1.2.0 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.annotation:annotation:1.1.0 @@ -115,17 +121,17 @@ +| +--- androidx.cardview:cardview:1.0.0 +| | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| +--- androidx.lifecycle:lifecycle-extensions:2.2.0 -+| | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) ++| | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.0 (*) +| | +--- androidx.arch.core:core-common:2.1.0 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 (*) -+| | +--- androidx.fragment:fragment:1.2.0 -> 1.2.5 (*) -+| | +--- androidx.lifecycle:lifecycle-common:2.2.0 (*) ++| | +--- androidx.fragment:fragment:1.2.0 -> 1.3.0 (*) ++| | +--- androidx.lifecycle:lifecycle-common:2.2.0 -> 2.3.0 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | +--- androidx.lifecycle:lifecycle-process:2.2.0 -+| | | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) ++| | | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.0 (*) +| | +--- androidx.lifecycle:lifecycle-service:2.2.0 -+| | | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) -+| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) ++| | | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.0 (*) ++| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.3.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.1 @@ -133,15 +139,15 @@ +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.30 +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) -+| | \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) -+| | \--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) -+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 -+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) -+| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) ++| | \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 -> 2.3.0 ++| | +--- androidx.lifecycle:lifecycle-livedata-core:2.3.0 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -> 2.3.0 ++| | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) ++| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) +| +--- com.google.android.material:material:1.2.1 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.1.0 +| | +--- androidx.appcompat:appcompat:1.1.0 -> 1.2.0 (*) @@ -170,8 +176,8 @@ +| | | \--- androidx.print:print:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | +--- androidx.annotation:annotation-experimental:1.0.0 -+| | +--- androidx.fragment:fragment:1.0.0 -> 1.2.5 (*) -+| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 (*) ++| | +--- androidx.fragment:fragment:1.0.0 -> 1.3.0 (*) ++| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.0 (*) +| | +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 +| | | +--- androidx.annotation:annotation:1.1.0 +| | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) @@ -184,7 +190,7 @@ +| | +--- androidx.vectordrawable:vectordrawable:1.1.0 (*) +| | \--- androidx.viewpager2:viewpager2:1.0.0 +| | +--- androidx.annotation:annotation:1.1.0 -+| | +--- androidx.fragment:fragment:1.1.0 -> 1.2.5 (*) ++| | +--- androidx.fragment:fragment:1.1.0 -> 1.3.0 (*) +| | +--- androidx.recyclerview:recyclerview:1.1.0 (*) +| | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) +| | \--- androidx.collection:collection:1.1.0 (*) @@ -194,24 +200,24 @@ +| +--- org.dmfs:lib-recur:0.11.4 +| | \--- org.dmfs:rfc5545-datetime:0.2.4 +| \--- org.dmfs:jems:1.33 -++--- com.google.dagger:hilt-android:2.31.2-alpha -+| +--- com.google.dagger:dagger:2.31.2 +++--- com.google.dagger:hilt-android:2.32-alpha ++| +--- com.google.dagger:dagger:2.32 +| | \--- javax.inject:javax.inject:1 -+| +--- com.google.dagger:dagger-lint-aar:2.31.2 -+| +--- com.google.dagger:hilt-core:2.31.2-alpha -+| | +--- com.google.dagger:dagger:2.31.2 (*) ++| +--- com.google.dagger:dagger-lint-aar:2.32 ++| +--- com.google.dagger:hilt-core:2.32-alpha ++| | +--- com.google.dagger:dagger:2.32 (*) +| | \--- javax.inject:javax.inject:1 -+| +--- androidx.activity:activity:1.1.0 (*) ++| +--- androidx.activity:activity:1.1.0 -> 1.2.0 (*) +| +--- androidx.annotation:annotation:1.1.0 -+| +--- androidx.fragment:fragment:1.2.5 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*) -+| +--- androidx.savedstate:savedstate:1.0.0 (*) ++| +--- androidx.fragment:fragment:1.2.5 -> 1.3.0 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.3.0 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 -> 2.3.0 (*) ++| +--- androidx.savedstate:savedstate:1.0.0 -> 1.1.0 (*) +| \--- javax.inject:javax.inject:1 ++--- androidx.hilt:hilt-work:1.0.0-alpha03 +| +--- androidx.annotation:annotation:1.1.0 +| +--- androidx.hilt:hilt-common:1.0.0-alpha03 -+| | \--- com.google.dagger:hilt-core:2.31-alpha -> 2.31.2-alpha (*) ++| | \--- com.google.dagger:hilt-core:2.31-alpha -> 2.32-alpha (*) +| +--- androidx.work:work-runtime:2.3.4 -> 2.5.0 +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*) @@ -228,34 +234,38 @@ +| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*) +| | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) +| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) -+| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.31.2-alpha (*) ++| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.32-alpha (*) ++--- androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03 -+| +--- androidx.activity:activity:1.1.0 (*) ++| +--- androidx.activity:activity:1.1.0 -> 1.2.0 (*) +| +--- androidx.annotation:annotation:1.1.0 +| +--- androidx.hilt:hilt-common:1.0.0-alpha03 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*) -+| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.31.2-alpha (*) -++--- androidx.fragment:fragment-ktx:1.2.5 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) -+| +--- androidx.fragment:fragment:1.2.5 (*) -+| +--- androidx.activity:activity-ktx:1.1.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) -+| | +--- androidx.activity:activity:1.1.0 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 -> 2.3.0 (*) ++| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.32-alpha (*) +++--- androidx.fragment:fragment-ktx:1.3.0 ++| +--- androidx.fragment:fragment:1.3.0 (*) ++| +--- androidx.activity:activity-ktx:1.2.0 ++| | +--- androidx.activity:activity:1.2.0 (*) +| | +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) -+| | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) -+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) -+| | | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) ++| | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.0 ++| | | +--- androidx.lifecycle:lifecycle-runtime:2.3.0 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) ++| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 (*) ++| | +--- androidx.savedstate:savedstate-ktx:1.1.0 ++| | | +--- androidx.savedstate:savedstate:1.1.0 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) +| +--- 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.4.30 (*) +| | \--- androidx.collection:collection:1.1.0 (*) -+| +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 (*) -+| \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) -++--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 (*) -++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) ++| +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.0 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 (*) ++| +--- androidx.savedstate:savedstate-ktx:1.1.0 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) +++--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.0 (*) +++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 (*) ++--- androidx.room:room-ktx:2.2.5 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.30 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) @@ -269,14 +279,14 @@ +| | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | \--- androidx.arch.core:core-common:2.0.0 -> 2.1.0 (*) +| +--- androidx.arch.core:core-runtime:2.0.0 -> 2.1.0 (*) -+| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 (*) ++| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) -++--- io.noties.markwon:core:4.6.1 +++--- io.noties.markwon:core:4.6.2 +| +--- androidx.annotation:annotation:1.1.0 +| \--- com.atlassian.commonmark:commonmark:0.13.0 -++--- io.noties.markwon:ext-strikethrough:4.6.1 -+| +--- io.noties.markwon:core:4.6.1 (*) +++--- io.noties.markwon:ext-strikethrough:4.6.2 ++| +--- io.noties.markwon:core:4.6.2 (*) +| \--- com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:0.13.0 +| \--- com.atlassian.commonmark:commonmark:0.13.0 ++--- com.jakewharton:butterknife:10.2.3 @@ -304,7 +314,7 @@ ++--- androidx.preference:preference:1.1.1 +| +--- androidx.appcompat:appcompat:1.1.0 -> 1.2.0 (*) +| +--- androidx.core:core:1.1.0 -> 1.3.2 (*) -+| +--- androidx.fragment:fragment:1.2.4 -> 1.2.5 (*) ++| +--- androidx.fragment:fragment:1.2.4 -> 1.3.0 (*) +| +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) +| +--- androidx.annotation:annotation:1.1.0 +| \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -317,7 +327,7 @@ +| +--- androidx.appcompat:appcompat:1.0.2 -> 1.2.0 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) ++--- me.leolin:ShortcutBadger:1.1.22 -++--- com.google.apis:google-api-services-tasks:v1-rev20200905-1.31.0 +++--- 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.38.1 @@ -331,11 +341,11 @@ +| | | \--- com.google.guava:guava:26.0-android -> 30.1-android (*) +| | \--- com.google.guava:guava:30.0-android -> 30.1-android (*) +| \--- com.google.guava:guava:29.0-android -> 30.1-android (*) -++--- com.google.apis:google-api-services-drive:v3-rev20201130-1.31.0 +++--- com.google.apis:google-api-services-drive:v3-rev20210207-1.31.0 +| \--- com.google.api-client:google-api-client:1.31.1 (*) -++--- com.google.auth:google-auth-library-oauth2-http:0.23.0 +++--- com.google.auth:google-auth-library-oauth2-http:0.24.0 +| +--- com.google.auto.value:auto-value-annotations:1.7.4 -+| +--- com.google.auth:google-auth-library-credentials:0.23.0 ++| +--- com.google.auth:google-auth-library-credentials:0.24.0 +| +--- com.google.http-client:google-http-client:1.38.1 (*) +| +--- com.google.http-client:google-http-client-gson:1.38.1 +| | +--- com.google.http-client:google-http-client:1.38.1 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index cb1e03494..d2a528d79 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -3,11 +3,14 @@ ++--- androidx.databinding:databinding-common:4.1.2 ++--- androidx.databinding:databinding-runtime:4.1.2 +| +--- androidx.databinding:viewbinding:4.1.2 (*) -+| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 -+| | +--- androidx.lifecycle:lifecycle-common:2.2.0 -+| | | \--- androidx.annotation:annotation:1.1.0 -+| | +--- androidx.arch.core:core-common:2.1.0 ++| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.0 ++| | +--- androidx.arch.core:core-runtime:2.1.0 ++| | | +--- androidx.annotation:annotation:1.1.0 ++| | | \--- androidx.arch.core:core-common:2.1.0 ++| | | \--- androidx.annotation:annotation:1.1.0 ++| | +--- androidx.lifecycle:lifecycle-common:2.3.0 +| | | \--- androidx.annotation:annotation:1.1.0 ++| | +--- androidx.arch.core:core-common:2.1.0 (*) +| | \--- androidx.annotation:annotation:1.1.0 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| | \--- androidx.annotation:annotation:1.1.0 @@ -31,17 +34,17 @@ +| | +--- androidx.annotation:annotation:1.1.0 +| | \--- com.google.firebase:firebase-encoders:16.1.0 (*) +| +--- com.google.android.datatransport:transport-runtime:2.2.5 (*) -+| +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.1.0 -+| | \--- com.google.android.gms:play-services-basement:17.3.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.3.2 +| | | +--- androidx.annotation:annotation:1.1.0 -+| | | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 (*) ++| | | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.0 (*) +| | | +--- androidx.versionedparcelable:versionedparcelable:1.1.0 +| | | | +--- androidx.annotation:annotation:1.1.0 +| | | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) -+| | \--- androidx.fragment:fragment:1.0.0 -> 1.2.5 ++| | \--- androidx.fragment:fragment:1.0.0 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.1.0 +| | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) +| | +--- androidx.collection:collection:1.1.0 (*) @@ -55,36 +58,39 @@ +| | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) +| | | +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0 -+| | | | +--- androidx.arch.core:core-runtime:2.1.0 -+| | | | | +--- androidx.annotation:annotation:1.1.0 -+| | | | | \--- androidx.arch.core:core-common:2.1.0 (*) -+| | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 -+| | | | | +--- androidx.lifecycle:lifecycle-common:2.2.0 (*) ++| | | | +--- androidx.arch.core:core-runtime:2.1.0 (*) ++| | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 -> 2.3.0 +| | | | | +--- androidx.arch.core:core-common:2.1.0 (*) -+| | | | | \--- androidx.arch.core:core-runtime:2.1.0 (*) ++| | | | | +--- androidx.arch.core:core-runtime:2.1.0 (*) ++| | | | | \--- androidx.lifecycle:lifecycle-common:2.3.0 (*) +| | | | \--- androidx.arch.core:core-common:2.1.0 (*) -+| | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.2.0 ++| | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.3.0 +| | | \--- androidx.annotation:annotation:1.1.0 -+| | +--- androidx.activity:activity:1.1.0 ++| | +--- androidx.activity:activity:1.2.0 +| | | +--- androidx.annotation:annotation:1.1.0 +| | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) -+| | | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) -+| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) -+| | | +--- androidx.savedstate:savedstate:1.0.0 ++| | | +--- androidx.lifecycle:lifecycle-runtime:2.3.0 (*) ++| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) ++| | | +--- androidx.savedstate:savedstate:1.1.0 +| | | | +--- androidx.annotation:annotation:1.1.0 +| | | | +--- androidx.arch.core:core-common:2.0.1 -> 2.1.0 (*) -+| | | | \--- androidx.lifecycle:lifecycle-common:2.0.0 -> 2.2.0 (*) -+| | | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0 -> 2.2.0 -+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | +--- androidx.savedstate:savedstate:1.0.0 (*) -+| | | +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 (*) -+| | | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) -+| | +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 (*) -+| | +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) -+| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*) ++| | | | \--- androidx.lifecycle:lifecycle-common:2.0.0 -> 2.3.0 (*) ++| | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0 ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | +--- androidx.savedstate:savedstate:1.1.0 (*) ++| | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.3.0 (*) ++| | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) ++| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++| | | \--- androidx.tracing:tracing:1.0.0 ++| | | \--- androidx.annotation:annotation:1.1.0 ++| | +--- androidx.lifecycle:lifecycle-livedata-core:2.3.0 (*) ++| | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) ++| | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0 (*) ++| | +--- androidx.savedstate:savedstate:1.1.0 (*) ++| | \--- androidx.annotation:annotation-experimental:1.0.0 +| +--- com.google.firebase:firebase-common:19.5.0 -+| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.1.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 +| | +--- androidx.annotation:annotation:1.1.0 +| | \--- com.google.firebase:firebase-annotations:16.0.0 @@ -92,15 +98,15 @@ +| +--- 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.android.gms:play-services-tasks:17.0.0 -> 17.1.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.android.gms:play-services-tasks:17.0.0 -> 17.1.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.3.0 (*) ++| \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) ++--- com.google.firebase:firebase-analytics:18.0.2 +| +--- com.google.android.gms:play-services-measurement:18.0.2 +| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -114,25 +120,25 @@ +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | | \--- androidx.print:print:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) ++| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) +| | +--- com.google.android.gms:play-services-measurement-base:18.0.2 -+| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) ++| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) +| | +--- com.google.android.gms:play-services-measurement-impl:18.0.2 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) -+| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) ++| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) +| | | +--- com.google.android.gms:play-services-measurement-base:18.0.2 (*) +| | | \--- 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.3.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.2 -+| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) ++| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) +| | +--- com.google.android.gms:play-services-measurement-base:18.0.2 (*) +| | +--- com.google.android.gms:play-services-measurement-sdk-api:18.0.2 -+| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) ++| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) +| | | \--- com.google.android.gms:play-services-measurement-base:18.0.2 (*) -+| | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.1.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 (*) @@ -140,13 +146,13 @@ +| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*) +| \--- com.google.android.gms:play-services-measurement-sdk:18.0.2 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) -+| +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) ++| +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) +| +--- com.google.android.gms:play-services-measurement-base:18.0.2 (*) +| \--- com.google.android.gms:play-services-measurement-impl:18.0.2 (*) ++--- com.google.firebase:firebase-config-ktx:20.0.3 +| +--- androidx.annotation:annotation:1.1.0 +| +--- com.google.firebase:firebase-abt:20.0.0 -+| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.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 (*) @@ -161,7 +167,7 @@ +| | \--- org.jetbrains:annotations:13.0 -> 16.0.1 +| +--- com.google.firebase:firebase-components:16.1.0 (*) +| +--- com.google.firebase:firebase-config:20.0.3 -+| | +--- com.google.android.gms:play-services-tasks:17.0.2 -> 17.1.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 (*) @@ -171,21 +177,21 @@ +| +--- com.google.firebase:firebase-installations:16.3.5 (*) +| +--- com.google.firebase:firebase-installations-interop:16.0.1 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.21 (*) -++--- com.google.android.gms:play-services-location:17.1.0 -+| +--- com.google.android.gms:play-services-base:17.3.0 +++--- 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.3.2 (*) -+| | +--- androidx.fragment:fragment:1.0.0 -> 1.2.5 (*) -+| | +--- com.google.android.gms:play-services-basement:17.3.0 (*) -+| | \--- com.google.android.gms:play-services-tasks:17.1.0 (*) -+| +--- com.google.android.gms:play-services-basement:17.3.0 (*) ++| | +--- androidx.fragment:fragment:1.0.0 -> 1.3.0 (*) ++| | +--- 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 (*) +| +--- com.google.android.gms:play-services-places-placereport:17.0.0 -+| | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| \--- com.google.android.gms:play-services-tasks:17.1.0 (*) ++| | \--- 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.0 -+| +--- androidx.fragment:fragment:1.0.0 -> 1.2.5 (*) -+| +--- com.google.android.gms:play-services-base:17.0.0 -> 17.3.0 (*) -+| \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) ++| +--- androidx.fragment:fragment:1.0.0 -> 1.3.0 (*) ++| +--- 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:1.2.2 ++--- com.gitlab.abaker:dav4jvm:deb2c9aef8 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.30 (*) @@ -216,7 +222,7 @@ +| | +--- androidx.core:core:1.3.0 -> 1.3.2 (*) +| | +--- androidx.cursoradapter:cursoradapter:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | +--- androidx.fragment:fragment:1.1.0 -> 1.2.5 (*) ++| | +--- androidx.fragment:fragment:1.1.0 -> 1.3.0 (*) +| | +--- androidx.appcompat:appcompat-resources:1.2.0 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.annotation:annotation:1.1.0 @@ -238,17 +244,17 @@ +| +--- androidx.cardview:cardview:1.0.0 +| | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| +--- androidx.lifecycle:lifecycle-extensions:2.2.0 -+| | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) ++| | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.0 (*) +| | +--- androidx.arch.core:core-common:2.1.0 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 (*) -+| | +--- androidx.fragment:fragment:1.2.0 -> 1.2.5 (*) -+| | +--- androidx.lifecycle:lifecycle-common:2.2.0 (*) ++| | +--- androidx.fragment:fragment:1.2.0 -> 1.3.0 (*) ++| | +--- androidx.lifecycle:lifecycle-common:2.2.0 -> 2.3.0 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | +--- androidx.lifecycle:lifecycle-process:2.2.0 -+| | | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) ++| | | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.0 (*) +| | +--- androidx.lifecycle:lifecycle-service:2.2.0 -+| | | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) -+| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) ++| | | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.0 (*) ++| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.3.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.1 @@ -256,15 +262,15 @@ +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.30 +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) -+| | \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) -+| | \--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) -+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 -+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) -+| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) ++| | \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 -> 2.3.0 ++| | +--- androidx.lifecycle:lifecycle-livedata-core:2.3.0 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -> 2.3.0 ++| | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) ++| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) +| +--- com.google.android.material:material:1.2.1 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.1.0 +| | +--- androidx.appcompat:appcompat:1.1.0 -> 1.2.0 (*) @@ -284,8 +290,8 @@ +| | | +--- 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 -+| | +--- androidx.fragment:fragment:1.0.0 -> 1.2.5 (*) -+| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 (*) ++| | +--- androidx.fragment:fragment:1.0.0 -> 1.3.0 (*) ++| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.0 (*) +| | +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 +| | | +--- androidx.annotation:annotation:1.1.0 +| | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) @@ -298,7 +304,7 @@ +| | +--- androidx.vectordrawable:vectordrawable:1.1.0 (*) +| | \--- androidx.viewpager2:viewpager2:1.0.0 +| | +--- androidx.annotation:annotation:1.1.0 -+| | +--- androidx.fragment:fragment:1.1.0 -> 1.2.5 (*) ++| | +--- androidx.fragment:fragment:1.1.0 -> 1.3.0 (*) +| | +--- androidx.recyclerview:recyclerview:1.1.0 (*) +| | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) +| | \--- androidx.collection:collection:1.1.0 (*) @@ -308,24 +314,24 @@ +| +--- org.dmfs:lib-recur:0.11.4 +| | \--- org.dmfs:rfc5545-datetime:0.2.4 +| \--- org.dmfs:jems:1.33 -++--- com.google.dagger:hilt-android:2.31.2-alpha -+| +--- com.google.dagger:dagger:2.31.2 +++--- com.google.dagger:hilt-android:2.32-alpha ++| +--- com.google.dagger:dagger:2.32 +| | \--- javax.inject:javax.inject:1 -+| +--- com.google.dagger:dagger-lint-aar:2.31.2 -+| +--- com.google.dagger:hilt-core:2.31.2-alpha -+| | +--- com.google.dagger:dagger:2.31.2 (*) ++| +--- com.google.dagger:dagger-lint-aar:2.32 ++| +--- com.google.dagger:hilt-core:2.32-alpha ++| | +--- com.google.dagger:dagger:2.32 (*) +| | \--- javax.inject:javax.inject:1 -+| +--- androidx.activity:activity:1.1.0 (*) ++| +--- androidx.activity:activity:1.1.0 -> 1.2.0 (*) +| +--- androidx.annotation:annotation:1.1.0 -+| +--- androidx.fragment:fragment:1.2.5 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*) -+| +--- androidx.savedstate:savedstate:1.0.0 (*) ++| +--- androidx.fragment:fragment:1.2.5 -> 1.3.0 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.3.0 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 -> 2.3.0 (*) ++| +--- androidx.savedstate:savedstate:1.0.0 -> 1.1.0 (*) +| \--- javax.inject:javax.inject:1 ++--- androidx.hilt:hilt-work:1.0.0-alpha03 +| +--- androidx.annotation:annotation:1.1.0 +| +--- androidx.hilt:hilt-common:1.0.0-alpha03 -+| | \--- com.google.dagger:hilt-core:2.31-alpha -> 2.31.2-alpha (*) ++| | \--- com.google.dagger:hilt-core:2.31-alpha -> 2.32-alpha (*) +| +--- androidx.work:work-runtime:2.3.4 -> 2.5.0 +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*) @@ -342,34 +348,38 @@ +| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*) +| | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) +| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) -+| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.31.2-alpha (*) ++| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.32-alpha (*) ++--- androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03 -+| +--- androidx.activity:activity:1.1.0 (*) ++| +--- androidx.activity:activity:1.1.0 -> 1.2.0 (*) +| +--- androidx.annotation:annotation:1.1.0 +| +--- androidx.hilt:hilt-common:1.0.0-alpha03 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*) -+| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.31.2-alpha (*) -++--- androidx.fragment:fragment-ktx:1.2.5 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) -+| +--- androidx.fragment:fragment:1.2.5 (*) -+| +--- androidx.activity:activity-ktx:1.1.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) -+| | +--- androidx.activity:activity:1.1.0 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 -> 2.3.0 (*) ++| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.32-alpha (*) +++--- androidx.fragment:fragment-ktx:1.3.0 ++| +--- androidx.fragment:fragment:1.3.0 (*) ++| +--- androidx.activity:activity-ktx:1.2.0 ++| | +--- androidx.activity:activity:1.2.0 (*) +| | +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) -+| | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) -+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) -+| | | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) ++| | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.0 ++| | | +--- androidx.lifecycle:lifecycle-runtime:2.3.0 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) ++| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 (*) ++| | +--- androidx.savedstate:savedstate-ktx:1.1.0 ++| | | +--- androidx.savedstate:savedstate:1.1.0 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) +| +--- 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.4.30 (*) +| | \--- androidx.collection:collection:1.1.0 (*) -+| +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 (*) -+| \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) -++--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 (*) -++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) ++| +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.0 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 (*) ++| +--- androidx.savedstate:savedstate-ktx:1.1.0 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) +++--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.0 (*) +++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 (*) ++--- androidx.room:room-ktx:2.2.5 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.30 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) @@ -383,14 +393,14 @@ +| | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | \--- androidx.arch.core:core-common:2.0.0 -> 2.1.0 (*) +| +--- androidx.arch.core:core-runtime:2.0.0 -> 2.1.0 (*) -+| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 (*) ++| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) -++--- io.noties.markwon:core:4.6.1 +++--- io.noties.markwon:core:4.6.2 +| +--- androidx.annotation:annotation:1.1.0 +| \--- com.atlassian.commonmark:commonmark:0.13.0 -++--- io.noties.markwon:ext-strikethrough:4.6.1 -+| +--- io.noties.markwon:core:4.6.1 (*) +++--- io.noties.markwon:ext-strikethrough:4.6.2 ++| +--- io.noties.markwon:core:4.6.2 (*) +| \--- com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:0.13.0 +| \--- com.atlassian.commonmark:commonmark:0.13.0 ++--- com.jakewharton:butterknife:10.2.3 @@ -418,7 +428,7 @@ ++--- androidx.preference:preference:1.1.1 +| +--- androidx.appcompat:appcompat:1.1.0 -> 1.2.0 (*) +| +--- androidx.core:core:1.1.0 -> 1.3.2 (*) -+| +--- androidx.fragment:fragment:1.2.4 -> 1.2.5 (*) ++| +--- androidx.fragment:fragment:1.2.4 -> 1.3.0 (*) +| +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) +| +--- androidx.annotation:annotation:1.1.0 +| \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -431,7 +441,7 @@ +| +--- androidx.appcompat:appcompat:1.0.2 -> 1.2.0 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) ++--- me.leolin:ShortcutBadger:1.1.22 -++--- com.google.apis:google-api-services-tasks:v1-rev20200905-1.31.0 +++--- 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.38.1 @@ -445,11 +455,11 @@ +| | | \--- com.google.guava:guava:26.0-android -> 30.1-android (*) +| | \--- com.google.guava:guava:30.0-android -> 30.1-android (*) +| \--- com.google.guava:guava:29.0-android -> 30.1-android (*) -++--- com.google.apis:google-api-services-drive:v3-rev20201130-1.31.0 +++--- com.google.apis:google-api-services-drive:v3-rev20210207-1.31.0 +| \--- com.google.api-client:google-api-client:1.31.1 (*) -++--- com.google.auth:google-auth-library-oauth2-http:0.23.0 +++--- com.google.auth:google-auth-library-oauth2-http:0.24.0 +| +--- com.google.auto.value:auto-value-annotations:1.7.4 -+| +--- com.google.auth:google-auth-library-credentials:0.23.0 ++| +--- com.google.auth:google-auth-library-credentials:0.24.0 +| +--- com.google.http-client:google-http-client:1.38.1 (*) +| +--- com.google.http-client:google-http-client-gson:1.38.1 +| | +--- com.google.http-client:google-http-client:1.38.1 (*)