From 10996ca288f700b45adee9b79f53655a54147650 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 12 Oct 2020 17:49:55 -0500 Subject: [PATCH] Android Studio 4.1 --- app/build.gradle.kts | 2 +- build.gradle.kts | 2 +- deps_fdroid.txt | 26 +++++++------- deps_googleplay.txt | 44 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 3 +- 5 files changed, 39 insertions(+), 38 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 95c0b7605..f8eda9ea9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -73,7 +73,7 @@ android { } compileOptions { - coreLibraryDesugaringEnabled = true + isCoreLibraryDesugaringEnabled = true sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/build.gradle.kts b/build.gradle.kts index 8bce0c942..cef079e32 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.2") + classpath("com.android.tools.build:gradle:4.1.0") classpath("com.google.gms:google-services:4.3.3") classpath("com.google.firebase:firebase-crashlytics-gradle:2.2.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 0be7094c9..d46b07770 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1,8 +1,8 @@ -++--- androidx.databinding:viewbinding:4.0.2 +++--- androidx.databinding:viewbinding:4.1.0 +| \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -++--- androidx.databinding:databinding-common:4.0.2 -++--- androidx.databinding:databinding-runtime:4.0.2 -+| +--- androidx.databinding:viewbinding:4.0.2 (*) +++--- androidx.databinding:databinding-common:4.1.0 +++--- androidx.databinding:databinding-runtime:4.1.0 ++| +--- androidx.databinding:viewbinding:4.1.0 (*) +| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 +| | +--- androidx.lifecycle:lifecycle-common:2.2.0 +| | | \--- androidx.annotation:annotation:1.1.0 @@ -11,10 +11,10 @@ +| | \--- androidx.annotation:annotation:1.1.0 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| | \--- androidx.annotation:annotation:1.1.0 -+| \--- androidx.databinding:databinding-common:4.0.2 -++--- androidx.databinding:databinding-adapters:4.0.2 -+| +--- androidx.databinding:databinding-common:4.0.2 -+| \--- androidx.databinding:databinding-runtime:4.0.2 (*) ++| \--- androidx.databinding:databinding-common:4.1.0 +++--- androidx.databinding:databinding-adapters:4.1.0 ++| +--- androidx.databinding:databinding-common:4.1.0 ++| \--- androidx.databinding:databinding-runtime:4.1.0 (*) ++--- com.mapbox.mapboxsdk:mapbox-android-sdk:7.4.1 +| +--- com.mapbox.mapboxsdk:mapbox-android-telemetry:4.4.1 +| | +--- com.squareup.okhttp3:okhttp:3.10.0 -> 4.8.1 @@ -114,9 +114,9 @@ +| +--- androidx.annotation:annotation:1.1.0 +| \--- androidx.core:core:1.3.1 (*) ++--- com.gitlab.bitfireAT:cert4android:72cf235ad9 -+| +--- androidx.databinding:databinding-common:4.0.1 -> 4.0.2 -+| +--- androidx.databinding:databinding-runtime:4.0.1 -> 4.0.2 (*) -+| +--- androidx.databinding:databinding-adapters:4.0.1 -> 4.0.2 (*) ++| +--- androidx.databinding:databinding-common:4.0.1 -> 4.1.0 ++| +--- androidx.databinding:databinding-runtime:4.0.1 -> 4.1.0 (*) ++| +--- androidx.databinding:databinding-adapters:4.0.1 -> 4.1.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10 (*) +| +--- androidx.appcompat:appcompat:1.2.0 +| | +--- androidx.annotation:annotation:1.1.0 @@ -226,7 +226,7 @@ +| | | | \--- androidx.annotation:annotation:1.1.0 +| | | +--- androidx.sqlite:sqlite-framework:2.0.1 -> 2.1.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | | \--- androidx.sqlite:sqlite:[2.1.0] -> 2.1.0 ++| | | | \--- androidx.sqlite:sqlite:2.1.0 +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | | +--- androidx.sqlite:sqlite:2.0.1 -> 2.1.0 (*) +| | | \--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*) @@ -243,7 +243,7 @@ +| \--- com.google.dagger:hilt-android:2.28-alpha -> 2.29.1-alpha (*) ++--- androidx.fragment:fragment-ktx:1.2.5 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.10 (*) -+| +--- androidx.fragment:fragment:[1.2.5] -> 1.2.5 (*) ++| +--- androidx.fragment:fragment:1.2.5 (*) +| +--- androidx.activity:activity-ktx:1.1.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.10 (*) +| | +--- androidx.activity:activity:1.1.0 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index f762aee25..bac24071a 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1,8 +1,8 @@ -++--- androidx.databinding:viewbinding:4.0.2 +++--- androidx.databinding:viewbinding:4.1.0 +| \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -++--- androidx.databinding:databinding-common:4.0.2 -++--- androidx.databinding:databinding-runtime:4.0.2 -+| +--- androidx.databinding:viewbinding:4.0.2 (*) +++--- androidx.databinding:databinding-common:4.1.0 +++--- androidx.databinding:databinding-runtime:4.1.0 ++| +--- androidx.databinding:viewbinding:4.1.0 (*) +| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 +| | +--- androidx.lifecycle:lifecycle-common:2.2.0 +| | | \--- androidx.annotation:annotation:1.1.0 @@ -11,10 +11,10 @@ +| | \--- androidx.annotation:annotation:1.1.0 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| | \--- androidx.annotation:annotation:1.1.0 -+| \--- androidx.databinding:databinding-common:4.0.2 -++--- androidx.databinding:databinding-adapters:4.0.2 -+| +--- androidx.databinding:databinding-common:4.0.2 -+| \--- androidx.databinding:databinding-runtime:4.0.2 (*) ++| \--- androidx.databinding:databinding-common:4.1.0 +++--- androidx.databinding:databinding-adapters:4.1.0 ++| +--- androidx.databinding:databinding-common:4.1.0 ++| \--- androidx.databinding:databinding-runtime:4.1.0 (*) ++--- com.google.firebase:firebase-crashlytics:17.2.2 +| +--- com.google.android.datatransport:transport-api:2.2.1 +| | \--- androidx.annotation:annotation:1.1.0 @@ -122,14 +122,14 @@ +| | +--- com.google.android.gms:play-services-ads-identifier:17.0.0 +| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:[17.6.0] -> 17.6.0 ++| | +--- com.google.android.gms:play-services-measurement-base:17.6.0 +| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-impl:[17.6.0] -> 17.6.0 ++| | +--- com.google.android.gms:play-services-measurement-impl:17.6.0 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.core:core:1.0.0 -> 1.3.1 (*) +| | | +--- com.google.android.gms:play-services-ads-identifier:17.0.0 (*) +| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | | +--- com.google.android.gms:play-services-measurement-base:[17.6.0] -> 17.6.0 (*) ++| | | +--- com.google.android.gms:play-services-measurement-base:17.6.0 (*) +| | | \--- com.google.android.gms:play-services-stats:17.0.0 +| | | +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) +| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) @@ -137,11 +137,11 @@ +| +--- com.google.android.gms:play-services-measurement-api:17.6.0 +| | +--- com.google.android.gms:play-services-ads-identifier:17.0.0 (*) +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:[17.6.0] -> 17.6.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-impl:[17.6.0] -> 17.6.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-sdk-api:[17.6.0] -> 17.6.0 ++| | +--- com.google.android.gms:play-services-measurement-base:17.6.0 (*) ++| | +--- com.google.android.gms:play-services-measurement-impl:17.6.0 (*) ++| | +--- com.google.android.gms:play-services-measurement-sdk-api:17.6.0 +| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | | \--- com.google.android.gms:play-services-measurement-base:[17.6.0] -> 17.6.0 (*) ++| | | \--- com.google.android.gms:play-services-measurement-base:17.6.0 (*) +| | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.1.0 (*) +| | +--- com.google.firebase:firebase-common:19.3.0 -> 19.3.1 (*) +| | +--- com.google.firebase:firebase-components:16.0.0 (*) @@ -151,8 +151,8 @@ +| \--- com.google.android.gms:play-services-measurement-sdk:17.6.0 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| +--- com.google.android.gms:play-services-measurement-base:[17.6.0] -> 17.6.0 (*) -+| \--- com.google.android.gms:play-services-measurement-impl:[17.6.0] -> 17.6.0 (*) ++| +--- com.google.android.gms:play-services-measurement-base:17.6.0 (*) ++| \--- com.google.android.gms:play-services-measurement-impl:17.6.0 (*) ++--- com.google.firebase:firebase-config-ktx:19.2.0 +| +--- androidx.annotation:annotation:1.1.0 +| +--- com.google.firebase:firebase-abt:19.1.0 @@ -272,9 +272,9 @@ +| +--- androidx.annotation:annotation:1.1.0 +| \--- androidx.core:core:1.3.1 (*) ++--- com.gitlab.bitfireAT:cert4android:72cf235ad9 -+| +--- androidx.databinding:databinding-common:4.0.1 -> 4.0.2 -+| +--- androidx.databinding:databinding-runtime:4.0.1 -> 4.0.2 (*) -+| +--- androidx.databinding:databinding-adapters:4.0.1 -> 4.0.2 (*) ++| +--- androidx.databinding:databinding-common:4.0.1 -> 4.1.0 ++| +--- androidx.databinding:databinding-runtime:4.0.1 -> 4.1.0 (*) ++| +--- androidx.databinding:databinding-adapters:4.0.1 -> 4.1.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10 (*) +| +--- androidx.appcompat:appcompat:1.2.0 (*) +| +--- androidx.cardview:cardview:1.0.0 (*) @@ -344,7 +344,7 @@ +| | | | \--- androidx.annotation:annotation:1.1.0 +| | | +--- androidx.sqlite:sqlite-framework:2.0.1 -> 2.1.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | | | \--- androidx.sqlite:sqlite:[2.1.0] -> 2.1.0 ++| | | | \--- androidx.sqlite:sqlite:2.1.0 +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | | +--- androidx.sqlite:sqlite:2.0.1 -> 2.1.0 (*) +| | | \--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*) @@ -361,7 +361,7 @@ +| \--- com.google.dagger:hilt-android:2.28-alpha -> 2.29.1-alpha (*) ++--- androidx.fragment:fragment-ktx:1.2.5 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.10 (*) -+| +--- androidx.fragment:fragment:[1.2.5] -> 1.2.5 (*) ++| +--- androidx.fragment:fragment:1.2.5 (*) +| +--- androidx.activity:activity-ktx:1.1.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.10 (*) +| | +--- androidx.activity:activity:1.1.0 (*) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..6593c46b6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Oct 12 14:08:41 CDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip