From b263278d98f6e772c93cd8f038f057a8abe2d2f2 Mon Sep 17 00:00:00 2001
From: Filip Babic <fbabic96@gmail.com>
Date: Sun, 18 Oct 2020 16:00:21 +0200
Subject: [PATCH 1/2] Migrated to firebase crashlytics, minor version upgrades

---
 app/build.gradle                              |  9 ++++----
 app/src/main/AndroidManifest.xml              |  4 ----
 .../java/com/razeware/emitron/MainActivity.kt |  9 ++++----
 .../emitron/ui/settings/SettingsFragment.kt   | 14 ++++++------
 .../java/com/razeware/emitron/utils/Log.kt    |  6 ++---
 build.gradle                                  | 22 ++++++++-----------
 gradle/wrapper/gradle-wrapper.properties      |  4 ++--
 7 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7305d9a0..ea6cf404 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'com.google.firebase.firebase-perf'
 
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.firebase.crashlytics'
 
 apply plugin: 'kotlin-kapt'
 
@@ -118,7 +118,7 @@ dependencies {
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"
 
   // Architecture components
-  implementation "androidx.lifecycle:lifecycle-runtime:${versions.architectureComponents}"
+  implementation "androidx.lifecycle:lifecycle-runtime-ktx:${versions.architectureComponents}"
   implementation "androidx.lifecycle:lifecycle-common-java8:${versions.architectureComponents}"
   implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${versions.architectureComponents}"
 
@@ -162,10 +162,9 @@ dependencies {
 
   implementation "androidx.room:room-ktx:${versions.room}"
 
-  implementation "com.crashlytics.sdk.android:crashlytics:${versions.crashlytics}"
-
-  // Firebase Performance
+  // Firebase
   implementation "com.google.firebase:firebase-perf:${versions.firebasePerf}"
+  implementation "com.google.firebase:firebase-crashlytics:${versions.firebaseCrash}"
 
   // Glide
   // https://github.com/bumptech/glide
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 95f794ed..1d8c5bf4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,10 +25,6 @@
       android:name="preloaded_fonts"
       android:resource="@array/preloaded_fonts" />
 
-    <meta-data
-      android:name="firebase_crashlytics_collection_enabled"
-      android:value="false" />
-
     <activity
       android:name=".MainActivity"
       android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
diff --git a/app/src/main/java/com/razeware/emitron/MainActivity.kt b/app/src/main/java/com/razeware/emitron/MainActivity.kt
index 79145d27..e69860a2 100644
--- a/app/src/main/java/com/razeware/emitron/MainActivity.kt
+++ b/app/src/main/java/com/razeware/emitron/MainActivity.kt
@@ -17,9 +17,9 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupWithNavController
 import androidx.work.WorkManager
-import com.crashlytics.android.Crashlytics
 import com.google.android.gms.cast.framework.CastButtonFactory
 import com.google.android.gms.cast.framework.CastContext
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.razeware.emitron.databinding.ActivityMainBinding
 import com.razeware.emitron.di.modules.viewmodel.ViewModelFactory
 import com.razeware.emitron.notifications.NotificationChannels
@@ -27,7 +27,6 @@ import com.razeware.emitron.ui.download.workers.PendingDownloadWorker
 import com.razeware.emitron.ui.player.PipActionDelegate
 import com.razeware.emitron.utils.extensions.*
 import dagger.android.support.DaggerAppCompatActivity
-import io.fabric.sdk.android.Fabric
 import javax.inject.Inject
 
 
@@ -67,9 +66,9 @@ class MainActivity : DaggerAppCompatActivity() {
     AppCompatDelegate.setDefaultNightMode(viewModel.getNightModeSettings())
 
     // Collect crash reports only if user has allowed
-    if (viewModel.isCrashReportingAllowed()) {
-      Fabric.with(this, Crashlytics())
-    }
+    FirebaseCrashlytics
+      .getInstance()
+      .setCrashlyticsCollectionEnabled(viewModel.isCrashReportingAllowed())
 
     requestGestureUi()
     createNotificationChannels()
diff --git a/app/src/main/java/com/razeware/emitron/ui/settings/SettingsFragment.kt b/app/src/main/java/com/razeware/emitron/ui/settings/SettingsFragment.kt
index 1c5172a4..ed7f80d2 100644
--- a/app/src/main/java/com/razeware/emitron/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/razeware/emitron/ui/settings/SettingsFragment.kt
@@ -12,8 +12,8 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.navGraphViewModels
 import androidx.navigation.ui.setupWithNavController
 import androidx.work.WorkManager
-import com.crashlytics.android.Crashlytics
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.razeware.emitron.BuildConfig
 import com.razeware.emitron.R
 import com.razeware.emitron.databinding.FragmentSettingsBinding
@@ -28,7 +28,6 @@ import com.razeware.emitron.ui.settings.SettingsBottomSheetDialogFragment.Compan
 import com.razeware.emitron.utils.extensions.observe
 import com.razeware.emitron.utils.extensions.setDataBindingView
 import dagger.android.support.DaggerFragment
-import io.fabric.sdk.android.Fabric
 import javax.inject.Inject
 
 /**
@@ -97,11 +96,12 @@ class SettingsFragment : DaggerFragment() {
         }
       }
       crashReportingAllowed.observe(viewLifecycleOwner) {
-        it?.let {
-          binding.switchCrashReporting.isChecked = it
-          if (it) {
-            Fabric.with(requireContext(), Crashlytics())
-          }
+        it?.let { hasUserEnabledCrashReporting ->
+          binding.switchCrashReporting.isChecked = hasUserEnabledCrashReporting
+
+          FirebaseCrashlytics
+            .getInstance()
+            .setCrashlyticsCollectionEnabled(hasUserEnabledCrashReporting)
         }
       }
       playbackQuality.observe(viewLifecycleOwner) {
diff --git a/app/src/main/java/com/razeware/emitron/utils/Log.kt b/app/src/main/java/com/razeware/emitron/utils/Log.kt
index b05eb901..223c1471 100644
--- a/app/src/main/java/com/razeware/emitron/utils/Log.kt
+++ b/app/src/main/java/com/razeware/emitron/utils/Log.kt
@@ -1,7 +1,7 @@
 package com.razeware.emitron.utils
 
 import android.util.Log
-import com.crashlytics.android.Crashlytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.razeware.emitron.BuildConfig
 import com.razeware.emitron.data.settings.SettingsRepository
 import javax.inject.Inject
@@ -59,7 +59,7 @@ internal object Log {
     if (BuildConfig.DEBUG) {
       e.printStackTrace()
     } else {
-      Crashlytics.logException(e)
+      FirebaseCrashlytics.getInstance().recordException(e)
     }
   }
 
@@ -70,7 +70,7 @@ internal object Log {
     if (BuildConfig.DEBUG) {
       e.printStackTrace()
     } else {
-      Crashlytics.logException(e)
+      FirebaseCrashlytics.getInstance().recordException(e)
     }
   }
 }
diff --git a/build.gradle b/build.gradle
index c3bd1a1a..0461c7f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,11 +7,11 @@ buildscript {
       'minSdk'                      : 21,
       'targetSdk'                   : 30,
       'compileSdk'                  : 30,
-      'gradle'                      : '4.0.1',
-      'kotlin'                      : '1.4.0',
+      'gradle'                      : '4.1.0',
+      'kotlin'                      : '1.4.10',
 
       // core
-      'coreKtx'                     : "1.3.1",
+      'coreKtx'                     : "1.3.2",
       'fragmentKtx'                 : "1.2.5",
       'preferenceKtx'               : "1.1.1",
       'architectureComponents'      : "2.2.0",
@@ -22,7 +22,7 @@ buildscript {
       'multidex'                    : "2.0.1",
       'browser'                     : "1.2.0", // Chrome custom tabs
 
-      'dagger'                      : '2.27',
+      'dagger'                      : '2.28.3',
       'coroutines'                  : "1.3.9",
 
       // cast
@@ -30,9 +30,9 @@ buildscript {
       'castFramework'               : '17.1.0', // Google cast
 
       // ui
-      'constraintLayout'            : "2.0.1",
+      'constraintLayout'            : "2.0.2",
       'exoplayer'                   : "2.10.4",
-      'navigation'                  : "2.3.0",
+      'navigation'                  : "2.3.1",
       'materialDesign'              : '1.2.1',
       'vectorDrawable'              : '1.1.0',
       'recyclerView'                : "1.0.0",
@@ -55,7 +55,7 @@ buildscript {
 
       //quality
       'ktlint'                      : "0.33.0",
-      'crashlytics'                 : "2.10.1",
+      'crashlytics'                 : "2.3.0",
 
       //test
       'powerMock'                   : "2.0.2",
@@ -69,13 +69,13 @@ buildscript {
       // firebase
       'firebaseConfig'              : '18.0.0',
       'firebasePerf'                : '19.0.2',
+      'firebaseCrash'               : '17.2.2',
 
       // play services
       'playOss'                     : '17.0.0',
 
       // plugins
       'firebasePerfPlugin'          : "1.2.1",
-      'fabricToolsPlugin'           : "1.29.0",
       'jacocoPlugin'                : "0.8.1",
       'googleServicesPlugin'        : "4.2.0",
       'ossLicenses'                 : "0.9.5"
@@ -84,21 +84,17 @@ buildscript {
   repositories {
     google()
     jcenter()
-
-    maven {
-      url 'https://maven.fabric.io/public'
-    }
   }
 
   dependencies {
     classpath "com.android.tools.build:gradle:${versions.gradle}"
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
-    classpath "io.fabric.tools:gradle:${versions.fabricToolsPlugin}"
     classpath "org.jacoco:org.jacoco.core:${versions.jacocoPlugin}"
     classpath "com.google.gms:google-services:${versions.googleServicesPlugin}"
     classpath "com.google.firebase:perf-plugin:${versions.firebasePerfPlugin}"
     classpath "androidx.navigation:navigation-safe-args-gradle-plugin:${versions.navigation}"
     classpath "com.google.android.gms:oss-licenses-plugin:${versions.ossLicenses}"
+    classpath "com.google.firebase:firebase-crashlytics-gradle:${versions.crashlytics}"
   }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a6935861..b90ed2c1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Sep 14 16:50:38 CEST 2020
+#Sun Oct 18 14:44:29 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

From 65ba2873f635a0345d2ad8614a6040dd380f9b8e Mon Sep 17 00:00:00 2001
From: Joe Howard <joe@razeware.com>
Date: Sun, 1 Nov 2020 16:42:55 -0500
Subject: [PATCH 2/2] Update version code and release notes

---
 build.gradle      | 4 ++--
 release-notes.txt | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0461c7f0..7600132e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,8 +2,8 @@
 buildscript {
   ext.versions = [
       // build
-      'versionCode'                 : 22,
-      'versionName'                 : "1.0.7",
+      'versionCode'                 : 23,
+      'versionName'                 : "1.0.8",
       'minSdk'                      : 21,
       'targetSdk'                   : 30,
       'compileSdk'                  : 30,
diff --git a/release-notes.txt b/release-notes.txt
index ee1876df..50d1c08a 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -1,3 +1,2 @@
 ## Changes
-- Added a swipe to refresh on the Library screen.
 - Various bug fixes and enhancements.