From 0b8ae760ccc9dec0396ab25298caa97427f620de Mon Sep 17 00:00:00 2001
From: Javinator9889 <dev@javinator9889.com>
Date: Wed, 29 Apr 2020 11:48:37 +0200
Subject: [PATCH] Updated Crashlytics to stable version

In addition, the coroutine for initializing Firebase was reduced in favour of its provider
---
 app/build.gradle                                           | 7 ++++++-
 app/proguard-rules.pro                                     | 4 ----
 .../application/HandwashingApplication.kt                  | 7 -------
 build.gradle                                               | 2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c426556..9d365b5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,6 +83,10 @@ android {
             jniDebuggable false
             renderscriptDebuggable false
             zipAlignEnabled true
+            /*firebaseCrashlytics {
+                // When manually initializing Firebase, Crashlytics mapping upload does not work
+                mappingFileUploadEnabled false
+            }*/
         }
     }
     dexOptions {
@@ -146,7 +150,7 @@ dependencies {
     // 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-crashlytics:17.0.0-beta04'
+    api 'com.google.firebase:firebase-crashlytics:17.0.0'
     api 'com.google.firebase:firebase-perf:19.0.6'
     // http://airbnb.io/lottie/#/android?id=getting-started
     api "com.airbnb.android:lottie:3.4.0"
@@ -191,3 +195,4 @@ dependencies {
     // https://github.com/deano2390/MaterialShowcaseView
     implementation 'com.github.deano2390:MaterialShowcaseView:1.3.4'
 }
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index d890619..7d0df06 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -80,10 +80,6 @@
 #data models
 -keep class com.javinator9889.handwashingreminder.collections.** { *;}
 
-# prevent Crashlytics obfuscation
--keep class com.google.firebase.crashlytics.** { *; }
--dontwarn com.google.firebase.crashlytics.**
-
 -keepclassmembers enum * {
     public static **[] values();
     public static ** valueOf(java.lang.String);
diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/application/HandwashingApplication.kt b/app/src/main/java/com/javinator9889/handwashingreminder/application/HandwashingApplication.kt
index a52efbc..dbb90f9 100644
--- a/app/src/main/java/com/javinator9889/handwashingreminder/application/HandwashingApplication.kt
+++ b/app/src/main/java/com/javinator9889/handwashingreminder/application/HandwashingApplication.kt
@@ -23,8 +23,6 @@ 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.FirebaseOptions
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.javinator9889.handwashingreminder.gms.activity.ActivityHandler
 import com.javinator9889.handwashingreminder.gms.ads.AdLoader
@@ -72,11 +70,6 @@ class HandwashingApplication : BaseApplication() {
     private fun initFirebaseAppAsync(): Deferred<Unit> {
         return GlobalScope.async {
             withContext(Dispatchers.IO) {
-                FirebaseApp.initializeApp(
-                    this@HandwashingApplication,
-                    FirebaseOptions
-                        .fromResource(this@HandwashingApplication)!!
-                )
                 if (isDebuggable()) {
                     Timber.plant(Timber.DebugTree())
                     Timber.d("Application is in DEBUG mode")
diff --git a/build.gradle b/build.gradle
index dad0e28..853987b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${latestAboutLibsRelease}"
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.0.0-beta04'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.0.0'
         classpath 'com.google.firebase:perf-plugin:1.3.1'  // Performance Monitoring plugin
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files