From bfd033fa823b07bb25dbaace9dc11af282d49be9 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 29 Jul 2021 12:38:23 -0500 Subject: [PATCH] Android Studio 2020.3.1 --- build.gradle.kts | 2 +- deps_fdroid.txt | 26 +++++++++++++------------- deps_googleplay.txt | 26 +++++++++++++------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index da65bc2a9..84801eb5d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:7.0.0-rc01") + classpath("com.android.tools.build:gradle:7.0.0") classpath("com.google.gms:google-services:4.3.8") classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 11197671c..50a1dab7d 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1,11 +1,11 @@ -++--- androidx.databinding:viewbinding:7.0.0-rc01 +++--- androidx.databinding:viewbinding:7.0.0 +| \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -++--- androidx.databinding:databinding-common:7.0.0-rc01 -++--- androidx.databinding:databinding-runtime:7.0.0-rc01 +++--- androidx.databinding:databinding-common:7.0.0 +++--- androidx.databinding:databinding-runtime:7.0.0 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.databinding:databinding-common:7.0.0-rc01 -+| +--- androidx.databinding:viewbinding:7.0.0-rc01 (*) ++| +--- androidx.databinding:databinding-common:7.0.0 ++| +--- androidx.databinding:viewbinding:7.0.0 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1 +| +--- androidx.arch.core:core-runtime:2.1.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -15,10 +15,10 @@ +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.arch.core:core-common:2.1.0 (*) +| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -++--- androidx.databinding:databinding-adapters:7.0.0-rc01 -+| +--- androidx.databinding:databinding-runtime:7.0.0-rc01 (*) -+| \--- androidx.databinding:databinding-common:7.0.0-rc01 -++--- androidx.databinding:databinding-ktx:7.0.0-rc01 +++--- androidx.databinding:databinding-adapters:7.0.0 ++| +--- androidx.databinding:databinding-runtime:7.0.0 (*) ++| \--- androidx.databinding:databinding-common:7.0.0 +++--- androidx.databinding:databinding-ktx:7.0.0 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0 @@ -96,7 +96,7 @@ +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 (*) +| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| +--- androidx.databinding:databinding-runtime:7.0.0-rc01 (*) ++| +--- androidx.databinding:databinding-runtime:7.0.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 -> 1.5.10 (*) ++--- com.gitlab.abaker:dav4jvm:deb2c9aef8 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.5.10 (*) @@ -118,9 +118,9 @@ +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- androidx.core:core:1.3.2 -> 1.5.0 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f -+| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-rc01 -+| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-rc01 (*) -+| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-rc01 (*) ++| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0 ++| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0 (*) ++| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.10 (*) +| +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 337dbb757..954b634e8 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1,11 +1,11 @@ -++--- androidx.databinding:viewbinding:7.0.0-rc01 +++--- androidx.databinding:viewbinding:7.0.0 +| \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -++--- androidx.databinding:databinding-common:7.0.0-rc01 -++--- androidx.databinding:databinding-runtime:7.0.0-rc01 +++--- androidx.databinding:databinding-common:7.0.0 +++--- androidx.databinding:databinding-runtime:7.0.0 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.databinding:databinding-common:7.0.0-rc01 -+| +--- androidx.databinding:viewbinding:7.0.0-rc01 (*) ++| +--- androidx.databinding:databinding-common:7.0.0 ++| +--- androidx.databinding:viewbinding:7.0.0 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1 +| +--- androidx.arch.core:core-runtime:2.1.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -15,10 +15,10 @@ +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.arch.core:core-common:2.1.0 (*) +| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -++--- androidx.databinding:databinding-adapters:7.0.0-rc01 -+| +--- androidx.databinding:databinding-runtime:7.0.0-rc01 (*) -+| \--- androidx.databinding:databinding-common:7.0.0-rc01 -++--- androidx.databinding:databinding-ktx:7.0.0-rc01 +++--- androidx.databinding:databinding-adapters:7.0.0 ++| +--- androidx.databinding:databinding-runtime:7.0.0 (*) ++| \--- androidx.databinding:databinding-common:7.0.0 +++--- androidx.databinding:databinding-ktx:7.0.0 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0 @@ -96,7 +96,7 @@ +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 (*) +| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| +--- androidx.databinding:databinding-runtime:7.0.0-rc01 (*) ++| +--- androidx.databinding:databinding-runtime:7.0.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 -> 1.5.10 (*) ++--- com.google.firebase:firebase-crashlytics:18.0.0 +| +--- com.google.android.datatransport:transport-api:3.0.0 @@ -246,9 +246,9 @@ +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- androidx.core:core:1.3.2 -> 1.5.0 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f -+| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-rc01 -+| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-rc01 (*) -+| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-rc01 (*) ++| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0 ++| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0 (*) ++| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.10 (*) +| +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0