Merge remote-tracking branch 'upstream/master' into feat/dep-updates

Author: NathanWalker

README.md

@@ -17,7 +17,9 @@
 
 <img src="docs/images/firebase-logo.png" width="116px" height="32px" alt="Firebase"/><br/>
 
-> Plugin version **10.0.0** works with NativeScript 6.1 and up. Using an older version? Stick to plugin version < 10.
+> Plugin version **10.0.0** works with NativeScript 6.1+. Using an older version? Stick to plugin version < 10.
+
+> For NativeScript 7 compatibiliy, install `@nativescript/firebase` version 11+.
 
 ## Features
 * [AdMob](docs/ADMOB.md)
@@ -58,6 +60,12 @@ From the command prompt go to your app's root folder and execute:
 tns plugin add nativescript-plugin-firebase
 ```
 
+or for NativeScript 7+:
+
+```bash
+tns plugin add @nativescript/firebase
+```
+
 This will launch an install script which will guide you through installing additional components.
 Check the doc links above to see what's what. You can always change your choices later.
 

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

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

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
 }

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": {

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

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

demo/package.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
     "firebase-functions": "^2.0.5",
-    "@nativescript/firebase": "file:../publish/package/nativescript-firebase-11.0.0-rc.6.tgz",
+    "@nativescript/firebase": "file:../src",
     "nativescript-theme-core": "^1.0.4",
-    "nativescript-unit-test-runner": "0.7.0",
+    "@nativescript/unit-test-runner": "~1.0.2",
     "@nativescript/core": "7.0.0",
-    "@nativescript/webpack": "3.0.0"
+    "@nativescript/webpack": "~3.0.0"
   },
   "devDependencies": {
-    "@nativescript/ios": "7.0.0",
-    "@nativescript/types": "7.0.0",
+    "@nativescript/ios": "7.0.4",
+    "@nativescript/types": "~7.0.0",
     "@types/jasmine": "~2.8.0",
     "babel-traverse": "6.12.0",
     "babel-types": "6.11.1",
@@ -23,7 +23,7 @@
     "lazy": "1.0.11",
     "nativescript-css-loader": "~0.26.0",
     "tslint": "~5.4.3",
-    "typescript": "~3.9.7"
+    "typescript": "~4.0.0"
   },
   "scripts": {
     "build.plugin": "cd ../src && npm run build",

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',
@@ -356,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'
@@ -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|
@@ -428,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.');
@@ -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.28.0"\\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

@@ -1,76 +1,72 @@
 import { ENABLE_CRASHLYTICS_HINT } from "./crashlytics-common";
-import { Application } from '@nativescript/core';
 
-declare const com: any;
+declare const com, java: 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(
-        Application.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;
   }