Merge branch 'master' into v5

src/@ionic-native/plugins/firebase/index.ts

@@ -3,7 +3,6 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs';
 
 /**
- * @beta
  * @name Firebase
  * @description
  * This plugin brings push notifications, analytics, event tracking, crash reporting and more from Google Firebase to your Cordova project! Android and iOS supported (including iOS 10).
@@ -36,10 +35,10 @@ import { Observable } from 'rxjs';
 export class Firebase extends IonicNativePlugin {
   /**
    * Get the device token
-   * @return {Promise<any>}
+   * @return {Promise<null | string>} Note that token will be null if it has not been established yet
    */
   @Cordova()
-  getToken(): Promise<any> {
+  getToken(): Promise<null | string> {
     return;
   }
 
@@ -270,6 +269,44 @@ export class Firebase extends IonicNativePlugin {
     return;
   }
 
+  /**
+   * Start a trace.
+   * @param {string} trace Trace name
+   */
+  @Cordova()
+  startTrace(trace: string): Promise<any> {
+    return;
+  }
+
+  /**
+   * To count the performance-related events that occur in your app (such as cache hits or retries), add a line of code
+   * similar to the following whenever the event occurs, using a string other than retry to name that event if you are
+   * counting a different type of event:
+   * @param {string} trace Trace name
+   * @param {string} counter Counter
+   */
+  @Cordova()
+  incrementCounter(trace: string, counter: string): Promise<any> {
+    return;
+  }
+
+  /**
+   * Stop the trace
+   * @param {string} trace Trace name
+   */
+  @Cordova()
+  stopTrace(trace: string): void {}
+
+  /**
+   * Allows the user to enable/disable analytics collection
+   * @param {boolean} enabled value to set collection
+   * @returns {Promise<any>}
+   */
+  @Cordova()
+  setAnalyticsCollectionEnabled(enabled: boolean): Promise<any> {
+    return;
+  }
+
   /**
    * Sends an SMS to the user with the SMS verification code and returns the Verification ID required to sign in using phone authentication
    * @param {string} phoneNumber
@@ -299,14 +336,4 @@ export class Firebase extends IonicNativePlugin {
   ): Promise<any> {
     return;
   }
-
-  /**
-   * Allows the user to enable/disable analytics collection
-   * @param {boolean} enabled value to set collection
-   * @returns {Promise<any>}
-   */
-  @Cordova()
-  setAnalyticsCollectionEnabled(enabled: boolean): Promise<any> {
-    return;
-  }
 }