Dependency updates & build fix

dkrivoruchko · Dec 23, 2021 · 1576971 · 1576971
1 parent d350620
commit 1576971
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId = "info.dvkr.screenstream"
         minSdkVersion(21)
         targetSdkVersion(31)
-        versionCode = 30805
-        versionName = "3.8.5"
+        versionCode = 30806
+        versionName = "3.8.6"
         resConfigs("en", "ru", "pt-rBR", "zh-rTW", "fr-rFR", "fa", "it", "pl", "hi", "de", "sk", "es", "ar", "ja", "gl", "ca", "uk", "nl")
 
         vectorDrawables.useSupportLibrary = true
@@ -91,8 +91,8 @@ dependencies {
 
     implementation(project(":data"))
 
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
 
     implementation("androidx.core:core-ktx:1.7.0")
     implementation("androidx.activity:activity-ktx:1.4.0")
@@ -101,10 +101,10 @@ dependencies {
     implementation("androidx.constraintlayout:constraintlayout:2.1.2")
     implementation("androidx.recyclerview:recyclerview:1.2.1")
     implementation("com.google.android.material:material:1.4.0")
-    implementation("androidx.window:window:1.0.0-beta04")
+    implementation("androidx.window:window:1.0.0-rc01")
 
-    implementation("androidx.navigation:navigation-fragment-ktx:2.4.0-beta02")
-    implementation("androidx.navigation:navigation-ui-ktx:2.4.0-beta02")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.4.0-rc01")
+    implementation("androidx.navigation:navigation-ui-ktx:2.4.0-rc01")
     implementation("androidx.lifecycle:lifecycle-livedata:2.4.0")
     implementation("androidx.lifecycle:lifecycle-common:2.4.0")
 
@@ -127,18 +127,14 @@ dependencies {
         exclude group: "androidx.fragment"
         exclude group: "androidx.core"
     }
-    firebaseImplementation("com.google.firebase:firebase-analytics:20.0.0")
-    firebaseImplementation("com.google.firebase:firebase-crashlytics:18.2.5")
+    firebaseImplementation("com.google.firebase:firebase-analytics:20.0.2")
+    firebaseImplementation("com.google.firebase:firebase-crashlytics:18.2.6")
     firebaseImplementation("com.google.android.gms:play-services-ads:20.5.0")
 
     debugImplementation("com.squareup.leakcanary:leakcanary-android:2.7")
 }
 
-afterEvaluate {
-    android.applicationVariants.all {
-        if (flavorName.contains("firebasefree")) {
-            project.tasks.getByName("injectCrashlyticsMappingFileId" + name.capitalize()).enabled = false
-            project.tasks.getByName("process" + name.capitalize() + "GoogleServices").enabled = false
-        }
-    }
+project.tasks.all {
+    if (name.startsWith("injectCrashlyticsMappingFileIdFirebasefree")) enabled = false
+    if (name.startsWith("processFirebasefree") && name.endsWith("GoogleServices")) enabled = false
 }
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
@@ -6,7 +6,7 @@
     <string name="error_ip_address_not_found">Non se atopou o enderezo IP.\nProba a deshabilitar \"Use WiFi só\" na configuración.</string>
     <string name="error_wrong_image_format">O sistema devolve a imaxe nun formato descoñecido. Non hai corrección dispoñible. Desculpa.</string>
     <string name="error_exit">Saír</string>
-    <string name="app_activity_collecting_logs">Recollendo rexistros de aplicacións ...</string>
+    <string name="app_activity_collecting_logs">Recollendo rexistros de aplicacións …</string>
     <string name="app_activity_send_logs">Envía rexistros ao creador</string>
 
     <string name="bottom_menu_stream">Stream</string>
@@ -103,6 +103,6 @@
     <string name="about_fragment_developer_name">Desenvolvido por Dmitriy Krivoruchko</string>
     <string name="about_fragment_rate_app">Valora a aplicación</string>
     <string name="about_fragment_write_email">Envíe un correo electrónico ao creador</string>
-    <string name="about_fragment_email_chooser_header">Enviando correo electrónico ...</string>
+    <string name="about_fragment_email_chooser_header">Enviando correo electrónico …</string>
     <string name="about_fragment_app_sources">Códigos fonte da aplicación</string>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath("com.android.tools.build:gradle:7.0.4")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
         classpath("com.google.gms:google-services:4.3.10")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.8.1")
     }

diff --git a/data/build.gradle b/data/build.gradle
@@ -26,11 +26,11 @@ android {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.10")
 
     implementation("androidx.core:core:1.7.0")
-    implementation("androidx.window:window:1.0.0-beta04")
+    implementation("androidx.window:window:1.0.0-rc01")
 
     implementation("io.ktor:ktor-server-cio:1.6.7")