Upgrade Fabric/Crashlytics to new FirebaseCrashlytics #1699

EddyVerbruggen · EddyVerbruggen · commit e5624e102056 · 2020-10-30T16:13:01.000+01:00
diff --git a/demo-ng/app/App_Resources/iOS/Podfile b/demo-ng/app/App_Resources/iOS/Podfile
@@ -0,0 +1,7 @@
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+    end
+  end
+end
diff --git a/demo-ng/app/App_Resources/iOS/build.xcconfig b/demo-ng/app/App_Resources/iOS/build.xcconfig
@@ -5,7 +5,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 CODE_SIGN_ENTITLEMENTS = demong/demong.entitlements
 
-IPHONEOS_DEPLOYMENT_TARGET = 10.0
+IPHONEOS_DEPLOYMENT_TARGET = 12.0
 
 // Don't check this in because of CI
 // DEVELOPMENT_TEAM = 8Q5F6M3TNS
diff --git a/demo-ng/firebase.nativescript.json b/demo-ng/firebase.nativescript.json
@@ -23,9 +23,9 @@
   "ml_kit_face_detection": true,
   "ml_kit_image_labeling": true,
   "ml_kit_object_detection": true,
-  "ml_kit_automl": true,
-  "ml_kit_custom_model": true,
-  "ml_kit_natural_language_identification": true,
-  "ml_kit_natural_language_translation": true,
-  "ml_kit_natural_language_smartreply": true
+  "ml_kit_automl": false,
+  "ml_kit_custom_model": false,
+  "ml_kit_natural_language_identification": false,
+  "ml_kit_natural_language_translation": false,
+  "ml_kit_natural_language_smartreply": false
 }
