Bump Firebase Android SDK to the latest available versions #1213

Author: EddyVerbruggen

demo-ng/firebase.nativescript.json

@@ -24,5 +24,6 @@
   "ml_kit_face_detection": true,
   "ml_kit_image_labeling": true,
   "ml_kit_custom_model": true,
-  "ml_kit_natural_language_identification": true
+  "ml_kit_natural_language_identification": true,
+  "ml_kit_natural_language_smartreply": true
 }

publish/scripts/installer.js

@@ -252,10 +252,14 @@ function promptQuestions() {
         name: 'ml_kit_custom_model',
         description: 'With Ml Kit, do you want to use a custom TensorFlow Lite model? (y/n)',
         default: 'n'
-      // }, {
-      //   name: 'ml_kit_natural_language_identification',
-      //   description: 'With Ml Kit, do you want to use recognize natural languages? (y/n)',
-      //   default: 'n'
+      }, {
+        name: 'ml_kit_natural_language_identification',
+        description: 'With Ml Kit, do you want to recognize natural languages? (y/n)',
+        default: 'n'
+      }, {
+        name: 'ml_kit_natural_language_smartreply',
+        description: 'With Ml Kit, do you want to use smart reply? (y/n)',
+        default: 'n'
       }], function (mlkitErr, mlkitResult) {
         if (mlkitErr) {
           return console.log(mlkitErr);
@@ -429,8 +433,10 @@ end`) + `
 ` + (isSelected(result.ml_kit) && isSelected(result.ml_kit_face_detection) ? `` : `#`) + `pod 'Firebase/MLVisionFaceModel'
 ` + (isSelected(result.ml_kit) && isSelected(result.ml_kit_image_labeling) ? `` : `#`) + `pod 'Firebase/MLVisionLabelModel'
 ` + (isSelected(result.ml_kit) && isSelected(result.ml_kit_custom_model) ? `` : `#`) + `pod 'Firebase/MLModelInterpreter'
-# Natural Language is commented for now, because of (likely) this issue: https://github.com/firebase/firebase-ios-sdk/issues/2324
-` + (isSelected(result.ml_kit) && isSelected(result.ml_kit_natural_language_identification) ? `#` : `#`) + `pod 'Firebase/MLNLLanguageID'
+` + (isSelected(result.ml_kit) && isSelected(result.ml_kit_natural_language_identification) ? `` : `#`) + `pod 'Firebase/MLNaturalLanguage'
+` + (isSelected(result.ml_kit) && isSelected(result.ml_kit_natural_language_identification) ? `` : `#`) + `pod 'Firebase/MLNLLanguageID'
+` + (isSelected(result.ml_kit) && isSelected(result.ml_kit_natural_language_smartreply) ? `` : `#`) + `pod 'Firebase/MLCommon'
+` + (isSelected(result.ml_kit) && isSelected(result.ml_kit_natural_language_smartreply) ? `` : `#`) + `pod 'Firebase/MLNLSmartReply'
 
 # Facebook Authentication
 ` + (isSelected(result.facebook_auth) ? `` : `#`) + `pod 'FBSDKCoreKit', '~> 4.38.0'
@@ -731,67 +737,66 @@ dependencies {
     implementation "com.android.support:support-compat:$supportVersion"
 
     // make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
-    implementation "com.google.firebase:firebase-core:16.0.6"
-
-    // implementation "com.google.firebase:firebase-analytics:16.0.6"
+    implementation "com.google.firebase:firebase-core:16.0.8"
 
     // for reading google-services.json and configuration
     implementation "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
 
     // Authentication
-    ` + (!externalPushClientOnly && (!isPresent(result.authentication) || isSelected(result.authentication)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-auth:16.1.0"
+    ` + (!externalPushClientOnly && (!isPresent(result.authentication) || isSelected(result.authentication)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-auth:16.2.1"
 
     // Realtime DB
-    ` + (!externalPushClientOnly && (!isPresent(result.realtimedb) || isSelected(result.realtimedb)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-database:16.0.6"
+    ` + (!externalPushClientOnly && (!isPresent(result.realtimedb) || isSelected(result.realtimedb)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-database:16.1.0"
 
     // Cloud Firestore
-    ` + (isSelected(result.firestore) ? `` : `//`) + ` implementation "com.google.firebase:firebase-firestore:18.0.0"
+    ` + (isSelected(result.firestore) ? `` : `//`) + ` implementation "com.google.firebase:firebase-firestore:18.2.0"
 
     // Remote Config
-    ` + (isSelected(result.remote_config) ? `` : `//`) + ` implementation "com.google.firebase:firebase-config:16.1.3"
+    ` + (isSelected(result.remote_config) ? `` : `//`) + ` implementation "com.google.firebase:firebase-config:16.5.0"
 
     // Performance Monitoring
-    ` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` implementation "com.google.firebase:firebase-perf:16.2.3"
+    ` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` implementation "com.google.firebase:firebase-perf:16.2.5"
 
     // Crash Reporting
     ` + (isSelected(result.crash_reporting) && !isSelected(result.crashlytics) ? `` : `//`) + ` implementation "com.google.firebase:firebase-crash:16.2.1"
 
     // Crashlytics
-    ` + (isSelected(result.crashlytics) ? `` : `//`) + ` implementation "com.crashlytics.sdk.android:crashlytics:2.9.8"
+    ` + (isSelected(result.crashlytics) ? `` : `//`) + ` implementation "com.crashlytics.sdk.android:crashlytics:2.9.9"
 
     // Cloud Messaging (FCM)
-    ` + (isSelected(result.messaging) || externalPushClientOnly ? `` : `//`) + ` implementation "com.google.firebase:firebase-messaging:17.3.4"
+    ` + (isSelected(result.messaging) || externalPushClientOnly ? `` : `//`) + ` implementation "com.google.firebase:firebase-messaging:17.6.0"
 
     // In-App Messaging
-    ` + (isSelected(result.in_app_messaging) ? `` : `//`) + ` implementation "com.google.firebase:firebase-inappmessaging-display:17.0.5"
+    ` + (isSelected(result.in_app_messaging) ? `` : `//`) + ` implementation "com.google.firebase:firebase-inappmessaging-display:17.1.1"
 
     // Cloud Storage
-    ` + (isSelected(result.storage) ? `` : `//`) + ` implementation "com.google.firebase:firebase-storage:16.0.5"
+    ` + (isSelected(result.storage) ? `` : `//`) + ` implementation "com.google.firebase:firebase-storage:16.1.0"
 
     // Cloud Functions
-    ` + (isSelected(result.functions) ? `` : `//`) + ` implementation "com.google.firebase:firebase-functions:16.1.3"
+    ` + (isSelected(result.functions) ? `` : `//`) + ` implementation "com.google.firebase:firebase-functions:16.3.0"
 
     // AdMob / Ads
-    ` + (isSelected(result.admob) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ads:17.1.2"
+    ` + (isSelected(result.admob) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ads:17.2.0"
 
     // ML Kit
-    ` + (isSelected(result.ml_kit) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision:18.0.2"
+    ` + (isSelected(result.ml_kit) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision:19.0.3"
     ` + (isSelected(result.ml_kit_image_labeling) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision-image-label-model:17.0.2"
-    ` + (isSelected(result.ml_kit_custom_model) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-model-interpreter:16.2.4"
-    ` + (isSelected(result.ml_kit_natural_language_identification) ? `//` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language:18.1.1"
-    ` + (isSelected(result.ml_kit_natural_language_identification) ? `//` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language-language-id-model:18.0.2"
+    ` + (isSelected(result.ml_kit_custom_model) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-model-interpreter:18.0.0"
+    ` + (isSelected(result.ml_kit_natural_language_identification) || isSelected(result.ml_kit_natural_language_smartreply) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language:18.2.0"
+    ` + (isSelected(result.ml_kit_natural_language_identification) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language-language-id-model:18.0.3"
+    ` + (isSelected(result.ml_kit_natural_language_smartreply) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language-smart-reply-model:18.0.0"
 
     // Facebook Authentication
     ` + (isSelected(result.facebook_auth) ? `` : `//`) + ` implementation ("com.facebook.android:facebook-android-sdk:4.35.0"){ exclude group: 'com.google.zxing' }
 
     // Google Sign-In Authentication
-    ` + (isSelected(result.google_auth) ? `` : `//`) + ` implementation "com.google.android.gms:play-services-auth:16.0.0"
+    ` + (isSelected(result.google_auth) ? `` : `//`) + ` implementation "com.google.android.gms:play-services-auth:$googlePlayServicesVersion"
 
     // Invites
-    ` + (isSelected(result.invites) ? `` : `//`) + ` implementation "com.google.firebase:firebase-invites:16.0.6"
+    ` + (isSelected(result.invites) ? `` : `//`) + ` implementation "com.google.firebase:firebase-invites:16.1.1"
 
     // Dynamic Links
-    ` + (isSelected(result.dynamic_links) ? `` : `//`) + ` implementation "com.google.firebase:firebase-dynamic-links:16.1.5"
+    ` + (isSelected(result.dynamic_links) ? `` : `//`) + ` implementation "com.google.firebase:firebase-dynamic-links:16.1.8"
 }
 
 apply plugin: "com.google.gms.google-services"

src/firebase.android.ts

@@ -553,11 +553,13 @@ firebase.getRemoteConfig = arg => {
           .build();
       firebaseRemoteConfig.setConfigSettings(remoteConfigSettings);
 
+      // TODO async, do we need to wait?
       const defaults = firebase.getRemoteConfigDefaults(arg.properties);
-      firebaseRemoteConfig.setDefaults(firebase.toHashMap(defaults));
+      firebaseRemoteConfig.setDefaultsAsync(firebase.toHashMap(defaults));
 
       const returnMethod = throttled => {
-        firebaseRemoteConfig.activateFetched();
+        // TODO async, so do we need to wait?
+        firebaseRemoteConfig.activate();
 
         const lastFetchTime = firebaseRemoteConfig.getInfo().getFetchTimeMillis();
         const lastFetch = new Date(lastFetchTime);

src/mlkit/custommodel/index.android.ts

@@ -93,43 +93,42 @@ 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;
-  let cloudModelRegistrationSuccess = false;
-  let localModelName;
 
   if (localModelFile) {
-    localModelName = localModelFile.lastIndexOf("/") === -1 ? localModelFile : localModelFile.substring(localModelFile.lastIndexOf("/") + 1);
-
-    if (com.google.firebase.ml.custom.FirebaseModelManager.getInstance().getLocalModelSource(localModelName)) {
+    if (registeredModels.indexOf(localModelName) > -1) {
       localModelRegistrationSuccess = true;
       firModelOptionsBuilder.setLocalModelName(localModelName)
     } else {
-      console.log("model not yet loaded: " + localModelFile);
-
-      const firModelLocalSourceBuilder = new com.google.firebase.ml.custom.model.FirebaseLocalModelSource.Builder(localModelName);
+      const firModelLocalBuilder = new com.google.firebase.ml.common.modeldownload.FirebaseLocalModel.Builder(localModelName);
 
       if (localModelFile.indexOf("~/") === 0) {
-        firModelLocalSourceBuilder.setFilePath(fs.knownFolders.currentApp().path + localModelFile.substring(1));
+        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
-        firModelLocalSourceBuilder.setAssetFilePath(localModelFile);
+        firModelLocalBuilder.setAssetFilePath(localModelFile);
       }
 
-      localModelRegistrationSuccess = com.google.firebase.ml.custom.FirebaseModelManager.getInstance().registerLocalModelSource(firModelLocalSourceBuilder.build());
+      localModelRegistrationSuccess = com.google.firebase.ml.common.modeldownload.FirebaseModelManager.getInstance().registerLocalModel(firModelLocalBuilder.build());
+
       if (localModelRegistrationSuccess) {
+        registeredModels.push(localModelName);
         firModelOptionsBuilder.setLocalModelName(localModelName)
       }
     }
   }
 
   // if (options.cloudModelName) {
-  //   firModelOptionsBuilder.setCloudModelName(options.cloudModelName)
+  //   firModelOptionsBuilder.setRemoteModelName(options.cloudModelName)
   // }
 
-  if (!localModelRegistrationSuccess && !cloudModelRegistrationSuccess) {
+  if (!localModelRegistrationSuccess) {
     // TODO handle this case upstream
     console.log("No (cloud or local) model was successfully loaded.");
     return null;

src/mlkit/imagelabeling/index.android.ts

@@ -27,9 +27,9 @@ export class MLKitImageLabeling extends MLKitImageLabelingBase {
 
         // see https://github.com/firebase/quickstart-android/blob/0f4c86877fc5f771cac95797dffa8bd026dd9dc7/mlkit/app/src/main/java/com/google/firebase/samples/apps/mlkit/textrecognition/TextRecognitionProcessor.java#L62
         for (let i = 0; i < labels.size(); i++) {
-          const label = labels.get(i);
+          const label: com.google.firebase.ml.vision.label.FirebaseVisionImageLabel = labels.get(i);
           result.labels.push({
-            text: label.getLabel(),
+            text: label.getText(),
             confidence: label.getConfidence()
           });
         }
@@ -44,13 +44,13 @@ export class MLKitImageLabeling extends MLKitImageLabelingBase {
   }
 }
 
-function getDetector(confidenceThreshold: number): any {
+function getDetector(confidenceThreshold: number): com.google.firebase.ml.vision.label.FirebaseVisionImageLabeler {
   const labelDetectorOptions =
-      new com.google.firebase.ml.vision.label.FirebaseVisionLabelDetectorOptions.Builder()
+      new com.google.firebase.ml.vision.label.FirebaseVisionOnDeviceImageLabelerOptions.Builder()
           .setConfidenceThreshold(confidenceThreshold)
           .build();
 
-  return com.google.firebase.ml.vision.FirebaseVision.getInstance().getVisionLabelDetector(labelDetectorOptions);
+  return com.google.firebase.ml.vision.FirebaseVision.getInstance().getOnDeviceImageLabeler(labelDetectorOptions);
 }
 
 export function labelImageOnDevice(options: MLKitImageLabelingOptions): Promise<MLKitImageLabelingOnDeviceResult> {
@@ -66,9 +66,9 @@ export function labelImageOnDevice(options: MLKitImageLabelingOptions): Promise<
 
           if (labels) {
             for (let i = 0; i < labels.size(); i++) {
-              const label = labels.get(i);
+              const label: com.google.firebase.ml.vision.label.FirebaseVisionImageLabel = labels.get(i);
               result.labels.push({
-                text: label.getLabel(),
+                text: label.getText(),
                 confidence: label.getConfidence()
               });
             }
@@ -84,7 +84,7 @@ export function labelImageOnDevice(options: MLKitImageLabelingOptions): Promise<
       });
 
       firebaseVisionLabelDetector
-          .detectInImage(getImage(options))
+          .processImage(getImage(options))
           .addOnSuccessListener(onSuccessListener)
           .addOnFailureListener(onFailureListener);
 
@@ -99,13 +99,11 @@ export function labelImageCloud(options: MLKitImageLabelingOptions): Promise<MLK
   return new Promise((resolve, reject) => {
     try {
       const cloudDetectorOptions =
-          new com.google.firebase.ml.vision.cloud.FirebaseVisionCloudDetectorOptions.Builder()
-              // TODO in a future version this may change to only confidenceThreshold (as it now is on iOS)
-              .setModelType(com.google.firebase.ml.vision.cloud.FirebaseVisionCloudDetectorOptions.STABLE_MODEL)
-              .setMaxResults(10)
+          new com.google.firebase.ml.vision.label.FirebaseVisionCloudImageLabelerOptions.Builder()
+              .setConfidenceThreshold(options.confidenceThreshold || 0.5)
               .build();
 
-      const firebaseVisionCloudLabelDetector = com.google.firebase.ml.vision.FirebaseVision.getInstance().getVisionCloudLabelDetector(cloudDetectorOptions);
+      const firebaseVisionCloudLabelDetector = com.google.firebase.ml.vision.FirebaseVision.getInstance().getCloudImageLabeler(cloudDetectorOptions);
 
       const onSuccessListener = new com.google.android.gms.tasks.OnSuccessListener({
         onSuccess: labels => {
@@ -115,9 +113,9 @@ export function labelImageCloud(options: MLKitImageLabelingOptions): Promise<MLK
 
           if (labels) {
             for (let i = 0; i < labels.size(); i++) {
-              const label = labels.get(i);
+              const label: com.google.firebase.ml.vision.label.FirebaseVisionImageLabel = labels.get(i);
               result.labels.push({
-                text: label.getLabel(),
+                text: label.getText(),
                 confidence: label.getConfidence()
               });
             }
@@ -133,7 +131,7 @@ export function labelImageCloud(options: MLKitImageLabelingOptions): Promise<MLK
       });
 
       firebaseVisionCloudLabelDetector
-          .detectInImage(getImage(options))
+          .processImage(getImage(options))
           .addOnSuccessListener(onSuccessListener)
           .addOnFailureListener(onFailureListener);
 

src/package.json

@@ -84,7 +84,9 @@
     "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",
-    "generate.typings.android.mlkit": "npm run generate.typings.android --nativescript-plugin-firebase:typings=mlkit"
+    "generate.typings.android.mlkit": "npm run generate.typings.android --nativescript-plugin-firebase:typings=mlkit",
+    "generate.typings.android.crashlytics": "npm run generate.typings.android --nativescript-plugin-firebase:typings=crashlytics",
+    "generate.typings.android.inappmessaging": "npm run generate.typings.android --nativescript-plugin-firebase:typings=inappmessaging"
   },
   "repository": {
     "type": "git",

src/platforms/android/typings/inappmessaging/android-declarations.d.ts

@@ -0,0 +1,4 @@
+declare module native {	export class Array<T> {	constructor(); length: number; [index: number]: T; } }
+
+import globalAndroid = android;
+