From fd45cbe20ccd39e5e85ac7f6513ea34b40b7051c Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 3 Mar 2021 22:01:54 -0600 Subject: [PATCH] Upgrade to Android Studio Arctic Fox --- app/build.gradle.kts | 2 +- app/licenses.yml | 11 ++ app/src/main/assets/licenses.json | 27 +++ build.gradle.kts | 4 +- deps_fdroid.txt | 172 +++++++++--------- deps_googleplay.txt | 214 ++++++++++++----------- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 243 insertions(+), 189 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6b3018573..148d94395 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,7 +33,7 @@ android { dataBinding = true } - lintOptions { + lint { disable("InvalidPeriodicWorkRequestInterval") lintConfig = file("lint.xml") textOutput("stdout") diff --git a/app/licenses.yml b/app/licenses.yml index 633e6b6d6..24f4a2352 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -827,3 +827,14 @@ 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 +- artifact: androidx.databinding:databinding-ktx:+ + name: databinding-ktx + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt +- artifact: org.jetbrains.kotlin:kotlin-stdlib-jdk8:+ + name: kotlin-stdlib-jdk8 + copyrightHolder: JetBrains s.r.o. + license: The Apache License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://kotlinlang.org/ diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index f19b4d7c1..899b50e6f 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -1978,6 +1978,33 @@ "normalizedLicense": "apache2", "url": "https://developer.android.com/jetpack/androidx/releases/tracing#1.0.0", "libraryName": "tracing" + }, + { + "artifactId": { + "name": "databinding-ktx", + "group": "androidx.databinding", + "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", + "libraryName": "databinding-ktx" + }, + { + "artifactId": { + "name": "kotlin-stdlib-jdk8", + "group": "org.jetbrains.kotlin", + "version": "+" + }, + "copyrightHolder": "JetBrains s.r.o.", + "copyrightStatement": "Copyright © JetBrains s.r.o. All rights reserved.", + "license": "The Apache License, Version 2.0", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", + "normalizedLicense": "apache2", + "url": "https://kotlinlang.org/", + "libraryName": "kotlin-stdlib-jdk8" } ] } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 14b6a9e56..2648699e8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.2.0-beta05") + classpath("com.android.tools.build:gradle:7.0.0-alpha08") classpath("com.google.gms:google-services:4.3.5") classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") @@ -15,6 +15,6 @@ buildscript { } tasks.getByName("wrapper") { - gradleVersion = "6.7.1" + gradleVersion = "6.8.2" distributionType = Wrapper.DistributionType.ALL } diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 468b2dcc0..c5aeb85f4 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1,64 +1,45 @@ -++--- androidx.databinding:viewbinding:4.2.0-beta05 +++--- androidx.databinding:viewbinding:7.0.0-alpha08 +| \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -++--- androidx.databinding:databinding-common:4.2.0-beta05 -++--- androidx.databinding:databinding-runtime:4.2.0-beta05 -+| +--- androidx.databinding:viewbinding:4.2.0-beta05 (*) -+| +--- 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.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.databinding:databinding-common:4.2.0-beta05 -++--- androidx.databinding:databinding-adapters:4.2.0-beta05 -+| +--- androidx.databinding:databinding-common:4.2.0-beta05 -+| \--- androidx.databinding:databinding-runtime:4.2.0-beta05 (*) -++--- com.gitlab.abaker:dav4jvm:deb2c9aef8 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.30 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -+| | \--- org.jetbrains:annotations:13.0 -> 16.0.1 -+| \--- org.apache.commons:commons-lang3:3.8.1 -++--- com.gitlab.abaker:ical4android:0e928b567c -+| +--- org.mnode.ical4j:ical4j:3.0.21 -+| | +--- org.slf4j:slf4j-api:1.7.25 -> 1.7.30 -+| | +--- commons-codec:commons-codec:1.11 -+| | +--- org.apache.commons:commons-lang3:3.8.1 -+| | \--- org.apache.commons:commons-collections4:4.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.30 (*) -+| +--- com.sun.mail:android-mail:1.6.5 -+| | \--- com.sun.mail:android-activation:1.6.5 -+| +--- commons-io:commons-io:2.6 -+| +--- org.slf4j:slf4j-jdk14:1.7.30 -+| | \--- 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 -+| +--- 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 (*) -++--- com.gitlab.bitfireAT:cert4android:26a91a729f -+| +--- androidx.databinding:databinding-common:4.1.1 -> 4.2.0-beta05 -+| +--- androidx.databinding:databinding-runtime:4.1.1 -> 4.2.0-beta05 (*) -+| +--- androidx.databinding:databinding-adapters:4.1.1 -> 4.2.0-beta05 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 (*) -+| +--- androidx.appcompat:appcompat:1.2.0 -+| | +--- androidx.annotation:annotation:1.1.0 -+| | +--- 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.3.0 ++| +--- 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.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.databinding:databinding-adapters:7.0.0-alpha08 ++| +--- androidx.databinding:databinding-runtime:7.0.0-alpha08 (*) ++| \--- androidx.databinding:databinding-common:7.0.0-alpha08 +++--- androidx.databinding:databinding-ktx:7.0.0-alpha08 ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 ++| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1 ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| | | | \--- org.jetbrains:annotations:13.0 -> 16.0.1 ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.30 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) ++| +--- androidx.lifecycle:lifecycle-extensions: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.3.0 +| | | +--- androidx.annotation:annotation:1.1.0 -+| | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++| | | +--- androidx.core:core:1.1.0 -> 1.3.2 ++| | | | +--- androidx.annotation:annotation:1.1.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.collection:collection:1.1.0 (*) +| | | +--- androidx.viewpager:viewpager:1.0.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 @@ -100,6 +81,53 @@ +| | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0 (*) +| | | +--- androidx.savedstate:savedstate:1.1.0 (*) +| | | \--- androidx.annotation:annotation-experimental:1.0.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 -> 2.3.0 (*) ++| | +--- androidx.lifecycle:lifecycle-service: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-runtime-ktx:2.2.0 -> 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.databinding:databinding-runtime:7.0.0-alpha08 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.30 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.30 ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) +++--- com.gitlab.abaker:dav4jvm:deb2c9aef8 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.30 (*) ++| \--- org.apache.commons:commons-lang3:3.8.1 +++--- com.gitlab.abaker:ical4android:0e928b567c ++| +--- org.mnode.ical4j:ical4j:3.0.21 ++| | +--- org.slf4j:slf4j-api:1.7.25 -> 1.7.30 ++| | +--- commons-codec:commons-codec:1.11 ++| | +--- org.apache.commons:commons-lang3:3.8.1 ++| | \--- org.apache.commons:commons-collections4:4.1 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.30 (*) ++| +--- com.sun.mail:android-mail:1.6.5 ++| | \--- com.sun.mail:android-activation:1.6.5 ++| +--- commons-io:commons-io:2.6 ++| +--- org.slf4j:slf4j-jdk14:1.7.30 ++| | \--- 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 (*) +++--- 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.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.collection:collection:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.annotation:annotation:1.1.0 @@ -120,24 +148,10 @@ +| | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| +--- 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 -> 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.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 -> 2.3.0 (*) -+| | +--- androidx.lifecycle:lifecycle-service: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-extensions:2.2.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 -+| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.30 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.1 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 -> 2.3.0 +| | +--- androidx.lifecycle:lifecycle-livedata-core:2.3.0 (*) @@ -145,9 +159,7 @@ +| +--- 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 (*) ++| | \--- 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 (*) @@ -246,11 +258,7 @@ +| +--- 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.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-runtime-ktx:2.3.0 (*) +| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 (*) +| | +--- androidx.savedstate:savedstate-ktx:1.1.0 +| | | +--- androidx.savedstate:savedstate:1.1.0 (*) @@ -357,7 +365,7 @@ +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.30 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) ++--- com.etesync:journalmanager:1.1.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.30 (*) +| +--- com.madgag.spongycastle:core:1.54.0.0 +| +--- com.madgag.spongycastle:prov:1.54.0.0 +| | \--- com.madgag.spongycastle:core:1.54.0.0 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index a1cd19dee..744ebf991 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1,23 +1,103 @@ -++--- androidx.databinding:viewbinding:4.2.0-beta05 +++--- androidx.databinding:viewbinding:7.0.0-alpha08 +| \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -++--- androidx.databinding:databinding-common:4.2.0-beta05 -++--- androidx.databinding:databinding-runtime:4.2.0-beta05 -+| +--- androidx.databinding:viewbinding:4.2.0-beta05 (*) -+| +--- 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.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.databinding:databinding-common:4.2.0-beta05 -++--- androidx.databinding:databinding-adapters:4.2.0-beta05 -+| +--- androidx.databinding:databinding-common:4.2.0-beta05 -+| \--- androidx.databinding:databinding-runtime:4.2.0-beta05 (*) ++| +--- 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.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.databinding:databinding-adapters:7.0.0-alpha08 ++| +--- androidx.databinding:databinding-runtime:7.0.0-alpha08 (*) ++| \--- androidx.databinding:databinding-common:7.0.0-alpha08 +++--- androidx.databinding:databinding-ktx:7.0.0-alpha08 ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 ++| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1 ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| | | | \--- org.jetbrains:annotations:13.0 -> 16.0.1 ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.30 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) ++| +--- androidx.lifecycle:lifecycle-extensions: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.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 ++| | | +--- androidx.core:core:1.1.0 -> 1.3.2 ++| | | | +--- androidx.annotation:annotation:1.1.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.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.customview:customview:1.0.0 ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++| | | | \--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | +--- 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.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 ++| | | | | | +--- androidx.arch.core:core-common: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.3.0 ++| | | | \--- androidx.annotation:annotation: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.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.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.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 -> 2.3.0 (*) ++| | +--- androidx.lifecycle:lifecycle-service: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-runtime-ktx:2.2.0 -> 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.databinding:databinding-runtime:7.0.0-alpha08 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.30 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.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 @@ -37,57 +117,8 @@ +| +--- 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.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.3.0 -+| | +--- androidx.annotation:annotation:1.1.0 -+| | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) -+| | +--- 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.customview:customview:1.0.0 -+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | \--- androidx.core:core:1.0.0 -> 1.3.2 (*) -+| | +--- 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.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 -+| | | | | +--- androidx.arch.core:core-common: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.3.0 -+| | | \--- androidx.annotation:annotation: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.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.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.core:core:1.2.0 -> 1.3.2 (*) ++| | \--- 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 (*) @@ -161,10 +192,7 @@ +| | +--- androidx.annotation:annotation:1.1.0 +| | +--- 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.21 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.30 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -+| | \--- org.jetbrains:annotations:13.0 -> 16.0.1 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.30 (*) +| +--- 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.2.0 (*) @@ -176,7 +204,7 @@ +| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*) +| +--- com.google.firebase:firebase-installations:16.3.5 (*) +| +--- com.google.firebase:firebase-installations-interop:16.0.1 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.21 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.30 (*) ++--- 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 (*) @@ -202,7 +230,7 @@ +| | +--- commons-codec:commons-codec:1.11 +| | +--- org.apache.commons:commons-lang3:3.8.1 +| | \--- org.apache.commons:commons-collections4:4.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.30 (*) +| +--- com.sun.mail:android-mail:1.6.5 +| | \--- com.sun.mail:android-activation:1.6.5 +| +--- commons-io:commons-io:2.6 @@ -213,10 +241,10 @@ +| +--- androidx.annotation:annotation:1.1.0 +| \--- androidx.core:core:1.3.2 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f -+| +--- androidx.databinding:databinding-common:4.1.1 -> 4.2.0-beta05 -+| +--- androidx.databinding:databinding-runtime:4.1.1 -> 4.2.0-beta05 (*) -+| +--- androidx.databinding:databinding-adapters:4.1.1 -> 4.2.0-beta05 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 (*) ++| +--- 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 (*) @@ -243,24 +271,10 @@ +| | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| +--- 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 -> 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.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 -> 2.3.0 (*) -+| | +--- androidx.lifecycle:lifecycle-service: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-extensions:2.2.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 -+| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.30 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.1 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 -> 2.3.0 +| | +--- androidx.lifecycle:lifecycle-livedata-core:2.3.0 (*) @@ -268,9 +282,7 @@ +| +--- 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 (*) ++| | \--- 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 (*) @@ -360,11 +372,7 @@ +| +--- 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.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-runtime-ktx:2.3.0 (*) +| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 (*) +| | +--- androidx.savedstate:savedstate-ktx:1.1.0 +| | | +--- androidx.savedstate:savedstate:1.1.0 (*) @@ -471,7 +479,7 @@ +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.30 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) ++--- com.etesync:journalmanager:1.1.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.30 (*) +| +--- com.madgag.spongycastle:core:1.54.0.0 +| +--- com.madgag.spongycastle:prov:1.54.0.0 +| | \--- com.madgag.spongycastle:core:1.54.0.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1f3fdbc52..25d326531 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists