From 85e076d53031a1906c5e05b382fa951f6ca4f259 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Wed, 19 May 2021 11:39:17 -0400
Subject: [PATCH] Update dependencies

---
 build.gradle.kts                         |  6 +++---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 mobile/build.gradle.kts                  | 22 ++++++++++------------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f2c07323..2db313c0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,10 +10,10 @@ buildscript {
 
     dependencies {
         classpath(kotlin("gradle-plugin", "1.5.0"))
-        classpath("com.android.tools.build:gradle:4.2.0")
-        classpath("com.google.firebase:firebase-crashlytics-gradle:2.6.0")
+        classpath("com.android.tools.build:gradle:7.0.0-beta01")
+        classpath("com.google.firebase:firebase-crashlytics-gradle:2.6.1")
         classpath("com.google.android.gms:oss-licenses-plugin:0.10.4")
-        classpath("com.google.gms:google-services:4.3.5")
+        classpath("com.google.gms:google-services:4.3.8")
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f371643e..0f80bbf5 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-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts
index 26ca52b6..48e8161c 100644
--- a/mobile/build.gradle.kts
+++ b/mobile/build.gradle.kts
@@ -51,16 +51,14 @@ android {
     flavorDimensions("freedom")
     productFlavors {
         create("freedom") {
-            dimension("freedom")
+            setDimension("freedom")
         }
         create("google") {
-            dimension("freedom")
+            setDimension("freedom")
             buildConfigField("boolean", "DONATIONS", "false")
         }
     }
-    sourceSets.getByName("androidTest") {
-        assets.setSrcDirs(assets.srcDirs + files("$projectDir/schemas"))
-    }
+    sourceSets.getByName("androidTest").assets.srcDir("$projectDir/schemas")
 }
 
 dependencies {
@@ -70,28 +68,28 @@ dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
     kapt("androidx.room:room-compiler:$roomVersion")
     implementation(kotlin("stdlib-jdk8"))
-    implementation("androidx.appcompat:appcompat:1.3.0-rc01")   // https://issuetracker.google.com/issues/151603528
+    implementation("androidx.appcompat:appcompat:1.3.0")    // https://issuetracker.google.com/issues/151603528
     implementation("androidx.browser:browser:1.3.0")
-    implementation("androidx.core:core-ktx:1.5.0-rc02")
+    implementation("androidx.core:core-ktx:1.6.0-beta01")
     implementation("androidx.emoji:emoji:1.1.0")
-    implementation("androidx.fragment:fragment-ktx:1.3.3")
+    implementation("androidx.fragment:fragment-ktx:1.3.4")
     implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
     implementation("androidx.preference:preference:1.1.1")
     implementation("androidx.room:room-ktx:$roomVersion")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("com.android.billingclient:billing-ktx:3.0.3")
+    implementation("com.android.billingclient:billing-ktx:4.0.0")
     implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
     implementation("com.google.android.material:material:1.4.0-beta01")
-    implementation("com.google.firebase:firebase-analytics-ktx:18.0.3")
-    implementation("com.google.firebase:firebase-crashlytics:17.4.1")
+    implementation("com.google.firebase:firebase-analytics-ktx:19.0.0")
+    implementation("com.google.firebase:firebase-crashlytics:18.0.0")
     implementation("com.google.zxing:core:3.4.1")
     implementation("com.jakewharton.timber:timber:4.7.1")
     implementation("com.linkedin.dexmaker:dexmaker:2.28.1")
     implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0")
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.4")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0-RC")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.room:room-testing:$roomVersion")
     androidTestImplementation("androidx.test:runner:1.3.0")