diff --git a/app/build.gradle.kts b/app/build.gradle.kts index da78e9bda..3f59bb17b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -129,9 +129,7 @@ configure { } configurations.all { - exclude(group = "com.google.guava", module = "guava-jdk5") exclude(group = "org.apache.httpcomponents", module = "httpclient") - exclude(group = "com.google.http-client", module = "google-http-client-apache") exclude(group = "org.checkerframework") exclude(group = "com.google.code.findbugs") exclude(group = "com.google.errorprone") diff --git a/build.gradle.kts b/build.gradle.kts index 15217899b..8bce0c942 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.0.2") 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 245c1e7b7..d9f44baef 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1,8 +1,8 @@ -++--- androidx.databinding:viewbinding:4.0.1 +++--- androidx.databinding:viewbinding:4.0.2 +| \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -++--- androidx.databinding:databinding-common:4.0.1 -++--- androidx.databinding:databinding-runtime:4.0.1 -+| +--- androidx.databinding:viewbinding:4.0.1 (*) +++--- androidx.databinding:databinding-common:4.0.2 +++--- androidx.databinding:databinding-runtime:4.0.2 ++| +--- androidx.databinding:viewbinding:4.0.2 (*) +| +--- 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.1 -++--- androidx.databinding:databinding-adapters:4.0.1 -+| +--- androidx.databinding:databinding-common:4.0.1 -+| \--- androidx.databinding:databinding-runtime:4.0.1 (*) ++| \--- 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 (*) ++--- 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:767d1f9759 -+| +--- androidx.databinding:databinding-common:4.0.0 -> 4.0.1 -+| +--- androidx.databinding:databinding-runtime:4.0.0 -> 4.0.1 (*) -+| +--- androidx.databinding:databinding-adapters:4.0.0 -> 4.0.1 (*) ++| +--- androidx.databinding:databinding-common:4.0.0 -> 4.0.2 ++| +--- androidx.databinding:databinding-runtime:4.0.0 -> 4.0.2 (*) ++| +--- androidx.databinding:databinding-adapters:4.0.0 -> 4.0.2 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 (*) +| +--- androidx.appcompat:appcompat:1.1.0 -> 1.2.0 +| | +--- androidx.annotation:annotation:1.1.0 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 40497a841..8e0b1c416 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1,8 +1,8 @@ -++--- androidx.databinding:viewbinding:4.0.1 +++--- androidx.databinding:viewbinding:4.0.2 +| \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -++--- androidx.databinding:databinding-common:4.0.1 -++--- androidx.databinding:databinding-runtime:4.0.1 -+| +--- androidx.databinding:viewbinding:4.0.1 (*) +++--- androidx.databinding:databinding-common:4.0.2 +++--- androidx.databinding:databinding-runtime:4.0.2 ++| +--- androidx.databinding:viewbinding:4.0.2 (*) +| +--- 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.1 -++--- androidx.databinding:databinding-adapters:4.0.1 -+| +--- androidx.databinding:databinding-common:4.0.1 -+| \--- androidx.databinding:databinding-runtime:4.0.1 (*) ++| \--- 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 (*) ++--- com.google.firebase:firebase-crashlytics:17.2.2 +| +--- com.google.android.datatransport:transport-api:2.2.1 +| | \--- androidx.annotation:annotation:1.1.0 @@ -272,9 +272,9 @@ +| +--- androidx.annotation:annotation:1.1.0 +| \--- androidx.core:core:1.3.1 (*) ++--- com.gitlab.bitfireAT:cert4android:767d1f9759 -+| +--- androidx.databinding:databinding-common:4.0.0 -> 4.0.1 -+| +--- androidx.databinding:databinding-runtime:4.0.0 -> 4.0.1 (*) -+| +--- androidx.databinding:databinding-adapters:4.0.0 -> 4.0.1 (*) ++| +--- androidx.databinding:databinding-common:4.0.0 -> 4.0.2 ++| +--- androidx.databinding:databinding-runtime:4.0.0 -> 4.0.2 (*) ++| +--- androidx.databinding:databinding-adapters:4.0.0 -> 4.0.2 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 (*) +| +--- androidx.appcompat:appcompat:1.1.0 -> 1.2.0 (*) +| +--- androidx.cardview:cardview:1.0.0 (*)