Merge pull request #1699 from apolloai/feature/firebase-crashlytics-upgrade

Upgrade Fabric/Crashlytics to new FirebaseCrashlytics

Author: EddyVerbruggen

publish/scripts/installer.js

@@ -253,7 +253,6 @@ function promptQuestionsResult(result) {
     writePodFile(result);
     writeGoogleServiceCopyHook();
     writeBuildscriptHookForCrashlytics(isSelected(result.crashlytics));
-    activateIOSCrashlyticsFramework(isSelected(result.crashlytics));
     activateIOSMLKitCameraFramework(isSelected(result.ml_kit));
   }
 
@@ -319,14 +318,6 @@ function activateIOSMLKitCameraFramework(enable) {
   }
 }
 
-function activateIOSCrashlyticsFramework(enable) {
-  if (enable && fs.existsSync(path.join(directories.ios, 'TNSCrashlyticsLogger.framework-disabled'))) {
-    fs.renameSync(path.join(directories.ios, 'TNSCrashlyticsLogger.framework-disabled'), path.join(directories.ios, 'TNSCrashlyticsLogger.framework'));
-  } else if (!enable && fs.existsSync(path.join(directories.ios, 'TNSCrashlyticsLogger.framework'))) {
-    fs.renameSync(path.join(directories.ios, 'TNSCrashlyticsLogger.framework'), path.join(directories.ios, 'TNSCrashlyticsLogger.framework-disabled'));
-  }
-}
-
 function askSaveConfigPrompt() {
   prompt.get({
     name: 'save_config',
@@ -377,8 +368,7 @@ function writePodFile(result) {
 ` + (isSelected(result.performance_monitoring) ? `` : `#`) + `pod 'Firebase/Performance'
 
 # Crashlytics
-` + (isSelected(result.crashlytics) ? `` : `#`) + `pod 'Fabric'
-` + (isSelected(result.crashlytics) ? `` : `#`) + `pod 'Crashlytics'
+` + (isSelected(result.crashlytics) ? `` : `#`) + `pod 'Firebase/Crashlytics'
 ` + (!isSelected(result.crashlytics) ? `` : `
 # Crashlytics works best without bitcode
 post_install do |installer|
@@ -465,7 +455,7 @@ const pattern3 = /\\n\\s*\\/\\/Crashlytics 3 BEGIN[\\s\\S]*\\/\\/Crashlytics 3 E
 const string1 = \`
 //Crashlytics 1 BEGIN
 #else
-#import <Crashlytics/CLSLogging.h>
+@import FirebaseCrashlytics;
 #endif
 //Crashlytics 1 END
 \`;
@@ -475,7 +465,7 @@ const string2 = \`
 #if DEBUG
 #else
 static int redirect_cls(const char *prefix, const char *buffer, int size) {
-  CLSLog(@"%s: %.*s", prefix, size, buffer);
+  [[FIRCrashlytics crashlytics] logWithFormat:@"%s: %.*s", prefix, size, buffer];
   return size;
 }
 
@@ -527,7 +517,7 @@ module.exports = function($logger, $projectData, hookArgs) {
 
             // Xcode 10 requires 'inputPaths' set, see https://firebase.google.com/docs/crashlytics/get-started
             var options = {
-              shellPath: '/bin/sh', shellScript: '\"\${PODS_ROOT}/Fabric/run\"',
+              shellPath: '/bin/sh', shellScript: '\"\${PODS_ROOT}/FirebaseCrashlytics/run\"',
               inputPaths: ['"\$(SRCROOT)/$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)\"']
             };
 
@@ -660,7 +650,7 @@ dependencies {
     ` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` implementation "com.google.firebase:firebase-perf:19.0.5"
 
     // Crashlytics
-    ` + (isSelected(result.crashlytics) ? `` : `//`) + ` implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
+    ` + (isSelected(result.crashlytics) ? `` : `//`) + ` implementation "com.google.firebase:firebase-crashlytics:17.2.2"
 
     // Cloud Messaging (FCM)
     ` + (isSelected(result.messaging) || isSelected(result.external_push_client_only) ? `` : `//`) + ` implementation "com.google.firebase:firebase-messaging:20.1.0"
@@ -705,7 +695,7 @@ dependencies {
 apply plugin: "com.google.gms.google-services"
 
 // Crashlytics
-` + (isSelected(result.crashlytics) ? `` : `//`) + `apply plugin: "io.fabric"
+` + (isSelected(result.crashlytics) ? `` : `//`) + `apply plugin: "com.google.firebase.crashlytics"
 `);
     console.log('Successfully created Android (include.gradle) file.');
   } catch (e) {
@@ -961,27 +951,30 @@ module.exports = function($logger, $projectData) {
         if (fs.existsSync(projectBuildGradlePath)) {
             let buildGradleContent = fs.readFileSync(projectBuildGradlePath).toString();
 
-            if (buildGradleContent.indexOf("fabric.io") === -1) {
+            if (buildGradleContent.indexOf(" google()\\n") === -1) {
                 let repositoriesNode = buildGradleContent.indexOf("repositories", 0);
                 if (repositoriesNode > -1) {
                     repositoriesNode = buildGradleContent.indexOf("}", repositoriesNode);
-                    buildGradleContent = buildGradleContent.substr(0, repositoriesNode - 1) + '\\t\\tmaven { url "https://maven.fabric.io/public" }\\n\\t\\tmaven { url "https://dl.bintray.com/android/android-tools" }\\n' + buildGradleContent.substr(repositoriesNode - 1);
-                }
-
-                let dependenciesNode = buildGradleContent.indexOf("dependencies", 0);
-                if (dependenciesNode > -1) {
-                    dependenciesNode = buildGradleContent.indexOf("}", dependenciesNode);
-                    // see https://docs.fabric.io/android/changelog.html
-                    buildGradleContent = buildGradleContent.substr(0, dependenciesNode - 1) + '	    classpath "io.fabric.tools:gradle:1.26.1"\\n' + buildGradleContent.substr(dependenciesNode - 1);
+                    buildGradleContent = buildGradleContent.substr(0, repositoriesNode - 1) + '\\t\\tgoogle()\\n' + buildGradleContent.substr(repositoriesNode - 1);
                 }
 
-            } else if (buildGradleContent.indexOf("https://dl.bintray.com/android/android-tools") === -1) {
+            }
+            
+            if (buildGradleContent.indexOf("https://dl.bintray.com/android/android-tools") === -1) {
                 let repositoriesNode = buildGradleContent.indexOf("repositories", 0);
                 if (repositoriesNode > -1) {
                     repositoriesNode = buildGradleContent.indexOf("}", repositoriesNode);
                     buildGradleContent = buildGradleContent.substr(0, repositoriesNode - 1) + '\\t\\tmaven { url "https://dl.bintray.com/android/android-tools" }\\n' + buildGradleContent.substr(repositoriesNode - 1);
                 }
             }
+            
+            if (buildGradleContent.indexOf("com.google.firebase:firebase-crashlytics-gradle") === -1) {
+              let dependenciesNode = buildGradleContent.indexOf("dependencies", 0);
+              if (dependenciesNode > -1) {
+                  dependenciesNode = buildGradleContent.indexOf("}", dependenciesNode);
+                  buildGradleContent = buildGradleContent.substr(0, dependenciesNode - 1) + '	    classpath "com.google.firebase:firebase-crashlytics-gradle:2.3.0"\\n' + buildGradleContent.substr(dependenciesNode - 1);
+              }
+            }
 
             let gradlePattern = /classpath ('|")com\\.android\\.tools\\.build:gradle:\\d+\\.\\d+\\.\\d+('|")/;
             let googleServicesPattern = /classpath ('|")com\\.google\\.gms:google-services:\\d+\\.\\d+\\.\\d+('|")/;

src/crashlytics/crashlytics.android.ts

@@ -5,72 +5,69 @@ declare const com: any;
 
 export function sendCrashLog(exception: any /* java.lang.Exception */): void {
   if (isCrashlyticsAvailable()) {
-    com.crashlytics.android.Crashlytics.logException(exception);
+    com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance().recordException(exception);
   }
 }
 
 export function log(msg: string, tag?: string, priority?: number): void {
   if (isCrashlyticsAvailable()) {
     if (tag && priority) {
-      com.crashlytics.android.Crashlytics.log(priority, tag, msg);
+      const fullMessage = priority + '/' + tag + ': ' + msg;
+      com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance().log(fullMessage);
     } else {
-      com.crashlytics.android.Crashlytics.log(msg);
+      com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance().log(msg);
     }
   }
 }
 
 export function setString(key: string, value: string): void {
   if (isCrashlyticsAvailable()) {
-    com.crashlytics.android.Crashlytics.setString(key, value);
+    com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance().setCustomKey(key, value);
   }
 }
 
 export function setBool(key: string, value: boolean): void {
   if (isCrashlyticsAvailable()) {
-    com.crashlytics.android.Crashlytics.setBool(key, value);
+    com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance().setCustomKey(key, value);
   }
 }
 
 export function setFloat(key: string, value: number): void {
   if (isCrashlyticsAvailable()) {
-    com.crashlytics.android.Crashlytics.setFloat(key, value);
+    com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance().setCustomKey(key, value);
   }
 }
 
 export function setInt(key: string, value: number): void {
   if (isCrashlyticsAvailable()) {
-    com.crashlytics.android.Crashlytics.setInt(key, value);
+    com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance().setCustomKey(key, value);
   }
 }
 
 export function setDouble(key: string, value: number): void {
   if (isCrashlyticsAvailable()) {
-    com.crashlytics.android.Crashlytics.setDouble(key, value);
+    com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance().setCustomKey(key, value);
   }
 }
 
 export function setUserId(id: string): void {
   if (isCrashlyticsAvailable()) {
-    com.crashlytics.android.Crashlytics.setUserIdentifier(id);
+    com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance().setUserId(id);
   }
 }
 
 export function crash(): void {
   if (isCrashlyticsAvailable()) {
-    com.crashlytics.android.Crashlytics.getInstance().crash();
+    throw new java.lang.RuntimeException('Test Crash');
   }
 }
 
 export function setCrashlyticsCollectionEnabled(enabled: boolean): void {
-  if (isCrashlyticsAvailable()) {
-    io.fabric.sdk.android.Fabric.with(
-        appModule.getNativeApplication(),
-        [new com.crashlytics.android.Crashlytics()]);
-  }
+  com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(new java.lang.Boolean(enabled));
 }
 
 function isCrashlyticsAvailable(): boolean {
-  if (typeof (com.crashlytics) === "undefined" || typeof (com.crashlytics.android.Crashlytics) === "undefined") {
+  if (typeof (com.google.firebase.crashlytics.FirebaseCrashlytics) === "undefined" || typeof (com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance()) === "undefined") {
     console.log(ENABLE_CRASHLYTICS_HINT);
     return false;
   }

src/crashlytics/crashlytics.ios.ts

@@ -2,71 +2,71 @@ import { ENABLE_CRASHLYTICS_HINT } from "./crashlytics-common";
 
 export function sendCrashLog(exception: any /* NSError */): void {
   if (isCrashlyticsAvailable()) {
-    Crashlytics.sharedInstance().recordError(exception);
+    FIRCrashlytics.crashlytics().recordError(exception);
   }
 }
 
 export function log(msg: string, tag?: string, priority?: number): void {
   if (isCrashlyticsAvailable()) {
     if (tag) {
-      TNSCrashlyticsLoggerWrapper.log(tag + " - " + msg);
+      FIRCrashlytics.crashlytics().log(tag + " - " + msg);
     } else {
-      TNSCrashlyticsLoggerWrapper.log(msg);
+      FIRCrashlytics.crashlytics().log(msg);
     }
   }
 }
 
 export function setString(key: string, value: string): void {
   if (isCrashlyticsAvailable()) {
-    Crashlytics.sharedInstance().setObjectValueForKey(value, key);
+    FIRCrashlytics.crashlytics().setCustomValueForKey(value, key);
   }
 }
 
 export function setBool(key: string, value: boolean): void {
   if (isCrashlyticsAvailable()) {
-    Crashlytics.sharedInstance().setBoolValueForKey(value, key);
+    FIRCrashlytics.crashlytics().setCustomValueForKey(value, key);
   }
 }
 
 export function setFloat(key: string, value: number): void {
   if (isCrashlyticsAvailable()) {
-    Crashlytics.sharedInstance().setFloatValueForKey(value, key);
+    FIRCrashlytics.crashlytics().setCustomValueForKey(value, key);
   }
 }
 
 export function setInt(key: string, value: number): void {
   if (isCrashlyticsAvailable()) {
-    Crashlytics.sharedInstance().setIntValueForKey(value, key);
+    FIRCrashlytics.crashlytics().setCustomValueForKey(value, key);
   }
 }
 
 export function setDouble(key: string, value: number): void {
   if (isCrashlyticsAvailable()) {
-    Crashlytics.sharedInstance().setFloatValueForKey(value, key);
+    FIRCrashlytics.crashlytics().setCustomValueForKey(value, key);
   }
 }
 
 export function setUserId(id: string): void {
   if (isCrashlyticsAvailable()) {
-    Crashlytics.sharedInstance().setUserIdentifier(id);
+    FIRCrashlytics.crashlytics().setUserID(id);
   }
 }
 
 export function crash(): void {
   if (isCrashlyticsAvailable()) {
-    Crashlytics.sharedInstance().crash();
+    // TODO: manually force crash - https://firebase.google.com/docs/crashlytics/test-implementation?authuser=0&platform=ios#force_a_crash_to_test_your_implementation
+    console.log('currently manual crashing not implemented');
   }
-  Fabric.with(NSArray.arrayWithObject(Crashlytics.class()));
 }
 
 export function setCrashlyticsCollectionEnabled(enabled: boolean): void {
   if (isCrashlyticsAvailable()) {
-    Fabric.with(NSArray.arrayWithObject(Crashlytics.class()));
+    FIRCrashlytics.crashlytics().setCrashlyticsCollectionEnabled(enabled);
   }
 }
 
 function isCrashlyticsAvailable(): boolean {
-  if (typeof (Crashlytics) === "undefined") {
+  if (typeof (FIRCrashlytics) === "undefined") {
     console.log(ENABLE_CRASHLYTICS_HINT);
     return false;
   }

src/firebase.android.ts

@@ -306,13 +306,6 @@ firebase.init = arg => {
         ).setAnalyticsCollectionEnabled(arg.analyticsCollectionEnabled !== false);
       }
 
-      // note that this only makes sense if crash reporting was disabled in AndroidManifest.xml
-      if (arg.crashlyticsCollectionEnabled && typeof (com.crashlytics) !== "undefined" && typeof (com.crashlytics.android.Crashlytics) !== "undefined") {
-        io.fabric.sdk.android.Fabric.with(
-            appModule.android.context || appModule.getNativeApplication(),
-            [new com.crashlytics.android.Crashlytics()]);
-      }
-
       if (typeof (com.google.firebase.database) !== "undefined" && typeof (com.google.firebase.database.ServerValue) !== "undefined") {
         firebase.ServerValue = {
           TIMESTAMP: firebase.toJsObject(com.google.firebase.database.ServerValue.TIMESTAMP)

src/firebase.ios.ts

@@ -344,10 +344,6 @@ firebase.init = arg => {
         }
       }
 
-      if (arg.crashlyticsCollectionEnabled && typeof (Crashlytics) !== "undefined") {
-        Fabric.with(NSArray.arrayWithObject(Crashlytics.class()));
-      }
-
       if (typeof (FIRDatabase) !== "undefined") {
         if (arg.persist) {
           FIRDatabase.database().persistenceEnabled = true;
@@ -947,11 +943,11 @@ firebase.login = arg => {
         appleIDRequest.nonce = sha256Nonce;
 
         const authorizationController = ASAuthorizationController.alloc().initWithAuthorizationRequests([appleIDRequest]);
-        const delegate = ASAuthorizationControllerDelegateImpl.createWithOwnerAndResolveReject(this, resolve, reject);
+        const delegate = ASAuthorizationControllerDelegateImpl.createWithOwnerAndResolveReject(this as any, resolve, reject);
         CFRetain(delegate);
         authorizationController.delegate = delegate;
 
-        authorizationController.presentationContextProvider = ASAuthorizationControllerPresentationContextProvidingImpl.createWithOwnerAndCallback(this);
+        authorizationController.presentationContextProvider = ASAuthorizationControllerPresentationContextProvidingImpl.createWithOwnerAndCallback(this as any);
 
         authorizationController.performRequests();