diff --git a/demo-ng/package.json b/demo-ng/package.json
@@ -6,10 +6,10 @@
   "nativescript": {
     "id": "org.nativescript.firebasedemo.firestore",
     "tns-android": {
-      "version": "6.3.1"
+      "version": "6.5.3"
     },
     "tns-ios": {
-      "version": "6.3.0"
+      "version": "6.5.3"
     }
   },
   "dependencies": {
@@ -25,11 +25,11 @@
     "nativescript-angular": "~8.0.3",
     "nativescript-camera": "~4.5.0",
     "nativescript-imagepicker": "~6.3.0",
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.5.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.6.0.tgz",
     "nativescript-theme-core": "~1.0.6",
     "reflect-metadata": "~0.1.13",
     "rxjs": "~6.5.2",
-    "tns-core-modules": "~6.3.2",
+    "tns-core-modules": "~6.5.3",
     "zone.js": "~0.10.0"
   },
   "devDependencies": {
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
@@ -221,7 +221,7 @@
 
             <Label row="46" colSpan="2" text="Firebase Crash Reporing / Crashlytics" class="subtitle"/>
 
-            <Button row="47" col="0" colSpan="2" text="force crash :)" tap="{{ doCrash }}" class="button button-crash"/>
+            <Button row="47" col="0" colSpan="2" text="force crash (Android only)" tap="{{ doCrash }}" class="button button-crash"/>
             <Button row="48" col="0" text="log message crashlytics" tap="{{ doLogMessageCrashlytics }}" class="button button-crash"/>
             <Button row="48" col="1" text="set string crashlytics" tap="{{ doSetCrashlyticString }}" class="button button-crash"/>
             <Button row="49" col="0" text="set bool crashlytics" tap="{{ doSetCrashlyticBool }}" class="button button-crash"/>
diff --git a/demo/app_resources/iOS/Podfile b/demo/app_resources/iOS/Podfile
@@ -0,0 +1,7 @@
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+    end
+  end
+end
diff --git a/demo/app_resources/iOS/build.xcconfig b/demo/app_resources/iOS/build.xcconfig
@@ -5,6 +5,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 CODE_SIGN_ENTITLEMENTS = demo/demo.entitlements
 
+IPHONEOS_DEPLOYMENT_TARGET = 10.0
+
 // DEVELOPMENT_TEAM = "Don't set this here, but store in the platforms folder when prompted (to support CI and cross-team development)"
 
 // DEVELOPMENT_TEAM = 8Q5F6M3TNS
diff --git a/demo/package.json b/demo/package.json
@@ -2,18 +2,18 @@
   "nativescript": {
     "id": "org.nativescript.firebasedemo",
     "tns-ios": {
-      "version": "6.3.0"
+      "version": "6.5.3"
     },
     "tns-android": {
-      "version": "6.3.1"
+      "version": "6.5.3"
     }
   },
   "dependencies": {
     "firebase-functions": "^2.0.5",
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.5.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.6.0.tgz",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "0.7.0",
-    "tns-core-modules": "~6.3.2"
+    "tns-core-modules": "~6.5.3"
   },
   "devDependencies": {
     "@types/jasmine": "~2.8.0",
@@ -29,7 +29,7 @@
     "lazy": "1.0.11",
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-webpack": "1.0.1",
-    "tns-platform-declarations": "~6.3.2",
+    "tns-platform-declarations": "~6.5.3",
     "tslint": "~5.4.3",
     "typescript": "3.4.5"
   },
diff --git a/publish/scripts/installer.js b/publish/scripts/installer.js
@@ -347,10 +347,10 @@ function writePodFile(result) {
 // The MLVision pod requires a minimum of iOS 9, otherwise the build will fail
 (isPresent(result.ml_kit) ? `` : `#`) + `platform :ios, '9.0'
 
-` + (!isSelected(result.external_push_client_only) ? `` : `#`) + `pod 'Firebase/Core', '~>6.16.0'
+` + (!isSelected(result.external_push_client_only) ? `` : `#`) + `pod 'Firebase/Core', '~>6.34.0'
 
 # Analytics
-` + (isSelected(result.analytics) || (!isSelected(result.external_push_client_only) && !isPresent(result.analytics)) ? `` : `#`) + `pod 'Firebase/Analytics'
+` + (isSelected(result.analytics) || isSelected(result.crashlytics) || (!isSelected(result.external_push_client_only) && !isPresent(result.analytics)) ? `` : `#`) + `pod 'Firebase/Analytics'
 
 # Authentication
 ` + (isSelected(result.authentication) || (!isSelected(result.external_push_client_only) && !isPresent(result.external_push_client_only)) ? `` : `#`) + `pod 'Firebase/Auth'
@@ -418,7 +418,7 @@ end`) + `
 ` + (isSelected(result.facebook_auth) ? `` : `#`) + `pod 'FBSDKLoginKit'
 
 # Google Authentication
-` + (isSelected(result.google_auth) ? `` : `#`) + `pod 'GoogleSignIn', '~> 5.0'`);
+` + (isSelected(result.google_auth) ? `` : `#`) + `pod 'GoogleSignIn', '~> 5.0.2'`);
     console.log('Successfully created iOS (Pod) file.');
   } catch (e) {
     console.log('Failed to create iOS (Pod) file.');
diff --git a/src/crashlytics/crashlytics.android.ts b/src/crashlytics/crashlytics.android.ts
@@ -1,7 +1,6 @@
 import { ENABLE_CRASHLYTICS_HINT } from "./crashlytics-common";
-import * as appModule from 'tns-core-modules/application';
 
-declare const com: any;
+declare const com, java: any;
 
 export function sendCrashLog(exception: any /* java.lang.Exception */): void {
   if (isCrashlyticsAvailable()) {
diff --git a/src/crashlytics/crashlytics.ios.ts b/src/crashlytics/crashlytics.ios.ts
@@ -54,8 +54,7 @@ export function setUserId(id: string): void {
 
 export function crash(): void {
   if (isCrashlyticsAvailable()) {
-    // 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');
+    console.log('currently manual crashing not implemented on iOS');
   }
 }
 
diff --git a/src/firebase.ios.ts b/src/firebase.ios.ts
@@ -2418,11 +2418,11 @@ export class QuerySnapshot implements firestore.QuerySnapshot {
 
 class ASAuthorizationControllerDelegateImpl extends NSObject /* implements ASAuthorizationControllerDelegate */ {
   public static ObjCProtocols = [];
-  private owner: WeakRef<any>;
+  private owner: any;
   private resolve;
   private reject;
 
-  public static createWithOwnerAndResolveReject(owner: WeakRef<any>, resolve, reject): ASAuthorizationControllerDelegateImpl {
+  public static createWithOwnerAndResolveReject(owner: any, resolve, reject): ASAuthorizationControllerDelegateImpl {
     // defer initialisation because this is only available since iOS 13
     if (ASAuthorizationControllerDelegateImpl.ObjCProtocols.length === 0 && parseInt(device.osVersion) >= 13) {
       ASAuthorizationControllerDelegateImpl.ObjCProtocols.push(ASAuthorizationControllerDelegate);
@@ -2483,9 +2483,9 @@ class ASAuthorizationControllerDelegateImpl extends NSObject /* implements ASAut
 
 class ASAuthorizationControllerPresentationContextProvidingImpl extends NSObject /* implements ASAuthorizationControllerDelegate */ {
   public static ObjCProtocols = [];
-  private owner: WeakRef<any>;
+  private owner: any;
 
-  public static createWithOwnerAndCallback(owner: WeakRef<any>): ASAuthorizationControllerPresentationContextProvidingImpl {
+  public static createWithOwnerAndCallback(owner: any): ASAuthorizationControllerPresentationContextProvidingImpl {
     // defer initialisation because this is only available since iOS 13
     if (ASAuthorizationControllerPresentationContextProvidingImpl.ObjCProtocols.length === 0 && parseInt(device.osVersion) >= 13) {
       ASAuthorizationControllerPresentationContextProvidingImpl.ObjCProtocols.push(ASAuthorizationControllerPresentationContextProviding);
diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-plugin-firebase",
-  "version": "10.5.2",
+  "version": "10.6.0",
   "description": "Fire. Base. Firebase!",
   "main": "firebase",
   "typings": "index.d.ts",
@@ -40,6 +40,7 @@
     "plugin.tscwatch": "npm run tsc -- -w",
     "package": "cd ../publish && ./pack.sh",
     "demo.ios": "npm run preparedemo && cd ../demo && tns run ios",
+    "demo.ios.eddy.iPad": "npm run preparedemo && cd ../demo && tns run ios --device fee4cf319a242eab4701543e4c16db89c722731f",
     "demo-ng.ios": "npm run preparedemo-ng && cd ../demo-ng && tns run ios",
     "demo-ng.ios.bundled": "npm run preparedemo-ng && cd ../demo-ng && tns run ios --bundle",
     "demo-push.ios": "npm run preparedemo-push && cd ../demo-push && tns run ios",
diff --git a/src/platforms/ios/typings/objc!FirebaseAnalytics.d.ts b/src/platforms/ios/typings/objc!FirebaseAnalytics.d.ts
@@ -19,6 +19,8 @@ declare class FIRAnalytics extends NSObject {
 
 	static setAnalyticsCollectionEnabled(analyticsCollectionEnabled: boolean): void;
 
+	static setDefaultEventParameters(parameters: NSDictionary<string, any>): void;
+
 	static setScreenNameScreenClass(screenName: string, screenClassOverride: string): void;
 
 	static setSessionTimeoutInterval(sessionTimeoutInterval: number): void;
diff --git a/src/platforms/ios/typings/objc!FirebaseAuth.d.ts b/src/platforms/ios/typings/objc!FirebaseAuth.d.ts
diff --git a/src/platforms/ios/typings/objc!FirebaseCoreDiagnostics.d.ts b/src/platforms/ios/typings/objc!FirebaseCoreDiagnostics.d.ts
diff --git a/src/platforms/ios/typings/objc!FirebaseFirestore.d.ts b/src/platforms/ios/typings/objc!FirebaseFirestore.d.ts
diff --git a/src/platforms/ios/typings/objc!FirebaseRemoteConfig.d.ts b/src/platforms/ios/typings/objc!FirebaseRemoteConfig.d.ts
