From 19e25b9c390ddccd2c665c41bd729f848d2e43f5 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 4 Mar 2021 08:25:40 -0600 Subject: [PATCH] Add compose --- app/build.gradle.kts | 12 +- app/licenses.yml | 78 ++++++++ app/src/main/assets/licenses.json | 182 ++++++++++++++++++ buildSrc/src/main/kotlin/Versions.kt | 1 + deps_fdroid.txt | 253 ++++++++++++++++-------- deps_googleplay.txt | 275 ++++++++++++++++++--------- 6 files changed, 621 insertions(+), 180 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 148d94395..3ad6527f5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -31,6 +31,7 @@ android { buildFeatures { viewBinding = true dataBinding = true + compose = true } lint { @@ -79,6 +80,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } + composeOptions { + kotlinCompilerExtensionVersion = Versions.compose + } + kotlinOptions { jvmTarget = "1.8" } @@ -176,8 +181,9 @@ dependencies { debugImplementation("com.facebook.flipper:flipper:${Versions.flipper}") debugImplementation("com.facebook.flipper:flipper-network-plugin:${Versions.flipper}") debugImplementation("com.facebook.soloader:soloader:0.10.1") - debugImplementation("com.squareup.leakcanary:leakcanary-android:${Versions.leakcanary}") + debugImplementation("androidx.compose.ui:ui-tooling:${Versions.compose}") + debugImplementation("org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}") implementation("org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}") implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3") @@ -209,6 +215,10 @@ dependencies { implementation("com.github.openid:AppAuth-Android:0.8.0") implementation("org.osmdroid:osmdroid-android:6.1.10@aar") + implementation("androidx.compose.ui:ui:${Versions.compose}") + implementation("androidx.compose.foundation:foundation:${Versions.compose}") + implementation("androidx.compose.material:material:${Versions.compose}") + googleplayImplementation("com.google.firebase:firebase-crashlytics:${Versions.crashlytics}") googleplayImplementation("com.google.firebase:firebase-analytics:${Versions.analytics}") { exclude("com.google.android.gms", "play-services-ads-identifier") diff --git a/app/licenses.yml b/app/licenses.yml index 24f4a2352..40949cbea 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -838,3 +838,81 @@ license: The Apache License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://kotlinlang.org/ +- artifact: androidx.compose.ui:ui:+ + name: ui + 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/compose-ui#1.0.0-beta01 +- artifact: androidx.compose.animation:animation-core:+ + name: animation-core + 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/compose-animation#1.0.0-beta01 +- artifact: androidx.compose.ui:ui-text:+ + name: ui-text + 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/compose-ui#1.0.0-beta01 +- artifact: androidx.compose.runtime:runtime-saveable:+ + name: runtime-saveable + 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/compose-runtime#1.0.0-beta01 +- artifact: androidx.compose.ui:ui-graphics:+ + name: ui-graphics + 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/compose-ui#1.0.0-beta01 +- artifact: androidx.compose.ui:ui-unit:+ + name: ui-unit + 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/compose-ui#1.0.0-beta01 +- artifact: androidx.compose.ui:ui-geometry:+ + name: ui-geometry + 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/compose-ui#1.0.0-beta01 +- artifact: androidx.compose.ui:ui-util:+ + name: ui-util + 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/compose-ui#1.0.0-beta01 +- artifact: androidx.compose.runtime:runtime:+ + name: runtime + 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/compose-runtime#1.0.0-beta01 +- artifact: androidx.autofill:autofill:+ + name: autofill + 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 +- artifact: androidx.compose.foundation:foundation:+ + name: foundation + 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/compose-foundation#1.0.0-beta01 +- artifact: androidx.compose.animation:animation:+ + name: animation + 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/compose-animation#1.0.0-beta01 +- artifact: androidx.compose.foundation:foundation-layout:+ + name: foundation-layout + 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/compose-foundation#1.0.0-beta01 diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index 899b50e6f..ab8c4e8be 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -2005,6 +2005,188 @@ "normalizedLicense": "apache2", "url": "https://kotlinlang.org/", "libraryName": "kotlin-stdlib-jdk8" + }, + { + "artifactId": { + "name": "ui", + "group": "androidx.compose.ui", + "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/compose-ui#1.0.0-beta01", + "libraryName": "ui" + }, + { + "artifactId": { + "name": "animation-core", + "group": "androidx.compose.animation", + "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/compose-animation#1.0.0-beta01", + "libraryName": "animation-core" + }, + { + "artifactId": { + "name": "ui-text", + "group": "androidx.compose.ui", + "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/compose-ui#1.0.0-beta01", + "libraryName": "ui-text" + }, + { + "artifactId": { + "name": "runtime-saveable", + "group": "androidx.compose.runtime", + "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/compose-runtime#1.0.0-beta01", + "libraryName": "runtime-saveable" + }, + { + "artifactId": { + "name": "ui-graphics", + "group": "androidx.compose.ui", + "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/compose-ui#1.0.0-beta01", + "libraryName": "ui-graphics" + }, + { + "artifactId": { + "name": "ui-unit", + "group": "androidx.compose.ui", + "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/compose-ui#1.0.0-beta01", + "libraryName": "ui-unit" + }, + { + "artifactId": { + "name": "ui-geometry", + "group": "androidx.compose.ui", + "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/compose-ui#1.0.0-beta01", + "libraryName": "ui-geometry" + }, + { + "artifactId": { + "name": "ui-util", + "group": "androidx.compose.ui", + "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/compose-ui#1.0.0-beta01", + "libraryName": "ui-util" + }, + { + "artifactId": { + "name": "runtime", + "group": "androidx.compose.runtime", + "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/compose-runtime#1.0.0-beta01", + "libraryName": "runtime" + }, + { + "artifactId": { + "name": "autofill", + "group": "androidx.autofill", + "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", + "libraryName": "autofill" + }, + { + "artifactId": { + "name": "foundation", + "group": "androidx.compose.foundation", + "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/compose-foundation#1.0.0-beta01", + "libraryName": "foundation" + }, + { + "artifactId": { + "name": "animation", + "group": "androidx.compose.animation", + "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/compose-animation#1.0.0-beta01", + "libraryName": "animation" + }, + { + "artifactId": { + "name": "foundation-layout", + "group": "androidx.compose.foundation", + "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/compose-foundation#1.0.0-beta01", + "libraryName": "foundation-layout" } ] } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 2b837cc21..1cb63ae21 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -18,4 +18,5 @@ object Versions { const val hilt_androidx = "1.0.0-alpha03" const val lifecycle = "2.3.0" const val markwon = "4.6.2" + const val compose = "1.0.0-beta01" } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index c5aeb85f4..34d5017ae 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1,20 +1,20 @@ ++--- androidx.databinding:viewbinding:7.0.0-alpha08 -+| \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++--- androidx.databinding:databinding-common:7.0.0-alpha08 ++--- androidx.databinding:databinding-runtime:7.0.0-alpha08 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 -+| | \--- androidx.annotation:annotation:1.1.0 ++| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.databinding:databinding-common:7.0.0-alpha08 +| +--- androidx.databinding:viewbinding:7.0.0-alpha08 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.0 +| +--- androidx.arch.core:core-runtime:2.1.0 -+| | +--- androidx.annotation:annotation:1.1.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | \--- androidx.arch.core:core-common:2.1.0 -+| | \--- androidx.annotation:annotation:1.1.0 ++| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.lifecycle:lifecycle-common:2.3.0 -+| | \--- androidx.annotation:annotation:1.1.0 ++| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.arch.core:core-common:2.1.0 (*) -+| \--- androidx.annotation:annotation:1.1.0 ++| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++--- androidx.databinding:databinding-adapters:7.0.0-alpha08 +| +--- androidx.databinding:databinding-runtime:7.0.0-alpha08 (*) +| \--- androidx.databinding:databinding-common:7.0.0-alpha08 @@ -32,24 +32,24 @@ +| | +--- androidx.arch.core:core-common:2.1.0 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 (*) +| | +--- androidx.fragment:fragment:1.2.0 -> 1.3.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -+| | | +--- androidx.core:core:1.1.0 -> 1.3.2 -+| | | | +--- androidx.annotation:annotation:1.1.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 ++| | | | +--- androidx.annotation:annotation:1.2.0-beta01 +| | | | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.0 (*) +| | | | +--- androidx.versionedparcelable:versionedparcelable:1.1.0 -+| | | | | +--- androidx.annotation:annotation:1.1.0 ++| | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.collection:collection:1.1.0 (*) +| | | +--- androidx.viewpager:viewpager:1.0.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| | | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | | \--- androidx.customview:customview:1.0.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | | \--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| | | | \--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | +--- androidx.loader:loader:1.0.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| | | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | | +--- 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.0 @@ -58,24 +58,24 @@ +| | | | | | \--- androidx.lifecycle:lifecycle-common:2.3.0 (*) +| | | | | \--- androidx.arch.core:core-common:2.1.0 (*) +| | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.3.0 -+| | | | \--- androidx.annotation:annotation:1.1.0 ++| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | +--- androidx.activity:activity:1.2.0 -+| | | | +--- androidx.annotation:annotation:1.1.0 -+| | | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | | | +--- 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.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | | | +--- androidx.arch.core:core-common:2.0.1 -> 2.1.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.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | | | | +--- 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.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | +--- androidx.lifecycle:lifecycle-livedata-core:2.3.0 (*) +| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) +| | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0 (*) @@ -92,7 +92,7 @@ +| | +--- 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.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| +--- androidx.databinding:databinding-runtime:7.0.0-alpha08 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.30 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) @@ -115,39 +115,43 @@ +| | \--- org.slf4j:slf4j-api:1.7.30 +| \--- androidx.core:core-ktx:1.3.2 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.4.30 (*) -+| +--- androidx.annotation:annotation:1.1.0 -+| \--- androidx.core:core:1.3.2 (*) ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| \--- androidx.core:core:1.3.2 -> 1.5.0-beta01 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f +| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha08 +| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha08 (*) +| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha08 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.30 (*) -+| +--- androidx.appcompat:appcompat:1.2.0 -+| | +--- androidx.annotation:annotation:1.1.0 -+| | +--- androidx.core:core:1.3.0 -> 1.3.2 (*) ++| +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-beta01 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | +--- androidx.core:core:1.5.0-beta01 (*) +| | +--- androidx.cursoradapter:cursoradapter:1.0.0 -+| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | +--- androidx.fragment:fragment:1.1.0 -> 1.3.0 (*) -+| | +--- androidx.appcompat:appcompat-resources:1.2.0 ++| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| | +--- androidx.activity:activity:1.2.0-rc01 -> 1.2.0 (*) ++| | +--- androidx.fragment:fragment:1.3.0-rc01 -> 1.3.0 (*) ++| | +--- androidx.appcompat:appcompat-resources:1.3.0-beta01 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) -+| | | +--- androidx.annotation:annotation:1.1.0 -+| | | +--- androidx.core:core:1.0.1 -> 1.3.2 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.0.1 -> 1.5.0-beta01 (*) +| | | +--- androidx.vectordrawable:vectordrawable:1.1.0 -+| | | | +--- androidx.annotation:annotation:1.1.0 -+| | | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | | | \--- androidx.collection:collection:1.1.0 (*) +| | | \--- androidx.vectordrawable:vectordrawable-animated:1.1.0 +| | | +--- androidx.vectordrawable:vectordrawable:1.1.0 (*) +| | | +--- androidx.interpolator:interpolator:1.0.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | | \--- androidx.collection:collection:1.1.0 (*) +| | +--- androidx.drawerlayout:drawerlayout:1.0.0 -+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | \--- androidx.customview:customview:1.0.0 (*) -+| | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++| | +--- androidx.savedstate:savedstate:1.1.0-rc01 -> 1.1.0 (*) ++| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++| | +--- androidx.lifecycle:lifecycle-runtime:2.3.0-rc01 -> 2.3.0 (*) ++| | \--- androidx.lifecycle:lifecycle-viewmodel:2.3.0-rc01 -> 2.3.0 (*) +| +--- androidx.cardview:cardview:1.0.0 -+| | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| +--- androidx.lifecycle:lifecycle-extensions:2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) @@ -161,50 +165,50 @@ +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) +| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) +| +--- 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 (*) ++| | +--- androidx.annotation:annotation:1.0.1 -> 1.2.0-beta01 ++| | +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-beta01 (*) +| | +--- androidx.cardview:cardview:1.0.0 (*) +| | +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -+| | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | | +--- androidx.customview:customview:1.0.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.0.4 -+| | | +--- androidx.appcompat:appcompat:1.2.0 (*) -+| | | +--- androidx.core:core:1.3.1 -> 1.3.2 (*) ++| | | +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-beta01 (*) ++| | | +--- androidx.core:core:1.3.1 -> 1.5.0-beta01 (*) +| | | \--- androidx.constraintlayout:constraintlayout-solver:2.0.4 -+| | +--- androidx.core:core:1.2.0 -> 1.3.2 (*) ++| | +--- androidx.core:core:1.2.0 -> 1.5.0-beta01 (*) +| | +--- androidx.dynamicanimation:dynamicanimation:1.0.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | +--- 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.1.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | +--- androidx.documentfile:documentfile:1.0.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | | +--- androidx.loader:loader:1.0.0 (*) +| | | +--- androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | | \--- androidx.print:print:1.0.0 -+| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | +--- androidx.annotation:annotation-experimental:1.0.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 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | | +--- 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 -+| | | +--- androidx.core:core:1.0.1 -> 1.3.2 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.0.1 -> 1.5.0-beta01 (*) +| | | \--- 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 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | +--- 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.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | \--- androidx.collection:collection:1.1.0 (*) +| \--- org.conscrypt:conscrypt-android:2.5.1 ++--- com.github.dmfs.opentasks:opentasks-provider:1.2.4 @@ -220,14 +224,14 @@ +| | +--- com.google.dagger:dagger:2.32 (*) +| | \--- javax.inject:javax.inject:1 +| +--- androidx.activity:activity:1.1.0 -> 1.2.0 (*) -+| +--- androidx.annotation:annotation:1.1.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- 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.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.hilt:hilt-common:1.0.0-alpha03 +| | \--- com.google.dagger:hilt-core:2.31-alpha -> 2.32-alpha (*) +| +--- androidx.work:work-runtime:2.3.4 -> 2.5.0 @@ -235,21 +239,21 @@ +| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*) +| | +--- androidx.room:room-runtime:2.2.5 +| | | +--- androidx.room:room-common:2.2.5 -+| | | | \--- androidx.annotation:annotation:1.1.0 ++| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | +--- androidx.sqlite:sqlite-framework:2.0.1 -> 2.1.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | | | \--- androidx.sqlite:sqlite:2.1.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | | +--- androidx.sqlite:sqlite:2.0.1 -> 2.1.0 (*) +| | | \--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*) +| | +--- androidx.sqlite:sqlite:2.1.0 (*) +| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*) -+| | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++| | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) +| \--- 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 -> 1.2.0 (*) -+| +--- androidx.annotation:annotation:1.1.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.hilt:hilt-common:1.0.0-alpha03 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 -> 2.3.0 (*) +| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.32-alpha (*) @@ -284,14 +288,14 @@ +| \--- org.reactivestreams:reactive-streams:1.0.2 ++--- androidx.paging:paging-runtime:2.1.2 +| +--- androidx.paging:paging-common:2.1.2 -+| | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | \--- 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.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.2 -+| +--- androidx.annotation:annotation:1.1.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| \--- com.atlassian.commonmark:commonmark:0.13.0 ++--- io.noties.markwon:ext-strikethrough:4.6.2 +| +--- io.noties.markwon:core:4.6.2 (*) @@ -300,8 +304,8 @@ ++--- com.jakewharton:butterknife:10.2.3 +| \--- com.jakewharton:butterknife-runtime:10.2.3 +| +--- com.jakewharton:butterknife-annotations:10.2.3 -+| | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| \--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| \--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) ++--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) @@ -313,18 +317,18 @@ +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.30 (*) ++--- com.google.code.gson:gson:2.8.6 ++--- com.google.android.material:material:1.3.0 (*) -++--- androidx.annotation:annotation:1.1.0 +++--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++--- androidx.constraintlayout:constraintlayout:2.0.4 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 -+| +--- androidx.annotation:annotation:1.1.0 -+| +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| \--- androidx.interpolator:interpolator:1.0.0 (*) ++--- 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.appcompat:appcompat:1.1.0 -> 1.3.0-beta01 (*) ++| +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| +--- 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.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++--- com.jakewharton.timber:timber:4.7.1 +| \--- org.jetbrains:annotations:16.0.1 @@ -332,7 +336,7 @@ ++--- com.twofortyfouram:android-plugin-api-for-locale:1.0.2 ++--- com.rubiconproject.oss:jchronic:0.2.6 ++--- com.wdullaer:materialdatetimepicker:4.2.3 -+| +--- androidx.appcompat:appcompat:1.0.2 -> 1.2.0 (*) ++| +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.0-beta01 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) ++--- me.leolin:ShortcutBadger:1.1.22 ++--- com.google.apis:google-api-services-tasks:v1-rev20210109-1.31.0 @@ -376,19 +380,100 @@ +| +--- org.apache.commons:commons-lang3:3.8.1 +| \--- commons-codec:commons-codec:1.7 -> 1.11 ++--- com.etebase:client:2.3.2 -+| +--- androidx.annotation:annotation:1.1.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 (*) ++--- com.github.QuadFlask:colorpicker:0.0.15 -+| \--- androidx.appcompat:appcompat:1.1.0 -> 1.2.0 (*) ++| \--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-beta01 (*) ++--- com.github.openid:AppAuth-Android:0.8.0 +| +--- androidx.browser:browser:1.2.0 -+| | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) -+| | +--- androidx.annotation:annotation:1.1.0 ++| | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | +--- androidx.collection:collection:1.1.0 (*) +| | +--- androidx.concurrent:concurrent-futures:1.0.0 +| | | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava -+| | | \--- androidx.annotation:annotation:1.1.0 ++| | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | \--- androidx.interpolator:interpolator:1.0.0 (*) -+| \--- androidx.annotation:annotation:1.1.0 -+\--- org.osmdroid:osmdroid-android:6.1.10 ++| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +++--- org.osmdroid:osmdroid-android:6.1.10 +++--- androidx.compose.ui:ui:1.0.0-beta01 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta01 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta01 ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta01 ++| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta01 ++| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta01 ++| | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| | | | | \--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | | \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta01 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| +--- androidx.compose.ui:ui-geometry:1.0.0-beta01 (*) ++| +--- androidx.compose.ui:ui-graphics:1.0.0-beta01 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta01 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| +--- androidx.compose.ui:ui-text:1.0.0-beta01 ++| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta01 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta01 (*) ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta01 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| | +--- androidx.collection:collection:1.1.0 (*) ++| | \--- androidx.core:core:1.5.0-beta01 (*) ++| +--- androidx.compose.ui:ui-unit:1.0.0-beta01 (*) ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| +--- androidx.autofill:autofill:1.0.0 ++| | \--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) ++| +--- androidx.fragment:fragment:1.3.0 (*) ++| \--- androidx.appcompat:appcompat:1.3.0-beta01 (*) ++\--- androidx.compose.foundation:foundation:1.0.0-beta01 ++ +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++ +--- androidx.compose.animation:animation:1.0.0-beta01 ++ | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++ | +--- androidx.compose.animation:animation-core:1.0.0-beta01 (*) ++ | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 ++ | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++ | | +--- androidx.compose.ui:ui:1.0.0-beta01 (*) ++ | | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++ | | +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++ | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++ | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++ | +--- androidx.compose.ui:ui:1.0.0-beta01 (*) ++ | +--- androidx.compose.ui:ui-geometry:1.0.0-beta01 (*) ++ | +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++ | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++ +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++ +--- androidx.compose.ui:ui:1.0.0-beta01 (*) ++ +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++ +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 (*) ++ +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*) ++ \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 744ebf991..d443673bb 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1,20 +1,20 @@ ++--- androidx.databinding:viewbinding:7.0.0-alpha08 -+| \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++--- androidx.databinding:databinding-common:7.0.0-alpha08 ++--- androidx.databinding:databinding-runtime:7.0.0-alpha08 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 -+| | \--- androidx.annotation:annotation:1.1.0 ++| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.databinding:databinding-common:7.0.0-alpha08 +| +--- androidx.databinding:viewbinding:7.0.0-alpha08 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.0 +| +--- androidx.arch.core:core-runtime:2.1.0 -+| | +--- androidx.annotation:annotation:1.1.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | \--- androidx.arch.core:core-common:2.1.0 -+| | \--- androidx.annotation:annotation:1.1.0 ++| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.lifecycle:lifecycle-common:2.3.0 -+| | \--- androidx.annotation:annotation:1.1.0 ++| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.arch.core:core-common:2.1.0 (*) -+| \--- androidx.annotation:annotation:1.1.0 ++| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++--- androidx.databinding:databinding-adapters:7.0.0-alpha08 +| +--- androidx.databinding:databinding-runtime:7.0.0-alpha08 (*) +| \--- androidx.databinding:databinding-common:7.0.0-alpha08 @@ -32,24 +32,24 @@ +| | +--- androidx.arch.core:core-common:2.1.0 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 (*) +| | +--- androidx.fragment:fragment:1.2.0 -> 1.3.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -+| | | +--- androidx.core:core:1.1.0 -> 1.3.2 -+| | | | +--- androidx.annotation:annotation:1.1.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 ++| | | | +--- androidx.annotation:annotation:1.2.0-beta01 +| | | | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.0 (*) +| | | | +--- androidx.versionedparcelable:versionedparcelable:1.1.0 -+| | | | | +--- androidx.annotation:annotation:1.1.0 ++| | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.collection:collection:1.1.0 (*) +| | | +--- androidx.viewpager:viewpager:1.0.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| | | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | | \--- androidx.customview:customview:1.0.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | | \--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| | | | \--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | +--- androidx.loader:loader:1.0.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| | | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | | +--- 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.0 @@ -58,24 +58,24 @@ +| | | | | | \--- androidx.lifecycle:lifecycle-common:2.3.0 (*) +| | | | | \--- androidx.arch.core:core-common:2.1.0 (*) +| | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.3.0 -+| | | | \--- androidx.annotation:annotation:1.1.0 ++| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | +--- androidx.activity:activity:1.2.0 -+| | | | +--- androidx.annotation:annotation:1.1.0 -+| | | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | | | +--- 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.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | | | +--- androidx.arch.core:core-common:2.0.1 -> 2.1.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.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | | | | +--- 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.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | +--- androidx.lifecycle:lifecycle-livedata-core:2.3.0 (*) +| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) +| | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0 (*) @@ -92,7 +92,7 @@ +| | +--- 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.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| +--- androidx.databinding:databinding-runtime:7.0.0-alpha08 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.30 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) @@ -100,30 +100,30 @@ +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++--- com.google.firebase:firebase-crashlytics:17.3.1 +| +--- com.google.android.datatransport:transport-api:2.2.1 -+| | \--- androidx.annotation:annotation:1.1.0 ++| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -+| | +--- androidx.annotation:annotation:1.1.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | +--- com.google.android.datatransport:transport-api:2.2.1 (*) +| | +--- com.google.android.datatransport:transport-runtime:2.2.5 -+| | | +--- androidx.annotation:annotation:1.1.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | +--- com.google.android.datatransport:transport-api:2.2.1 (*) +| | | \--- javax.inject:javax.inject:1 +| | +--- com.google.firebase:firebase-encoders:16.1.0 -+| | | \--- androidx.annotation:annotation:1.1.0 ++| | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | \--- com.google.firebase:firebase-encoders-json:17.1.0 -+| | +--- androidx.annotation:annotation:1.1.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | \--- 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.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.core:core:1.2.0 -> 1.5.0-beta01 (*) +| | \--- androidx.fragment:fragment:1.0.0 -> 1.3.0 (*) +| +--- com.google.firebase:firebase-common:19.5.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 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | \--- com.google.firebase:firebase-annotations:16.0.0 +| +--- com.google.firebase:firebase-components:16.1.0 (*) +| +--- com.google.firebase:firebase-encoders:16.1.0 (*) @@ -142,21 +142,21 @@ +| +--- com.google.android.gms:play-services-measurement:18.0.2 +| | +--- 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.1.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | +--- androidx.documentfile:documentfile:1.0.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | | +--- androidx.loader:loader:1.0.0 (*) +| | | +--- androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | | \--- androidx.print:print:1.0.0 -+| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | +--- 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.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 (*) ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | +--- 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 @@ -181,7 +181,7 @@ +| +--- 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 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- com.google.firebase:firebase-abt:20.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 (*) @@ -189,7 +189,7 @@ +| | \--- 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 -+| | +--- androidx.annotation:annotation:1.1.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | +--- com.google.firebase:firebase-common:19.5.0 (*) +| | +--- com.google.firebase:firebase-components:16.1.0 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.30 (*) @@ -208,7 +208,7 @@ ++--- 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.core:core:1.2.0 -> 1.5.0-beta01 (*) +| | +--- 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 (*) @@ -238,39 +238,43 @@ +| | \--- org.slf4j:slf4j-api:1.7.30 +| \--- androidx.core:core-ktx:1.3.2 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.4.30 (*) -+| +--- androidx.annotation:annotation:1.1.0 -+| \--- androidx.core:core:1.3.2 (*) ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| \--- androidx.core:core:1.3.2 -> 1.5.0-beta01 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f +| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha08 +| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha08 (*) +| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha08 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.30 (*) -+| +--- androidx.appcompat:appcompat:1.2.0 -+| | +--- androidx.annotation:annotation:1.1.0 -+| | +--- androidx.core:core:1.3.0 -> 1.3.2 (*) ++| +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-beta01 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | +--- androidx.core:core:1.5.0-beta01 (*) +| | +--- androidx.cursoradapter:cursoradapter:1.0.0 -+| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | +--- androidx.fragment:fragment:1.1.0 -> 1.3.0 (*) -+| | +--- androidx.appcompat:appcompat-resources:1.2.0 ++| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| | +--- androidx.activity:activity:1.2.0-rc01 -> 1.2.0 (*) ++| | +--- androidx.fragment:fragment:1.3.0-rc01 -> 1.3.0 (*) ++| | +--- androidx.appcompat:appcompat-resources:1.3.0-beta01 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) -+| | | +--- androidx.annotation:annotation:1.1.0 -+| | | +--- androidx.core:core:1.0.1 -> 1.3.2 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.0.1 -> 1.5.0-beta01 (*) +| | | +--- androidx.vectordrawable:vectordrawable:1.1.0 -+| | | | +--- androidx.annotation:annotation:1.1.0 -+| | | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | | | \--- androidx.collection:collection:1.1.0 (*) +| | | \--- androidx.vectordrawable:vectordrawable-animated:1.1.0 +| | | +--- androidx.vectordrawable:vectordrawable:1.1.0 (*) +| | | +--- androidx.interpolator:interpolator:1.0.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | | \--- androidx.collection:collection:1.1.0 (*) +| | +--- androidx.drawerlayout:drawerlayout:1.0.0 -+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | \--- androidx.customview:customview:1.0.0 (*) -+| | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++| | +--- androidx.savedstate:savedstate:1.1.0-rc01 -> 1.1.0 (*) ++| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++| | +--- androidx.lifecycle:lifecycle-runtime:2.3.0-rc01 -> 2.3.0 (*) ++| | \--- androidx.lifecycle:lifecycle-viewmodel:2.3.0-rc01 -> 2.3.0 (*) +| +--- androidx.cardview:cardview:1.0.0 -+| | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| +--- androidx.lifecycle:lifecycle-extensions:2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) @@ -284,41 +288,41 @@ +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.30 (*) +| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) +| +--- 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 (*) ++| | +--- androidx.annotation:annotation:1.0.1 -> 1.2.0-beta01 ++| | +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-beta01 (*) +| | +--- androidx.cardview:cardview:1.0.0 (*) +| | +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -+| | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | | +--- androidx.customview:customview:1.0.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.0.4 -+| | | +--- androidx.appcompat:appcompat:1.2.0 (*) -+| | | +--- androidx.core:core:1.3.1 -> 1.3.2 (*) ++| | | +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-beta01 (*) ++| | | +--- androidx.core:core:1.3.1 -> 1.5.0-beta01 (*) +| | | \--- androidx.constraintlayout:constraintlayout-solver:2.0.4 -+| | +--- androidx.core:core:1.2.0 -> 1.3.2 (*) ++| | +--- androidx.core:core:1.2.0 -> 1.5.0-beta01 (*) +| | +--- androidx.dynamicanimation:dynamicanimation:1.0.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) +| | | +--- 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.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 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | | +--- 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 -+| | | +--- androidx.core:core:1.0.1 -> 1.3.2 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- androidx.core:core:1.0.1 -> 1.5.0-beta01 (*) +| | | \--- 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 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | +--- 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.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | \--- androidx.collection:collection:1.1.0 (*) +| \--- org.conscrypt:conscrypt-android:2.5.1 ++--- com.github.dmfs.opentasks:opentasks-provider:1.2.4 @@ -334,14 +338,14 @@ +| | +--- com.google.dagger:dagger:2.32 (*) +| | \--- javax.inject:javax.inject:1 +| +--- androidx.activity:activity:1.1.0 -> 1.2.0 (*) -+| +--- androidx.annotation:annotation:1.1.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- 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.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.hilt:hilt-common:1.0.0-alpha03 +| | \--- com.google.dagger:hilt-core:2.31-alpha -> 2.32-alpha (*) +| +--- androidx.work:work-runtime:2.3.4 -> 2.5.0 @@ -349,21 +353,21 @@ +| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*) +| | +--- androidx.room:room-runtime:2.2.5 +| | | +--- androidx.room:room-common:2.2.5 -+| | | | \--- androidx.annotation:annotation:1.1.0 ++| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | +--- androidx.sqlite:sqlite-framework:2.0.1 -> 2.1.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | | | \--- androidx.sqlite:sqlite:2.1.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | | +--- androidx.sqlite:sqlite:2.0.1 -> 2.1.0 (*) +| | | \--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*) +| | +--- androidx.sqlite:sqlite:2.1.0 (*) +| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*) -+| | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++| | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) +| \--- 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 -> 1.2.0 (*) -+| +--- androidx.annotation:annotation:1.1.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.hilt:hilt-common:1.0.0-alpha03 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 -> 2.3.0 (*) +| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.32-alpha (*) @@ -398,14 +402,14 @@ +| \--- org.reactivestreams:reactive-streams:1.0.2 ++--- androidx.paging:paging-runtime:2.1.2 +| +--- androidx.paging:paging-common:2.1.2 -+| | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 +| | \--- 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.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.2 -+| +--- androidx.annotation:annotation:1.1.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| \--- com.atlassian.commonmark:commonmark:0.13.0 ++--- io.noties.markwon:ext-strikethrough:4.6.2 +| +--- io.noties.markwon:core:4.6.2 (*) @@ -414,8 +418,8 @@ ++--- com.jakewharton:butterknife:10.2.3 +| \--- com.jakewharton:butterknife-runtime:10.2.3 +| +--- com.jakewharton:butterknife-annotations:10.2.3 -+| | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| \--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 ++| \--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) ++--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) @@ -427,18 +431,18 @@ +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.30 (*) ++--- com.google.code.gson:gson:2.8.6 ++--- com.google.android.material:material:1.3.0 (*) -++--- androidx.annotation:annotation:1.1.0 +++--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++--- androidx.constraintlayout:constraintlayout:2.0.4 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 -+| +--- androidx.annotation:annotation:1.1.0 -+| +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| \--- androidx.interpolator:interpolator:1.0.0 (*) ++--- 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.appcompat:appcompat:1.1.0 -> 1.3.0-beta01 (*) ++| +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| +--- 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.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++--- com.jakewharton.timber:timber:4.7.1 +| \--- org.jetbrains:annotations:16.0.1 @@ -446,7 +450,7 @@ ++--- com.twofortyfouram:android-plugin-api-for-locale:1.0.2 ++--- com.rubiconproject.oss:jchronic:0.2.6 ++--- com.wdullaer:materialdatetimepicker:4.2.3 -+| +--- androidx.appcompat:appcompat:1.0.2 -> 1.2.0 (*) ++| +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.0-beta01 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) ++--- me.leolin:ShortcutBadger:1.1.22 ++--- com.google.apis:google-api-services-tasks:v1-rev20210109-1.31.0 @@ -490,19 +494,100 @@ +| +--- org.apache.commons:commons-lang3:3.8.1 +| \--- commons-codec:commons-codec:1.7 -> 1.11 ++--- com.etebase:client:2.3.2 -+| +--- androidx.annotation:annotation:1.1.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 (*) ++--- com.github.QuadFlask:colorpicker:0.0.15 -+| \--- androidx.appcompat:appcompat:1.1.0 -> 1.2.0 (*) ++| \--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-beta01 (*) ++--- com.github.openid:AppAuth-Android:0.8.0 +| +--- androidx.browser:browser:1.2.0 -+| | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) -+| | +--- androidx.annotation:annotation:1.1.0 ++| | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | +--- androidx.collection:collection:1.1.0 (*) +| | +--- androidx.concurrent:concurrent-futures:1.0.0 +| | | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava -+| | | \--- androidx.annotation:annotation:1.1.0 ++| | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | \--- androidx.interpolator:interpolator:1.0.0 (*) -+| \--- androidx.annotation:annotation:1.1.0 -+\--- org.osmdroid:osmdroid-android:6.1.10 ++| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +++--- org.osmdroid:osmdroid-android:6.1.10 +++--- androidx.compose.ui:ui:1.0.0-beta01 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta01 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta01 ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta01 ++| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta01 ++| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta01 ++| | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| | | | | \--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | | \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta01 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| +--- androidx.compose.ui:ui-geometry:1.0.0-beta01 (*) ++| +--- androidx.compose.ui:ui-graphics:1.0.0-beta01 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta01 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| +--- androidx.compose.ui:ui-text:1.0.0-beta01 ++| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta01 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta01 (*) ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta01 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| | +--- androidx.collection:collection:1.1.0 (*) ++| | \--- androidx.core:core:1.5.0-beta01 (*) ++| +--- androidx.compose.ui:ui-unit:1.0.0-beta01 (*) ++| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| +--- androidx.autofill:autofill:1.0.0 ++| | \--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) ++| +--- androidx.fragment:fragment:1.3.0 (*) ++| \--- androidx.appcompat:appcompat:1.3.0-beta01 (*) ++\--- androidx.compose.foundation:foundation:1.0.0-beta01 ++ +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++ +--- androidx.compose.animation:animation:1.0.0-beta01 ++ | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++ | +--- androidx.compose.animation:animation-core:1.0.0-beta01 (*) ++ | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 ++ | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 ++ | | +--- androidx.compose.ui:ui:1.0.0-beta01 (*) ++ | | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++ | | +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++ | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++ | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++ | +--- androidx.compose.ui:ui:1.0.0-beta01 (*) ++ | +--- androidx.compose.ui:ui-geometry:1.0.0-beta01 (*) ++ | +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++ | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++ +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++ +--- androidx.compose.ui:ui:1.0.0-beta01 (*) ++ +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++ +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 (*) ++ +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*) ++ \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)