Bump Firebase SDK versions #1482

Sign In with Apple #1340

Author: EddyVerbruggen

CHANGELOG.md

@@ -3,6 +3,10 @@
 - [Firebase iOS SDK Changelog](https://firebase.google.com/support/release-notes/ios)
 - [Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
 
+## 10.2.0 (2019, Nov xx)
+[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/115?closed=1)
+
+
 ## 10.1.1 (2019, Oct 29)
 [Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/114?closed=1)
 

demo-ng/app/tabs/firestore/firestore.component.ts

@@ -277,7 +277,7 @@ export class FirestoreComponent {
   }
 
   firestoreDocumentObservable(): void {
-    this.myCity$ = Observable.create(subscriber => {
+    this.myCity$ = new Observable(subscriber => {
       const docRef: firestore.DocumentReference = firebase.firestore().collection("cities").doc("SF");
       docRef.onSnapshot(
           {includeMetadataChanges: true},
@@ -289,14 +289,15 @@ export class FirestoreComponent {
 
             this.zone.run(() => {
               this.city = <City>doc.data();
+              console.log("City name: " + this.city.name);
               subscriber.next(this.city);
             });
           });
     });
   }
 
   firestoreCollectionObservable(): void {
-    this.myCities$ = Observable.create(subscriber => {
+    this.myCities$ = new Observable(subscriber => {
       const colRef: firestore.CollectionReference = firebase.firestore().collection("cities");
       colRef.onSnapshot(
           {includeMetadataChanges: true},

demo-ng/package.json

@@ -25,7 +25,7 @@
     "nativescript-angular": "~8.0.3",
     "nativescript-camera": "~4.5.0",
     "nativescript-imagepicker": "~6.2.0",
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.1.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.2.0.tgz",
     "nativescript-theme-core": "~1.0.6",
     "reflect-metadata": "~0.1.13",
     "rxjs": "~6.5.2",

demo-push/package.json

@@ -9,7 +9,7 @@
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.1.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.2.0.tgz",
     "nativescript-theme-core": "~1.0.6",
     "nativescript-unit-test-runner": "0.7.0",
     "tns-core-modules": "~6.1.1"

demo-vue/package.json

@@ -14,7 +14,7 @@
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.1.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.2.0.tgz",
     "nativescript-theme-core": "~1.0.6",
     "nativescript-vue": "~2.4.0",
     "tns-core-modules": "~6.1.1"

demo/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "firebase-functions": "^2.0.5",
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.1.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.2.0.tgz",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "0.7.0",
     "tns-core-modules": "~6.1.1"

publish/scripts/installer.js

@@ -353,6 +353,8 @@ 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.13.0'
+
 # Analytics
 ` + (isSelected(result.analytics) || (!isSelected(result.external_push_client_only) && !isPresent(result.analytics)) ? `` : `#`) + `pod 'Firebase/Analytics'
 
@@ -725,56 +727,56 @@ dependencies {
 
     // make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
 
-    ` + (isSelected(result.analytics) || (!isSelected(result.external_push_client_only) && !isPresent(result.analytics)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-analytics:17.2.0"
+    ` + (isSelected(result.analytics) || (!isSelected(result.external_push_client_only) && !isPresent(result.analytics)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-analytics:17.2.1"
 
     // for reading google-services.json and configuration
     implementation "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
 
     // Authentication
-    ` + (isSelected(result.authentication) || (!isSelected(result.external_push_client_only) && !isPresent(result.authentication)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-auth:19.0.0"
+    ` + (isSelected(result.authentication) || (!isSelected(result.external_push_client_only) && !isPresent(result.authentication)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-auth:19.1.0"
 
     // Realtime DB
-    ` + (isSelected(result.realtimedb) || (!isSelected(result.external_push_client_only) && !isPresent(result.realtimedb)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-database:19.1.0"
+    ` + (isSelected(result.realtimedb) || (!isSelected(result.external_push_client_only) && !isPresent(result.realtimedb)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-database:19.2.0"
 
     // Cloud Firestore
-    ` + (isSelected(result.firestore) ? `` : `//`) + ` implementation "com.google.firebase:firebase-firestore:21.1.1"
+    ` + (isSelected(result.firestore) ? `` : `//`) + ` implementation "com.google.firebase:firebase-firestore:21.3.0"
 
     // Remote Config
-    ` + (isSelected(result.remote_config) ? `` : `//`) + ` implementation "com.google.firebase:firebase-config:19.0.1"
+    ` + (isSelected(result.remote_config) ? `` : `//`) + ` implementation "com.google.firebase:firebase-config:19.0.3"
 
     // Performance Monitoring
-    ` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` implementation "com.google.firebase:firebase-perf:19.0.0"
+    ` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` implementation "com.google.firebase:firebase-perf:19.0.2"
 
     // Crashlytics
     ` + (isSelected(result.crashlytics) ? `` : `//`) + ` implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
     // Cloud Messaging (FCM)
-    ` + (isSelected(result.messaging) || isSelected(result.external_push_client_only) ? `` : `//`) + ` implementation "com.google.firebase:firebase-messaging:20.0.0"
+    ` + (isSelected(result.messaging) || isSelected(result.external_push_client_only) ? `` : `//`) + ` implementation "com.google.firebase:firebase-messaging:20.0.1"
     // ` + (isSelected(result.messaging) || isSelected(result.external_push_client_only) ? `` : `//`) + ` implementation "me.leolin:ShortcutBadger:1.1.22@aar"
 
     // In-App Messaging
-    ` + (isSelected(result.in_app_messaging) ? `` : `//`) + ` implementation "com.google.firebase:firebase-inappmessaging-display:19.0.0"
+    ` + (isSelected(result.in_app_messaging) ? `` : `//`) + ` implementation "com.google.firebase:firebase-inappmessaging-display:19.0.2"
     // Analytics seems to be required for In-App Messaging
-    ` + (isSelected(result.in_app_messaging) && !isSelected(result.analytics) ? `` : `//`) + ` implementation "com.google.firebase:firebase-analytics:17.2.0"
+    ` + (isSelected(result.in_app_messaging) && !isSelected(result.analytics) ? `` : `//`) + ` implementation "com.google.firebase:firebase-analytics:17.2.1"
 
     // Cloud Storage
-    ` + (isSelected(result.storage) ? `` : `//`) + ` implementation "com.google.firebase:firebase-storage:19.0.1"
+    ` + (isSelected(result.storage) ? `` : `//`) + ` implementation "com.google.firebase:firebase-storage:19.1.0"
 
     // Cloud Functions
     ` + (isSelected(result.functions) ? `` : `//`) + ` implementation "com.google.firebase:firebase-functions:19.0.1"
 
     // AdMob / Ads
-    ` + (isSelected(result.admob) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ads:18.2.0"
+    ` + (isSelected(result.admob) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ads:18.3.0"
 
     // ML Kit
-    ` + (isSelected(result.ml_kit) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision:23.0.0"
-    ` + (isSelected(result.ml_kit_image_labeling) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision-image-label-model:18.0.0"
-    ` + (isSelected(result.ml_kit_object_detection) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision-object-detection-model:19.0.1"
-    ` + (isSelected(result.ml_kit_custom_model) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-model-interpreter:21.0.0"
-    ` + (isSelected(result.ml_kit_natural_language_identification) || isSelected(result.ml_kit_natural_language_smartreply) || isSelected(result.ml_kit_natural_language_translation) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language:21.0.2"
-    ` + (isSelected(result.ml_kit_natural_language_identification) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language-language-id-model:20.0.5"
-    ` + (isSelected(result.ml_kit_natural_language_translation) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language-translate-model:20.0.5"
-    ` + (isSelected(result.ml_kit_natural_language_smartreply) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language-smart-reply-model:20.0.5"
+    ` + (isSelected(result.ml_kit) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision:24.0.1"
+    ` + (isSelected(result.ml_kit_image_labeling) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision-image-label-model:19.0.0"
+    ` + (isSelected(result.ml_kit_object_detection) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision-object-detection-model:19.0.3"
+    ` + (isSelected(result.ml_kit_custom_model) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-model-interpreter:22.0.1"
+    ` + (isSelected(result.ml_kit_natural_language_identification) || isSelected(result.ml_kit_natural_language_smartreply) || isSelected(result.ml_kit_natural_language_translation) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language:22.0.0"
+    ` + (isSelected(result.ml_kit_natural_language_identification) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language-language-id-model:20.0.7"
+    ` + (isSelected(result.ml_kit_natural_language_translation) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language-translate-model:20.0.7"
+    ` + (isSelected(result.ml_kit_natural_language_smartreply) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language-smart-reply-model:20.0.7"
 
     // Facebook Authentication
     ` + (isSelected(result.facebook_auth) ? `` : `//`) + ` implementation "com.facebook.android:facebook-core:5.4.0"

src/mlkit/custommodel/index.android.ts

@@ -96,45 +96,31 @@ export class MLKitCustomModel extends MLKitCustomModelBase {
 const registeredModels = [];
 
 function getInterpreter(localModelFile?: string): any {
-  const firModelOptionsBuilder = new com.google.firebase.ml.custom.FirebaseModelOptions.Builder();
-
   const localModelName = localModelFile.lastIndexOf("/") === -1 ? localModelFile : localModelFile.substring(localModelFile.lastIndexOf("/") + 1);
   let localModelRegistrationSuccess = false;
 
   if (localModelFile) {
-    if (registeredModels.indexOf(localModelName) > -1) {
-      localModelRegistrationSuccess = true;
-      firModelOptionsBuilder.setLocalModelName(localModelName)
-    } else {
-      const firModelLocalBuilder = new com.google.firebase.ml.common.modeldownload.FirebaseLocalModel.Builder(localModelName);
+    const localModelBuilder = new com.google.firebase.ml.custom.FirebaseCustomLocalModel.Builder();
 
-      if (localModelFile.indexOf("~/") === 0) {
-        firModelLocalBuilder.setFilePath(fs.knownFolders.currentApp().path + localModelFile.substring(1));
-      } else {
-        // note that this doesn't seem to work, let's advice users to use ~/ for now
-        firModelLocalBuilder.setAssetFilePath(localModelFile);
-      }
+    // TODO use same for iOS, or is this not even required?
+    // if (registeredModels.indexOf(localModelName) > -1) {
+    //   localModelRegistrationSuccess = true;
+    //   localModelBuilder.setFilePath(localModelFile);
 
-      localModelRegistrationSuccess = com.google.firebase.ml.common.modeldownload.FirebaseModelManager.getInstance().registerLocalModel(firModelLocalBuilder.build());
+    // } else {
+    //   const firModelLocalBuilder = new com.google.firebase.ml.common.modeldownload.FirebaseLocalModel.Builder(localModelName);
 
-      if (localModelRegistrationSuccess) {
-        registeredModels.push(localModelName);
-        firModelOptionsBuilder.setLocalModelName(localModelName)
+      if (localModelFile.indexOf("~/") === 0) {
+        localModelBuilder.setFilePath(fs.knownFolders.currentApp().path + localModelFile.substring(1));
+      } else {
+        // note that this doesn't seem to work, let's advice users to use ~/ for now (TODO check if this is still te case)
+        localModelBuilder.setAssetFilePath(localModelFile);
       }
-    }
-  }
 
-  // if (options.cloudModelName) {
-  //   firModelOptionsBuilder.setRemoteModelName(options.cloudModelName)
-  // }
-
-  if (!localModelRegistrationSuccess) {
-    // TODO handle this case upstream
-    console.log("No (cloud or local) model was successfully loaded.");
-    return null;
+    const firModelOptions = new com.google.firebase.ml.custom.FirebaseModelInterpreterOptions.Builder(localModelBuilder.build()).build();
+    return com.google.firebase.ml.custom.FirebaseModelInterpreter.getInstance(firModelOptions);
   }
-
-  return com.google.firebase.ml.custom.FirebaseModelInterpreter.getInstance(firModelOptionsBuilder.build());
+  return null;
 }
 
 export function useCustomModel(options: MLKitCustomModelOptions): Promise<MLKitCustomModelResult> {

src/mlkit/custommodel/index.ios.ts

@@ -101,27 +101,23 @@ export class MLKitCustomModel extends MLKitCustomModelBase {
 }
 
 function getInterpreter(localModelFile: string): FIRModelInterpreter {
-  let localModelRegistrationSuccess = false;
-  let cloudModelRegistrationSuccess = false;
-  let localModelName;
-
   if (localModelFile) {
-    localModelName = localModelFile.lastIndexOf("/") === -1 ? localModelFile : localModelFile.substring(localModelFile.lastIndexOf("/") + 1);
+    let localModelFilePath: string;
 
-    // make sure we load the model (with the same name) only once
-    if (FIRModelManager.modelManager().localModelWithName(localModelName)) {
-      localModelRegistrationSuccess = true;
+    if (localModelFile.indexOf("~/") === 0) {
+      localModelFilePath = fs.knownFolders.currentApp().path + localModelFile.substring(1);
     } else {
-      let localModelFilePath: string;
-      if (localModelFile.indexOf("~/") === 0) {
-        localModelFilePath = fs.knownFolders.currentApp().path + localModelFile.substring(1);
-      } else {
-        localModelFilePath = NSBundle.mainBundle.pathForResourceOfType(
-            localModelFile.substring(0, localModelFile.lastIndexOf(".")),
-            localModelFile.substring(localModelFile.lastIndexOf(".") + 1));
-      }
-      const localModelSource = FIRLocalModel.alloc().initWithNamePath(localModelName, localModelFilePath);
-      localModelRegistrationSuccess = FIRModelManager.modelManager().registerLocalModel(localModelSource);
+      localModelFilePath = NSBundle.mainBundle.pathForResourceOfType(
+          localModelFile.substring(0, localModelFile.lastIndexOf(".")),
+          localModelFile.substring(localModelFile.lastIndexOf(".") + 1));
+    }
+
+    const localModel: FIRCustomLocalModel = FIRCustomLocalModel.alloc().initWithModelPath(localModelFilePath);
+
+    if (localModel) {
+      return FIRModelInterpreter.modelInterpreterForLocalModel(localModel);
+    } else {
+      console.log("No (cloud or local) model was successfully loaded.");
     }
   }
 
@@ -137,20 +133,14 @@ function getInterpreter(localModelFile: string): FIRModelInterpreter {
 
     cloudModelRegistrationSuccess = FIRModelManager.modelManager().registerRemoteModel(fIRCloudModelSource);
     console.log("cloudModelRegistrationSuccess: " + cloudModelRegistrationSuccess);
-  }
-  */
 
-  if (!localModelRegistrationSuccess && !cloudModelRegistrationSuccess) {
-    // TODO handle this case upstream
-    console.log("No (cloud or local) model was successfully loaded.");
-    return null;
+    const fIRModelOptions = FIRModelOptions.alloc().initWithRemoteModelNameLocalModelName(
+        null, // cloudModelRegistrationSuccess ? cloudModelName : null,
+        localModelRegistrationSuccess ? localModelName : null);
   }
+  */
 
-  const fIRModelOptions = FIRModelOptions.alloc().initWithRemoteModelNameLocalModelName(
-      null, // cloudModelRegistrationSuccess ? cloudModelName : null,
-      localModelRegistrationSuccess ? localModelName : null);
-
-  return FIRModelInterpreter.modelInterpreterWithOptions(fIRModelOptions);
+  return null;
 }
 
 export function useCustomModel(options: MLKitCustomModelOptions): Promise<MLKitCustomModelResult> {

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-plugin-firebase",
-  "version": "10.1.2",
+  "version": "10.2.0",
   "description": "Fire. Base. Firebase!",
   "main": "firebase",
   "typings": "index.d.ts",
@@ -77,7 +77,7 @@
     "generate.typings.android.dynamiclinks": "npm run generate.typings.android --nativescript-plugin-firebase:typings=dynamiclinks --nativescript-plugin-firebase:typingsproject=demo",
     "generate.typings.android.firestore": "npm run generate.typings.android --nativescript-plugin-firebase:typings=firestore",
     "generate.typings.android.messaging": "npm run generate.typings.android --nativescript-plugin-firebase:typings=messaging",
-    "generate.typings.android.playservices": "npm run generate.typings.android --nativescript-plugin-firebase:typings=playservices",
+    "generate.typings.android.playservices.gms": "npm run generate.typings.android --nativescript-plugin-firebase:typings=playservices/gms",
     "generate.typings.android.remoteconfig": "npm run generate.typings.android --nativescript-plugin-firebase:typings=remoteconfig",
     "generate.typings.android.storage": "npm run generate.typings.android --nativescript-plugin-firebase:typings=storage",
     "generate.typings.android.functions": "npm run generate.typings.android --nativescript-plugin-firebase:typings=functions",