Merge branch 'development' into 'master'

Javinator9889 · Apr 30, 2020 · a6aef51 · a6aef51
2 parents 61c068e + 58ffd8a
commit a6aef51
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -42,7 +42,7 @@ android {
         applicationId "com.javinator9889.handwashingreminder"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 117
+        versionCode 118
         versionName "1.1.2-${gitCommitHash}"
         multiDexEnabled true
         resConfigs "en", "es"
@@ -83,10 +83,6 @@ android {
             jniDebuggable false
             renderscriptDebuggable false
             zipAlignEnabled true
-            /*firebaseCrashlytics {
-                // When manually initializing Firebase, Crashlytics mapping upload does not work
-                mappingFileUploadEnabled false
-            }*/
         }
     }
     dexOptions {
@@ -149,14 +145,14 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     // https://firebase.google.com/docs/android/setup#add-sdks
     api 'com.google.firebase:firebase-common-ktx:19.3.0'
-    api 'com.google.firebase:firebase-analytics:17.3.0'
+    api 'com.google.firebase:firebase-analytics:17.4.0'
     api 'com.google.firebase:firebase-crashlytics:17.0.0'
-    api 'com.google.firebase:firebase-perf:19.0.6'
+    api 'com.google.firebase:firebase-perf:19.0.7'
     // http://airbnb.io/lottie/#/android?id=getting-started
     api "com.airbnb.android:lottie:3.4.0"
     // https://firebase.google.com/docs/remote-config/use-config-android
-    implementation 'com.google.firebase:firebase-config:19.1.3'
-    implementation 'com.google.firebase:firebase-config-ktx:19.1.3'
+    implementation 'com.google.firebase:firebase-config:19.1.4'
+    implementation 'com.google.firebase:firebase-config-ktx:19.1.4'
     // https://mvnrepository.com/artifact/androidx.emoji/emoji/1.0.0
     api 'androidx.emoji:emoji:1.0.0'
     api 'androidx.emoji:emoji-appcompat:1.0.0'

diff --git a/...src/main/java/com/javinator9889/handwashingreminder/application/HandwashingApplication.kt b/...src/main/java/com/javinator9889/handwashingreminder/application/HandwashingApplication.kt
@@ -23,6 +23,7 @@ import android.content.SharedPreferences
 import androidx.multidex.MultiDex
 import androidx.preference.PreferenceManager
 import com.google.android.play.core.splitcompat.SplitCompat
+import com.google.firebase.FirebaseApp
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.javinator9889.handwashingreminder.gms.activity.ActivityHandler
 import com.javinator9889.handwashingreminder.gms.ads.AdLoader
@@ -70,6 +71,7 @@ class HandwashingApplication : BaseApplication() {
     private fun initFirebaseAppAsync(): Deferred<Unit> {
         return GlobalScope.async {
             withContext(Dispatchers.IO) {
+                FirebaseApp.initializeApp(this@HandwashingApplication)
                 if (isDebuggable()) {
                     Timber.plant(Timber.DebugTree())
                     Timber.d("Application is in DEBUG mode")