Android Studio Arctic Fox alpha 15

pull/1481/head
Alex Baker 4 years ago
parent c72860d9d5
commit 8df31eaa65

@ -122,7 +122,6 @@ android {
resValue("string", "mapbox_key", tasks_mapbox_key ?: "") resValue("string", "mapbox_key", tasks_mapbox_key ?: "")
resValue("string", "google_key", tasks_google_key ?: "") resValue("string", "google_key", tasks_google_key ?: "")
isMinifyEnabled = true isMinifyEnabled = true
isShrinkResources = true
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard.pro") proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard.pro")
signingConfig = signingConfigs.getByName("release") signingConfig = signingConfigs.getByName("release")
} }
@ -132,10 +131,10 @@ android {
productFlavors { productFlavors {
create("generic") { create("generic") {
dimension("store") dimension = "store"
} }
create("googleplay") { create("googleplay") {
dimension("store") dimension = "store"
} }
} }

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:7.0.0-alpha14") classpath("com.android.tools.build:gradle:7.0.0-alpha15")
classpath("com.google.gms:google-services:4.3.5") classpath("com.google.gms:google-services:4.3.5")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.2") classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.2")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")

@ -1,11 +1,11 @@
++--- androidx.databinding:viewbinding:7.0.0-alpha14 ++--- androidx.databinding:viewbinding:7.0.0-alpha15
+| \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
++--- androidx.databinding:databinding-common:7.0.0-alpha14 ++--- androidx.databinding:databinding-common:7.0.0-alpha15
++--- androidx.databinding:databinding-runtime:7.0.0-alpha14 ++--- androidx.databinding:databinding-runtime:7.0.0-alpha15
+| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0
+| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+| +--- androidx.databinding:databinding-common:7.0.0-alpha14 +| +--- androidx.databinding:databinding-common:7.0.0-alpha15
+| +--- androidx.databinding:viewbinding:7.0.0-alpha14 (*) +| +--- androidx.databinding:viewbinding:7.0.0-alpha15 (*)
+| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1 +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1
+| +--- androidx.arch.core:core-runtime:2.1.0 +| +--- androidx.arch.core:core-runtime:2.1.0
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@ -15,10 +15,10 @@
+| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+| +--- androidx.arch.core:core-common:2.1.0 (*) +| +--- androidx.arch.core:core-common:2.1.0 (*)
+| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
++--- androidx.databinding:databinding-adapters:7.0.0-alpha14 ++--- androidx.databinding:databinding-adapters:7.0.0-alpha15
+| +--- androidx.databinding:databinding-runtime:7.0.0-alpha14 (*) +| +--- androidx.databinding:databinding-runtime:7.0.0-alpha15 (*)
+| \--- androidx.databinding:databinding-common:7.0.0-alpha14 +| \--- androidx.databinding:databinding-common:7.0.0-alpha15
++--- androidx.databinding:databinding-ktx:7.0.0-alpha14 ++--- androidx.databinding:databinding-ktx:7.0.0-alpha15
+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3
+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3
+| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3
@ -93,7 +93,7 @@
+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*)
+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
+| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
+| +--- androidx.databinding:databinding-runtime:7.0.0-alpha14 (*) +| +--- androidx.databinding:databinding-runtime:7.0.0-alpha15 (*)
+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32 +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
@ -118,9 +118,9 @@
+| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+| \--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*) +| \--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*)
++--- com.gitlab.bitfireAT:cert4android:26a91a729f ++--- com.gitlab.bitfireAT:cert4android:26a91a729f
+| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha14 +| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha15
+| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha14 (*) +| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha15 (*)
+| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha14 (*) +| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha15 (*)
+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*)
+| +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01 +| +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0

@ -1,11 +1,11 @@
++--- androidx.databinding:viewbinding:7.0.0-alpha14 ++--- androidx.databinding:viewbinding:7.0.0-alpha15
+| \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
++--- androidx.databinding:databinding-common:7.0.0-alpha14 ++--- androidx.databinding:databinding-common:7.0.0-alpha15
++--- androidx.databinding:databinding-runtime:7.0.0-alpha14 ++--- androidx.databinding:databinding-runtime:7.0.0-alpha15
+| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0
+| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+| +--- androidx.databinding:databinding-common:7.0.0-alpha14 +| +--- androidx.databinding:databinding-common:7.0.0-alpha15
+| +--- androidx.databinding:viewbinding:7.0.0-alpha14 (*) +| +--- androidx.databinding:viewbinding:7.0.0-alpha15 (*)
+| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1 +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1
+| +--- androidx.arch.core:core-runtime:2.1.0 +| +--- androidx.arch.core:core-runtime:2.1.0
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@ -15,10 +15,10 @@
+| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+| +--- androidx.arch.core:core-common:2.1.0 (*) +| +--- androidx.arch.core:core-common:2.1.0 (*)
+| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
++--- androidx.databinding:databinding-adapters:7.0.0-alpha14 ++--- androidx.databinding:databinding-adapters:7.0.0-alpha15
+| +--- androidx.databinding:databinding-runtime:7.0.0-alpha14 (*) +| +--- androidx.databinding:databinding-runtime:7.0.0-alpha15 (*)
+| \--- androidx.databinding:databinding-common:7.0.0-alpha14 +| \--- androidx.databinding:databinding-common:7.0.0-alpha15
++--- androidx.databinding:databinding-ktx:7.0.0-alpha14 ++--- androidx.databinding:databinding-ktx:7.0.0-alpha15
+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3
+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3
+| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3
@ -93,7 +93,7 @@
+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*)
+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
+| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
+| +--- androidx.databinding:databinding-runtime:7.0.0-alpha14 (*) +| +--- androidx.databinding:databinding-runtime:7.0.0-alpha15 (*)
+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32 +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
@ -244,9 +244,9 @@
+| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+| \--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*) +| \--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*)
++--- com.gitlab.bitfireAT:cert4android:26a91a729f ++--- com.gitlab.bitfireAT:cert4android:26a91a729f
+| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha14 +| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha15
+| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha14 (*) +| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha15 (*)
+| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha14 (*) +| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha15 (*)
+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*)
+| +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01 +| +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

Loading…
Cancel
Save