diff --git a/.gitignore b/.gitignore
index e5bf0e71..ca865112 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ src/**/*.d.ts
 !src/index.d.ts
 !src/references.d.ts
 !src/analytics/analytics.d.ts
+!src/mlkit/mlkit.d.ts
 !src/platforms/web/typings/firebase-webapi.d.ts
 !src/platforms/ios/typings/*.d.ts
 !src/platforms/android/typings/**/*.d.ts
@@ -30,3 +31,4 @@ demo/report/report.html
 demo/report/stats.json
 !publish/scripts/*.js
 publish/package
+/npm-debug.log
diff --git a/README.md b/README.md
index 7f877236..4249c2a3 100755
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@
 * [Analytics](docs/ANALYTICS.md)
 * [Invites and Dynamic Links](docs/INVITES_DYNAMICLINKS.md)
 * [AdMob](docs/ADMOB.md)
+* [ML Kit](docs/ML_KIT.md)
 
 ## Prerequisites
 Head on over to [https://console.firebase.google.com/](https://console.firebase.google.com/) and sign up for a free account.
diff --git a/demo-ng/firebase.nativescript.json b/demo-ng/firebase.nativescript.json
index 0a8a63b2..1db16a41 100644
--- a/demo-ng/firebase.nativescript.json
+++ b/demo-ng/firebase.nativescript.json
@@ -1,6 +1,7 @@
 {
   "using_ios": true,
   "using_android": true,
+  "realtimedb": false,
   "firestore": true,
   "remote_config": true,
   "messaging": true,
@@ -10,5 +11,6 @@
   "facebook_auth": true,
   "google_auth": true,
   "admob": true,
-  "invites": true
+  "invites": true,
+  "ml_kit": true
 }
diff --git a/demo/app/app.css b/demo/app/app.css
index 95728c85..71abcbcd 100644
--- a/demo/app/app.css
+++ b/demo/app/app.css
@@ -65,6 +65,10 @@ button {
   background-color: #BBBB77;
 }
 
+.button-mlkit {
+  background-color: orange;
+}
+
 .button-messaging {
   background-color: #6d996c;
 }
diff --git a/demo/app/app.ts b/demo/app/app.ts
index f517e249..cff81d12 100644
--- a/demo/app/app.ts
+++ b/demo/app/app.ts
@@ -1,7 +1,13 @@
 import "./bundle-config";
 import * as application from 'tns-core-modules/application';
+import { UnhandledErrorEventData } from "tns-core-modules/application";
 
 // added this here so we can do some wiring
 require("nativescript-plugin-firebase");
 
+// testing this.. we may be able to hook that up to Crashlytics. Either via docs, or automatically.
+application.on(application.uncaughtErrorEvent, (args: UnhandledErrorEventData) => {
+  console.log("[app.js]: Uncaught NativeScript Error: " + args.error);
+});
+
 application.run({ moduleName: "main-page" });
diff --git a/demo/app/images/EAN.jpg b/demo/app/images/EAN.jpg
new file mode 100644
index 00000000..8b1cd527
Binary files /dev/null and b/demo/app/images/EAN.jpg differ
diff --git a/demo/app/images/please_walk_on_the_grass.jpg b/demo/app/images/please_walk_on_the_grass.jpg
new file mode 100644
index 00000000..6d17b302
Binary files /dev/null and b/demo/app/images/please_walk_on_the_grass.jpg differ
diff --git a/demo/app/images/qrcode.png b/demo/app/images/qrcode.png
new file mode 100644
index 00000000..e13190cb
Binary files /dev/null and b/demo/app/images/qrcode.png differ
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index 664336b5..a6ca28d0 100644
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -71,7 +71,7 @@
       <TabViewItem.view>
         <ScrollView>
           <GridLayout columns="*, *"
-                      rows="auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto"
+                      rows="auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto"
                       horizontalAlignment="stretch"
                       class="tab-content">
 
@@ -194,6 +194,13 @@
 
             <Button row="42" col="0" text="send invitation" tap="{{ sendInvitation }}" class="button button-invites"/>
             <Button row="42" col="1" text="get invitation" tap="{{ getInvitation }}" class="button button-invites"/>
+
+            <Label row="43" colSpan="2" text="ML Kit" class="subtitle"/>
+
+            <Button row="44" col="0" text="recognize text" tap="{{ recognizeText }}" class="button button-mlkit"/>
+            <Button row="44" col="1" text="scan barcode" tap="{{ scanBarcode }}" class="button button-mlkit"/>
+
+            <Label row="45" colSpan="2" text="{{ mlOutput }}" class="message" textWrap="true"/>
           </GridLayout>
 
         </ScrollView>
diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index b85db1cc..bffe1421 100644
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -5,7 +5,10 @@ import { isIOS } from "tns-core-modules/platform";
 import { AddEventListenerResult, User } from "nativescript-plugin-firebase";
 import * as fs from "tns-core-modules/file-system";
 
-import * as firebase from"nativescript-plugin-firebase";
+import * as firebase from "nativescript-plugin-firebase";
+import { MLKitRecognizeTextResult, MLKitScanBarcodesResult } from "../../src/mlkit/mlkit";
+import { ImageSource } from "tns-core-modules/image-source";
+
 const firebaseWebApi = require("nativescript-plugin-firebase/app");
 
 declare const Crashlytics: any;
@@ -348,7 +351,7 @@ export class HelloWorldModel extends Observable {
         setTimeout(() => {
           alert({
             title: "Dynamic Link!",
-            message: result,
+            message: JSON.stringify(result),
             okButtonText: "Awesome!"
           });
         }, 500);
@@ -392,6 +395,43 @@ export class HelloWorldModel extends Observable {
     );
   }
 
+  public recognizeText(): void {
+    const img = new ImageSource();
+    // img.fromFile("~/images/telerik-logo.png")
+    img.fromFile("~/images/please_walk_on_the_grass.jpg")
+        .then(() => {
+          firebase.mlkit.recognizeText({
+            image: img
+          }).then(
+              (result: MLKitRecognizeTextResult) => {
+                console.log("ML Kit result: " + JSON.stringify(result));
+                this.set("mlOutput", JSON.stringify(result.features));
+              }, errorMessage => {
+                console.log("ML Kit error: " + errorMessage);
+              }
+          );
+        })
+        .catch(err => console.log("Error loading image: " + img));
+  }
+
+  public scanBarcode(): void {
+    const img = new ImageSource();
+    img.fromFile("~/images/qrcode.png")
+        .then(() => {
+          firebase.mlkit.scanBarcodes({
+            image: img
+          }).then(
+              (result: MLKitScanBarcodesResult) => {
+                console.log("ML Kit result: " + JSON.stringify(result));
+                this.set("mlOutput", JSON.stringify(result.features));
+              }, errorMessage => {
+                console.log("ML Kit error: " + errorMessage);
+              }
+          );
+        })
+        .catch(err => console.log("Error loading image: " + img));
+  }
+
   public doSetAnalyticsUserProperty(): void {
     firebase.analytics.setUserProperty({
       key: "origin", // note that this needs to be preregistered, see https://support.google.com/firebase/answer/6317519?hl=en&ref_topic=6317489#create-property
diff --git a/demo/resources/Android/app.gradle b/demo/app_resources/Android/app.gradle
similarity index 100%
rename from demo/resources/Android/app.gradle
rename to demo/app_resources/Android/app.gradle
diff --git a/demo/resources/Android/google-services.json b/demo/app_resources/Android/google-services.json
similarity index 100%
rename from demo/resources/Android/google-services.json
rename to demo/app_resources/Android/google-services.json
diff --git a/demo/resources/Android/src/main/AndroidManifest.xml b/demo/app_resources/Android/src/main/AndroidManifest.xml
similarity index 89%
rename from demo/resources/Android/src/main/AndroidManifest.xml
rename to demo/app_resources/Android/src/main/AndroidManifest.xml
index 7f12eda6..8df5b08d 100644
--- a/demo/resources/Android/src/main/AndroidManifest.xml
+++ b/demo/app_resources/Android/src/main/AndroidManifest.xml
@@ -25,7 +25,13 @@
 		android:label="@string/app_name"
 		android:theme="@style/AppTheme">
 
-    <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
+    <meta-data
+				android:name="com.facebook.sdk.ApplicationId"
+				android:value="@string/facebook_app_id"/>
+
+		<meta-data
+				android:name="com.google.firebase.ml.vision.DEPENDENCIES"
+				android:value="text,barcode" />
 
 		<activity
 			android:name="com.tns.NativeScriptActivity"
diff --git a/demo/resources/Android/src/main/res/drawable-hdpi/background.png b/demo/app_resources/Android/src/main/res/drawable-hdpi/background.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-hdpi/background.png
rename to demo/app_resources/Android/src/main/res/drawable-hdpi/background.png
diff --git a/demo/resources/Android/src/main/res/drawable-hdpi/icon.png b/demo/app_resources/Android/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-hdpi/icon.png
rename to demo/app_resources/Android/src/main/res/drawable-hdpi/icon.png
diff --git a/demo/resources/Android/src/main/res/drawable-hdpi/logo.png b/demo/app_resources/Android/src/main/res/drawable-hdpi/logo.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-hdpi/logo.png
rename to demo/app_resources/Android/src/main/res/drawable-hdpi/logo.png
diff --git a/demo/resources/Android/src/main/res/drawable-ldpi/background.png b/demo/app_resources/Android/src/main/res/drawable-ldpi/background.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-ldpi/background.png
rename to demo/app_resources/Android/src/main/res/drawable-ldpi/background.png
diff --git a/demo/resources/Android/src/main/res/drawable-ldpi/icon.png b/demo/app_resources/Android/src/main/res/drawable-ldpi/icon.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-ldpi/icon.png
rename to demo/app_resources/Android/src/main/res/drawable-ldpi/icon.png
diff --git a/demo/resources/Android/src/main/res/drawable-ldpi/logo.png b/demo/app_resources/Android/src/main/res/drawable-ldpi/logo.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-ldpi/logo.png
rename to demo/app_resources/Android/src/main/res/drawable-ldpi/logo.png
diff --git a/demo/resources/Android/src/main/res/drawable-mdpi/background.png b/demo/app_resources/Android/src/main/res/drawable-mdpi/background.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-mdpi/background.png
rename to demo/app_resources/Android/src/main/res/drawable-mdpi/background.png
diff --git a/demo/resources/Android/src/main/res/drawable-mdpi/icon.png b/demo/app_resources/Android/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-mdpi/icon.png
rename to demo/app_resources/Android/src/main/res/drawable-mdpi/icon.png
diff --git a/demo/resources/Android/src/main/res/drawable-mdpi/logo.png b/demo/app_resources/Android/src/main/res/drawable-mdpi/logo.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-mdpi/logo.png
rename to demo/app_resources/Android/src/main/res/drawable-mdpi/logo.png
diff --git a/demo/resources/Android/src/main/res/drawable-nodpi/splash_screen.xml b/demo/app_resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
rename to demo/app_resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
diff --git a/demo/resources/Android/src/main/res/drawable-nodpi/trigrid.png b/demo/app_resources/Android/src/main/res/drawable-nodpi/trigrid.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-nodpi/trigrid.png
rename to demo/app_resources/Android/src/main/res/drawable-nodpi/trigrid.png
diff --git a/demo/resources/Android/src/main/res/drawable-xhdpi/background.png b/demo/app_resources/Android/src/main/res/drawable-xhdpi/background.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-xhdpi/background.png
rename to demo/app_resources/Android/src/main/res/drawable-xhdpi/background.png
diff --git a/demo/resources/Android/src/main/res/drawable-xhdpi/icon.png b/demo/app_resources/Android/src/main/res/drawable-xhdpi/icon.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-xhdpi/icon.png
rename to demo/app_resources/Android/src/main/res/drawable-xhdpi/icon.png
diff --git a/demo/resources/Android/src/main/res/drawable-xhdpi/logo.png b/demo/app_resources/Android/src/main/res/drawable-xhdpi/logo.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-xhdpi/logo.png
rename to demo/app_resources/Android/src/main/res/drawable-xhdpi/logo.png
diff --git a/demo/resources/Android/src/main/res/drawable-xxhdpi/background.png b/demo/app_resources/Android/src/main/res/drawable-xxhdpi/background.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-xxhdpi/background.png
rename to demo/app_resources/Android/src/main/res/drawable-xxhdpi/background.png
diff --git a/demo/resources/Android/src/main/res/drawable-xxhdpi/icon.png b/demo/app_resources/Android/src/main/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-xxhdpi/icon.png
rename to demo/app_resources/Android/src/main/res/drawable-xxhdpi/icon.png
diff --git a/demo/resources/Android/src/main/res/drawable-xxhdpi/logo.png b/demo/app_resources/Android/src/main/res/drawable-xxhdpi/logo.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-xxhdpi/logo.png
rename to demo/app_resources/Android/src/main/res/drawable-xxhdpi/logo.png
diff --git a/demo/resources/Android/src/main/res/drawable-xxxhdpi/background.png b/demo/app_resources/Android/src/main/res/drawable-xxxhdpi/background.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-xxxhdpi/background.png
rename to demo/app_resources/Android/src/main/res/drawable-xxxhdpi/background.png
diff --git a/demo/resources/Android/src/main/res/drawable-xxxhdpi/icon.png b/demo/app_resources/Android/src/main/res/drawable-xxxhdpi/icon.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-xxxhdpi/icon.png
rename to demo/app_resources/Android/src/main/res/drawable-xxxhdpi/icon.png
diff --git a/demo/resources/Android/src/main/res/drawable-xxxhdpi/logo.png b/demo/app_resources/Android/src/main/res/drawable-xxxhdpi/logo.png
similarity index 100%
rename from demo/resources/Android/src/main/res/drawable-xxxhdpi/logo.png
rename to demo/app_resources/Android/src/main/res/drawable-xxxhdpi/logo.png
diff --git a/demo/resources/Android/src/main/res/values-v21/colors.xml b/demo/app_resources/Android/src/main/res/values-v21/colors.xml
similarity index 100%
rename from demo/resources/Android/src/main/res/values-v21/colors.xml
rename to demo/app_resources/Android/src/main/res/values-v21/colors.xml
diff --git a/demo/resources/Android/src/main/res/values-v21/styles.xml b/demo/app_resources/Android/src/main/res/values-v21/styles.xml
similarity index 100%
rename from demo/resources/Android/src/main/res/values-v21/styles.xml
rename to demo/app_resources/Android/src/main/res/values-v21/styles.xml
diff --git a/demo/resources/Android/src/main/res/values/colors.xml b/demo/app_resources/Android/src/main/res/values/colors.xml
similarity index 100%
rename from demo/resources/Android/src/main/res/values/colors.xml
rename to demo/app_resources/Android/src/main/res/values/colors.xml
diff --git a/demo/resources/Android/src/main/res/values/facebooklogin.xml b/demo/app_resources/Android/src/main/res/values/facebooklogin.xml
similarity index 100%
rename from demo/resources/Android/src/main/res/values/facebooklogin.xml
rename to demo/app_resources/Android/src/main/res/values/facebooklogin.xml
diff --git a/demo/resources/Android/src/main/res/values/styles.xml b/demo/app_resources/Android/src/main/res/values/styles.xml
similarity index 100%
rename from demo/resources/Android/src/main/res/values/styles.xml
rename to demo/app_resources/Android/src/main/res/values/styles.xml
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
diff --git a/demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
rename to demo/app_resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
diff --git a/demo/resources/iOS/Assets.xcassets/Contents.json b/demo/app_resources/iOS/Assets.xcassets/Contents.json
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/Contents.json
rename to demo/app_resources/iOS/Assets.xcassets/Contents.json
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json b/demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
rename to demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png b/demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png b/demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png b/demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png b/demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png b/demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png b/demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png b/demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png b/demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png b/demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json b/demo/app_resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json
rename to demo/app_resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png b/demo/app_resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png b/demo/app_resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json b/demo/app_resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json
rename to demo/app_resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png b/demo/app_resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png
diff --git a/demo/resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png b/demo/app_resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png
similarity index 100%
rename from demo/resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png
rename to demo/app_resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png
diff --git a/demo/resources/iOS/GoogleService-Info.plist b/demo/app_resources/iOS/GoogleService-Info.plist
similarity index 100%
rename from demo/resources/iOS/GoogleService-Info.plist
rename to demo/app_resources/iOS/GoogleService-Info.plist
diff --git a/demo/resources/iOS/Info.plist b/demo/app_resources/iOS/Info.plist
similarity index 100%
rename from demo/resources/iOS/Info.plist
rename to demo/app_resources/iOS/Info.plist
diff --git a/demo/resources/iOS/LaunchScreen.storyboard b/demo/app_resources/iOS/LaunchScreen.storyboard
similarity index 100%
rename from demo/resources/iOS/LaunchScreen.storyboard
rename to demo/app_resources/iOS/LaunchScreen.storyboard
diff --git a/demo/resources/iOS/app.entitlements b/demo/app_resources/iOS/app.entitlements
similarity index 100%
rename from demo/resources/iOS/app.entitlements
rename to demo/app_resources/iOS/app.entitlements
diff --git a/demo/resources/iOS/build.xcconfig b/demo/app_resources/iOS/build.xcconfig
similarity index 100%
rename from demo/resources/iOS/build.xcconfig
rename to demo/app_resources/iOS/build.xcconfig
diff --git a/demo/firebase.nativescript.json b/demo/firebase.nativescript.json
index c9f75d7a..2231fb1c 100644
--- a/demo/firebase.nativescript.json
+++ b/demo/firebase.nativescript.json
@@ -1,15 +1,16 @@
 {
   "using_ios": true,
   "using_android": true,
-  "firestore": false,
   "realtimedb": true,
+  "firestore": false,
   "remote_config": true,
   "messaging": true,
-  "crashlytics": true,
   "crash_reporting": false,
+  "crashlytics": true,
   "storage": true,
   "facebook_auth": true,
   "google_auth": true,
   "admob": true,
-  "invites": true
+  "invites": true,
+  "ml_kit": true
 }
diff --git a/demo/nsconfig.json b/demo/nsconfig.json
index b95362d5..d2b232c9 100644
--- a/demo/nsconfig.json
+++ b/demo/nsconfig.json
@@ -1,4 +1,4 @@
 {
   "appPath": "app",
-  "appResourcesPath": "resources"
+  "appResourcesPath": "app_resources"
 }
diff --git a/docs/AUTHENTICATION.md b/docs/AUTHENTICATION.md
index e10d7145..d4059405 100644
--- a/docs/AUTHENTICATION.md
+++ b/docs/AUTHENTICATION.md
@@ -516,11 +516,11 @@ Then add the following lines to your code and check for setup instructions for y
 ```
 
 #### iOS
- If you didn't choose this feature during installation you can open the `Podfile` in the plugin's `platforms/ios` folder and uncomment the `GoogleSignIn` line.
+If you didn't choose this feature during installation you can open the `Podfile` in the plugin's `platforms/ios` folder and uncomment the `GoogleSignIn` line.
  
- Make sure the URL Scheme for `REVERSED_CLIENT_ID` is in `app/App_Resources/iOS/Info.plist`:
+Make sure the URL Scheme for `REVERSED_CLIENT_ID` is in `app/App_Resources/iOS/Info.plist`:
  
- ```xml
+```xml
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -534,7 +534,7 @@ Then add the following lines to your code and check for setup instructions for y
 			</array>
 		</dict>
 	</array>
- ```
+```
 
 #### Android
 
diff --git a/docs/ML_KIT.md b/docs/ML_KIT.md
new file mode 100644
index 00000000..0cab9b0a
--- /dev/null
+++ b/docs/ML_KIT.md
@@ -0,0 +1,4 @@
+Just dumping a few things I should not forget to add to the doc:
+
+- see step 3 @ https://firebase.google.com/docs/ml-kit/android/recognize-text
+
diff --git a/publish/scripts/installer.js b/publish/scripts/installer.js
index caf79716..d5b58711 100755
--- a/publish/scripts/installer.js
+++ b/publish/scripts/installer.js
@@ -163,6 +163,10 @@ function promptQuestions() {
         name: 'google_auth',
         description: 'Are you using Firebase Google Authentication (y/n)',
         default: 'n'
+    }, {
+        name: 'ml_kit',
+        description: 'Are you using ML Kit (y/n)',
+        default: 'n'
     }, {
       name: 'admob',
       description: 'Are you using AdMob (y/n)',
@@ -228,7 +232,9 @@ function writePodFile(result) {
     }
     try {
         fs.writeFileSync(directories.ios + '/Podfile',
-`pod 'Firebase', '~> 4.11.0' 
+`platform :ios, '9.0'
+
+pod 'Firebase/Core', '~> 5.0.0' 
 pod 'Firebase/Auth'
 
 # Uncomment if you want to enable Realtime DB
@@ -268,6 +274,17 @@ end`) + `
 # Uncomment if you want to enable Invites and/or Dynamic Links
 ` + (isSelected(result.invites) ? `` : `#`) + `pod 'Firebase/Invites'
 
+# Uncomment if you want to enable ML Kit
+` + (isSelected(result.ml_kit) ? `` : `#`) + `pod 'Firebase/MLVision'
+# TODO we'de better make these conditional as well
+` + (!isSelected(result.ml_kit) ? `` : `
+pod 'Firebase/MLVisionBarcodeModel'
+pod 'Firebase/MLVisionFaceModel'
+pod 'Firebase/MLVisionLabelModel'
+pod 'Firebase/MLVisionTextModel'
+pod 'Firebase/MLModelInterpreter'
+`) + `
+
 # Uncomment if you want to enable Facebook Authentication
 ` + (isSelected(result.facebook_auth) ? `` : `#`) + `pod 'FBSDKCoreKit'
 ` + (isSelected(result.facebook_auth) ? `` : `#`) + `pod 'FBSDKLoginKit'
@@ -461,17 +478,11 @@ repositories {
 }
 
 def supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "26.0.0"
-def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : "12.0.1"
+def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : "15.0.0"
 
-` + (isSelected(result.firestore) ? `
-if ( VersionNumber.parse( googlePlayServicesVersion ) < VersionNumber.parse( '11.4.2' ) ) {
-    throw new GradleException(" googlePlayServicesVersion set too low, as you want to use firestore please update to at least 11.4.2 ( currently set to $googlePlayServicesVersion )");
-}
-` : `
-if ( VersionNumber.parse( googlePlayServicesVersion ) < VersionNumber.parse( '9.2' ) ) {
-    throw new GradleException("googlePlayServicesVersion set too low, please update to at least '9.2' ( currently set to $googlePlayServicesVersion )");
+if ( VersionNumber.parse( googlePlayServicesVersion ) < VersionNumber.parse( '15.0.0' ) ) {
+    throw new GradleException(" googlePlayServicesVersion set too low, please update to at least 15.0.0 ( currently set to $googlePlayServicesVersion )");
 }
-`) + `
 
 dependencies {
     compile "com.android.support:appcompat-v7:$supportVersion"
@@ -481,35 +492,38 @@ dependencies {
     compile "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)
-    compile "com.google.firebase:firebase-core:$googlePlayServicesVersion"
-    compile "com.google.firebase:firebase-auth:$googlePlayServicesVersion"
+    compile "com.google.firebase:firebase-core:15.0.2"
+    compile "com.google.firebase:firebase-auth:15.1.0"
 
     // for reading google-services.json and configuration
     compile "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
 
     // Uncomment if you want to use the regular Database
-    ` + (!isPresent(result.realtimedb) || isSelected(result.realtimedb) ? `` : `//`) + ` compile "com.google.firebase:firebase-database:$googlePlayServicesVersion"
+    ` + (!isPresent(result.realtimedb) || isSelected(result.realtimedb) ? `` : `//`) + ` compile "com.google.firebase:firebase-database:15.0.0"
 
     // Uncomment if you want to use 'Cloud Firestore'
-    ` + (isSelected(result.firestore) ? `` : `//`) + ` compile "com.google.firebase:firebase-firestore:$googlePlayServicesVersion"
+    ` + (isSelected(result.firestore) ? `` : `//`) + ` compile "com.google.firebase:firebase-firestore:16.0.0"
 
     // Uncomment if you want to use 'Remote Config'
-    ` + (isSelected(result.remote_config) ? `` : `//`) + ` compile "com.google.firebase:firebase-config:$googlePlayServicesVersion"
+    ` + (isSelected(result.remote_config) ? `` : `//`) + ` compile "com.google.firebase:firebase-config:15.0.2"
 
     // Uncomment if you want to use 'Crash Reporting'
-    ` + (isSelected(result.crash_reporting) && !isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.google.firebase:firebase-crash:$googlePlayServicesVersion"
+    ` + (isSelected(result.crash_reporting) && !isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.google.firebase:firebase-crash:15.0.2"
 
     // Uncomment if you want to use 'Crashlytics'
     ` + (isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.crashlytics.sdk.android:crashlytics:2.9.1"
 
-    // Uncomment if you want FCM (Firebase Cloud Messaging)
-    ` + (isSelected(result.messaging) ? `` : `//`) + ` compile "com.google.firebase:firebase-messaging:$googlePlayServicesVersion"
+    // Uncomment if you want to use FCM (Firebase Cloud Messaging)
+    ` + (isSelected(result.messaging) ? `` : `//`) + ` compile "com.google.firebase:firebase-messaging:15.0.2"
+
+    // Uncomment if you want to use Google Cloud Storage
+    ` + (isSelected(result.storage) ? `` : `//`) + ` compile "com.google.firebase:firebase-storage:15.0.2"
 
-    // Uncomment if you want Google Cloud Storage
-    ` + (isSelected(result.storage) ? `` : `//`) + ` compile "com.google.firebase:firebase-storage:$googlePlayServicesVersion"
+    // Uncomment if you want to use AdMob
+    ` + (isSelected(result.admob) ? `` : `//`) + ` compile "com.google.firebase:firebase-ads:15.0.0"
 
-    // Uncomment if you want AdMob
-    ` + (isSelected(result.admob) ? `` : `//`) + ` compile "com.google.firebase:firebase-ads:$googlePlayServicesVersion"
+    // Uncomment if you want to use ML Kit
+    ` + (isSelected(result.ml_kit) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision:15.0.0"
 
     // Uncomment if you need Facebook Authentication
     ` + (isSelected(result.facebook_auth) ? `` : `//`) + ` compile ("com.facebook.android:facebook-android-sdk:4.+"){ exclude group: 'com.google.zxing' }
@@ -612,7 +626,7 @@ module.exports = function($logger, $projectData) {
 
             let gradlePattern = /classpath ('|")com\\.android\\.tools\\.build:gradle:\\d+\\.\\d+\\.\\d+('|")/;
             let googleServicesPattern = /classpath ('|")com\\.google\\.gms:google-services:\\d+\\.\\d+\\.\\d+('|")/;
-            let latestGoogleServicesPlugin = 'classpath "com.google.gms:google-services:3.1.2"';
+            let latestGoogleServicesPlugin = 'classpath "com.google.gms:google-services:3.3.1"';
             if (googleServicesPattern.test(buildGradleContent)) {
                 buildGradleContent = buildGradleContent.replace(googleServicesPattern, latestGoogleServicesPlugin);
             } else {
diff --git a/src/firebase-common.ts b/src/firebase-common.ts
index 975613a8..d41eeaaf 100755
--- a/src/firebase-common.ts
+++ b/src/firebase-common.ts
@@ -1,6 +1,7 @@
 import { prompt } from "tns-core-modules/ui/dialogs";
 import { firestore } from "./firebase";
 import * as analytics from "./analytics/analytics";
+import * as mlkit from "./mlkit/mlkit";
 import * as applicationSettings from "tns-core-modules/application-settings";
 
 export const firebase: any = {
@@ -12,6 +13,7 @@ export const firebase: any = {
   _receivedNotificationCallback: null,
   _dynamicLinkCallback: null,
   analytics,
+  mlkit,
   firestore: {},
   invites: {
     MATCH_TYPE: {
diff --git a/src/firebase.android.ts b/src/firebase.android.ts
index da64ef60..acbe0d77 100755
--- a/src/firebase.android.ts
+++ b/src/firebase.android.ts
@@ -97,14 +97,14 @@ const dynamicLinksEnabled = lazy(() => typeof(com.google.android.gms.appinvite)
               if (firebase._dynamicLinkCallback === null) {
                 firebase._cachedDynamicLink = {
                   url: result.getLink().toString(),
-                  matchConfidence: 1,
+                  // matchConfidence: 1,
                   minimumAppVersion: result.getMinimumAppVersion()
                 };
               } else {
                 setTimeout(() => {
                   firebase._dynamicLinkCallback({
                     url: result.getLink().toString(),
-                    matchConfidence: 1,
+                    // matchConfidence: 1,
                     minimumAppVersion: result.getMinimumAppVersion()
                   });
                 });
@@ -1911,7 +1911,7 @@ firebase.uploadFile = arg => {
             updated: new Date(metadata.getUpdatedTimeMillis()),
             bucket: metadata.getBucket(),
             size: metadata.getSizeBytes(),
-            url: metadata.getDownloadUrl().toString()
+            // url: metadata.getDownloadUrl().toString()
           });
         }
       });
diff --git a/src/firebase.d.ts b/src/firebase.d.ts
index cb53503b..d473e14c 100644
--- a/src/firebase.d.ts
+++ b/src/firebase.d.ts
@@ -113,8 +113,9 @@ export interface InitOptions {
 
   /**
    * Get notified when a dynamic link was used to launch the app. Alternatively use addOnDynamicLinkReceivedCallback.
+   * TODO iOS seems to return an object; not a string
    */
-  onDynamicLinkCallback?: (url: string) => void;
+  onDynamicLinkCallback?: (data: DynamicLinkData) => void;
 }
 
 export interface QueryRangeOption {
@@ -422,6 +423,11 @@ export interface GetRemoteConfigResult {
   properties: Object;
 }
 
+export interface DynamicLinkData {
+  url: string;
+  minimumAppVersion: string;
+}
+
 /**
  * The returned object in the callback handler of the addOnMessageReceivedCallback function.
  *
@@ -493,6 +499,11 @@ export interface UploadFileOptions {
 
 export interface UploadFileResult {
   name: string;
+  contentType: string;
+  created: Date;
+  updated: Date;
+  bucket: string;
+  size: number;
 }
 
 export interface DownloadFileOptions {
@@ -694,9 +705,6 @@ export namespace admob {
   function hideBanner(): Promise<any>;
 }
 
-// Analytics module
-export * from './analytics';
-
 // Invites module
 export namespace invites {
 
diff --git a/src/firebase.ios.ts b/src/firebase.ios.ts
index 2b1ffba8..82a82a32 100755
--- a/src/firebase.ios.ts
+++ b/src/firebase.ios.ts
@@ -120,7 +120,7 @@ firebase.addAppDelegateMethods = appDelegate => {
           console.log(">>> dynamicLink.url.absoluteString: " + dynamicLink.url.absoluteString);
           firebase._cachedDynamicLink = {
             url: dynamicLink.url.absoluteString,
-            matchConfidence: dynamicLink.matchConfidence,
+            // matchConfidence: dynamicLink.matchConfidence,
             minimumAppVersion: dynamicLink.minimumAppVersion
           };
           result = true;
@@ -158,13 +158,13 @@ firebase.addAppDelegateMethods = appDelegate => {
             if (firebase._dynamicLinkCallback) {
               firebase._dynamicLinkCallback({
                 url: dynamicLink.url.absoluteString,
-                matchConfidence: dynamicLink.matchConfidence,
+                // matchConfidence: dynamicLink.matchConfidence,
                 minimumAppVersion: dynamicLink.minimumAppVersion
               });
             } else {
               firebase._cachedDynamicLink = {
                 url: dynamicLink.url.absoluteString,
-                matchConfidence: dynamicLink.matchConfidence,
+                // matchConfidence: dynamicLink.matchConfidence,
                 minimumAppVersion: dynamicLink.minimumAppVersion
               };
             }
@@ -231,13 +231,13 @@ firebase.addAppDelegateMethods = appDelegate => {
               if (firebase._dynamicLinkCallback) {
                 firebase._dynamicLinkCallback({
                   url: dynamicLink.url.absoluteString,
-                  matchConfidence: dynamicLink.matchConfidence,
+                  // matchConfidence: dynamicLink.matchConfidence,
                   minimumAppVersion: dynamicLink.minimumAppVersion
                 });
               } else {
                 firebase._cachedDynamicLink = {
                   url: dynamicLink.url.absoluteString,
-                  matchConfidence: dynamicLink.matchConfidence,
+                  // matchConfidence: dynamicLink.matchConfidence,
                   minimumAppVersion: dynamicLink.minimumAppVersion
                 };
               }
@@ -519,7 +519,7 @@ firebase._registerForRemoteNotifications = () => {
         userInfoJSON.foreground = false;
       }
     });
-    FIRMessaging.messaging().remoteMessageDelegate = firebase._firebaseRemoteMessageDelegate;
+    FIRMessaging.messaging().delegate = firebase._firebaseRemoteMessageDelegate;
 
   } else {
     const notificationTypes = UIUserNotificationType.Alert | UIUserNotificationType.Badge | UIUserNotificationType.Sound | UIUserNotificationActivationMode.Background;
@@ -1154,7 +1154,7 @@ firebase.getAuthToken = arg => {
             resolve(token);
           }
         };
-        user.getTokenForcingRefreshCompletion(arg.forceRefresh, onCompletion);
+        user.getIDTokenForcingRefreshCompletion(arg.forceRefresh, onCompletion);
       } else {
         reject("Log in first");
       }
@@ -1168,7 +1168,7 @@ firebase.getAuthToken = arg => {
 firebase.login = arg => {
   return new Promise((resolve, reject) => {
     try {
-      const onCompletion = (user: FIRUser, error?: NSError) => {
+      const onCompletionWithUser = (user: FIRUser, error?: NSError) => {
         if (error) {
           // also disconnect from Google otherwise ppl can't connect with a different account
           if (typeof(GIDSignIn) !== "undefined") {
@@ -1185,6 +1185,10 @@ firebase.login = arg => {
         }
       };
 
+      const onCompletionWithAuthResult = (authResult: FIRAuthDataResult, error?: NSError) => {
+        onCompletionWithUser(authResult.user, error);
+      };
+
       const fAuth = FIRAuth.auth();
       if (fAuth === null) {
         reject("Run init() first!");
@@ -1194,7 +1198,7 @@ firebase.login = arg => {
       firebase.moveLoginOptionsToObjects(arg);
 
       if (arg.type === firebase.LoginType.ANONYMOUS) {
-        fAuth.signInAnonymouslyWithCompletion(onCompletion);
+        fAuth.signInAnonymouslyWithCompletion(onCompletionWithAuthResult);
 
       } else if (arg.type === firebase.LoginType.PASSWORD) {
         if (!arg.passwordOptions || !arg.passwordOptions.email || !arg.passwordOptions.password) {
@@ -1209,15 +1213,15 @@ firebase.login = arg => {
             if (error) {
               // ignore, as this one was probably already linked, so just return the user
               log("--- linking error: " + error.localizedDescription);
-              fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletion);
+              fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletionWithUser);
             } else {
-              onCompletion(user);
+              onCompletionWithUser(user);
             }
           };
           fAuth.currentUser.linkWithCredentialCompletion(fIRAuthCredential, onCompletionLink);
 
         } else {
-          fAuth.signInWithEmailPasswordCompletion(arg.passwordOptions.email, arg.passwordOptions.password, onCompletion);
+          fAuth.signInWithEmailPasswordCompletion(arg.passwordOptions.email, arg.passwordOptions.password, onCompletionWithAuthResult);
         }
 
       } else if (arg.type === firebase.LoginType.EMAIL_LINK) {
@@ -1263,7 +1267,8 @@ firebase.login = arg => {
           return;
         }
 
-        FIRPhoneAuthProvider.provider().verifyPhoneNumberCompletion(arg.phoneOptions.phoneNumber, (verificationID: string, error: NSError) => {
+        // TODO does this still work (there's a delegate now which we're not implementing)?
+        FIRPhoneAuthProvider.provider().verifyPhoneNumberUIDelegateCompletion(arg.phoneOptions.phoneNumber, null, (verificationID: string, error: NSError) => {
           if (error) {
             reject(error.localizedDescription);
             return;
@@ -1274,14 +1279,14 @@ firebase.login = arg => {
               const onCompletionLink = (user, error) => {
                 if (error) {
                   // ignore, as this one was probably already linked, so just return the user
-                  fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletion);
+                  fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletionWithUser);
                 } else {
-                  onCompletion(user);
+                  onCompletionWithUser(user);
                 }
               };
               fAuth.currentUser.linkWithCredentialCompletion(fIRAuthCredential, onCompletionLink);
             } else {
-              fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletion);
+              fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletionWithUser);
             }
           }, arg.phoneOptions.verificationPrompt);
         });
@@ -1293,12 +1298,12 @@ firebase.login = arg => {
         }
 
         if (arg.customOptions.token) {
-          fAuth.signInWithCustomTokenCompletion(arg.customOptions.token, onCompletion);
+          fAuth.signInWithCustomTokenCompletion(arg.customOptions.token, onCompletionWithAuthResult);
         } else if (arg.customOptions.tokenProviderFn) {
           arg.customOptions.tokenProviderFn()
               .then(
                   token => {
-                    fAuth.signInWithCustomTokenCompletion(token, onCompletion);
+                    fAuth.signInWithCustomTokenCompletion(token, onCompletionWithAuthResult);
                   },
                   error => {
                     reject(error);
@@ -1328,15 +1333,15 @@ firebase.login = arg => {
                 if (error) {
                   // ignore, as this one was probably already linked, so just return the user
                   log("--- linking error: " + error.localizedDescription);
-                  fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletion);
+                  fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletionWithUser);
                 } else {
-                  onCompletion(user);
+                  onCompletionWithUser(user);
                 }
               };
               fAuth.currentUser.linkWithCredentialCompletion(fIRAuthCredential, onCompletionLink);
 
             } else {
-              fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletion);
+              fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletionWithUser);
             }
           }
         };
@@ -1381,15 +1386,15 @@ firebase.login = arg => {
               const onCompletionLink = (user, error) => {
                 if (error) {
                   // ignore, as this one was probably already linked, so just return the user
-                  fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletion);
+                  fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletionWithUser);
                 } else {
-                  onCompletion(user);
+                  onCompletionWithUser(user);
                 }
               };
               fAuth.currentUser.linkWithCredentialCompletion(fIRAuthCredential, onCompletionLink);
 
             } else {
-              fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletion);
+              fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletionWithUser);
             }
 
           } else {
@@ -1555,12 +1560,12 @@ firebase.changePassword = arg => {
 firebase.createUser = arg => {
   return new Promise((resolve, reject) => {
     try {
-      const onCompletion = (user: FIRUser, error: NSError) => {
+      const onCompletion = (authResult: FIRAuthDataResult, error: NSError) => {
         if (error) {
           reject(error.localizedDescription);
         } else {
           resolve({
-            key: user.uid
+            key: authResult.user.uid
           });
         }
       };
@@ -1904,15 +1909,15 @@ firebase.remove = path => {
   });
 };
 
-function getStorageRef(reject, arg) {
+function getStorageRef(reject, arg): FIRStorageReference {
   if (typeof(FIRStorage) === "undefined") {
     reject("Uncomment Storage in the plugin's Podfile first");
-    return;
+    return undefined;
   }
 
   if (!arg.remoteFullPath) {
     reject("remoteFullPath is mandatory");
-    return;
+    return undefined;
   }
 
   return arg.bucket ? FIRStorage.storage().referenceForURL(arg.bucket) : firebase.storage;
@@ -1922,13 +1927,13 @@ firebase.uploadFile = arg => {
   return new Promise((resolve, reject) => {
     try {
 
-      const onCompletion = (metadata, error) => {
+      const onCompletion = (metadata: FIRStorageMetadata, error: NSError) => {
         if (error) {
           reject(error.localizedDescription);
         } else {
           resolve({
             name: metadata.name,
-            url: metadata.downloadURL() ? metadata.downloadURL().absoluteString : null,
+            // url: metadata.downloadURL() ? metadata.downloadURL().absoluteString : null,
             contentType: metadata.contentType,
             created: metadata.timeCreated,
             updated: metadata.updated,
@@ -1938,7 +1943,7 @@ firebase.uploadFile = arg => {
         }
       };
 
-      const storageRef = getStorageRef(reject, arg);
+      const storageRef: FIRStorageReference = getStorageRef(reject, arg);
 
       if (!storageRef) {
         return;
@@ -2103,6 +2108,8 @@ firebase.subscribeToTopic = topicName => {
       if (topicName.indexOf("/topics/") === -1) {
         topicName = "/topics/" + topicName;
       }
+
+      // TODO there's also (un)subscribeToTopicCompletion (resolve when completed).. perhaps this has been added to Android as well
       FIRMessaging.messaging().subscribeToTopic(topicName);
       resolve();
     } catch (ex) {
@@ -2406,7 +2413,7 @@ firebase.firestore.set = (collectionPath: string, documentPath: string, document
           .documentWithPath(documentPath);
 
       if (options && options.merge) {
-        docRef.setDataOptionsCompletion(document, FIRSetOptions.merge(), (error: NSError) => {
+        docRef.setDataMergeCompletion(document, true, (error: NSError) => {
           if (error) {
             reject(error.localizedDescription);
           } else {
@@ -2679,16 +2686,14 @@ class FIRMessagingDelegateImpl extends NSObject implements FIRMessagingDelegate
     return this;
   }
 
-  public applicationReceivedRemoteMessage(remoteMessage: FIRMessagingRemoteMessage): void {
-    this.callback(remoteMessage.appData);
-  }
-
+  // TODO test that receiving push notifications in the foreground still works
   public messagingDidReceiveMessage(messaging: FIRMessaging, remoteMessage: FIRMessagingRemoteMessage): void {
+    console.log(">> fcm message received");
     this.callback(remoteMessage.appData);
   }
 
-  public messagingDidRefreshRegistrationToken(messaging: FIRMessaging, fcmToken: string): void {
-    console.log(">> fcmToken refreshed: " + fcmToken);
+  public messagingDidReceiveRegistrationToken(messaging: FIRMessaging, fcmToken: string): void {
+    console.log(">> fcmToken received: " + fcmToken);
     firebase._onTokenRefreshNotification(fcmToken);
   }
 }
diff --git a/src/index.d.ts b/src/index.d.ts
index db0a16ea..4a42a0dc 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -1 +1,3 @@
-export * from './firebase';
\ No newline at end of file
+export * from './firebase';
+export * from './analytics';
+export * from './mlkit';
diff --git a/src/mlkit/index.ts b/src/mlkit/index.ts
new file mode 100644
index 00000000..b326d09d
--- /dev/null
+++ b/src/mlkit/index.ts
@@ -0,0 +1,2 @@
+import * as ml from "./mlkit";
+export const mlkit = ml;
diff --git a/src/mlkit/mlkit.android.ts b/src/mlkit/mlkit.android.ts
new file mode 100644
index 00000000..a5cf3d3a
--- /dev/null
+++ b/src/mlkit/mlkit.android.ts
@@ -0,0 +1,128 @@
+import {
+  MLKitOptions,
+  MLKitRecognizeTextOptions,
+  MLKitRecognizeTextResult,
+  MLKitScanBarcodesOptions,
+  MLKitScanBarcodesResult
+} from "./mlkit";
+import { ImageSource } from "tns-core-modules/image-source";
+
+declare const com: any;
+
+export function recognizeText(options: MLKitRecognizeTextOptions): Promise<MLKitRecognizeTextResult> {
+  return new Promise((resolve, reject) => {
+    try {
+      const firebaseVisionTextDetector = com.google.firebase.ml.vision.FirebaseVision.getInstance().getVisionTextDetector();
+
+      const onSuccessListener = new com.google.android.gms.tasks.OnSuccessListener({
+        onSuccess: (textBlocks) => {
+          console.log(">>> success: " + textBlocks);
+          const blocks = textBlocks.getBlocks();
+          console.log(">>> blocks: " + blocks);
+          console.log(">>> blocks size: " + blocks.size());
+
+          const result = <MLKitRecognizeTextResult>{
+            features: []
+          };
+
+          // 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 < blocks.size(); i++) {
+            const textBlock = blocks.get(i);
+            console.log(">>> success textBlock: " + textBlock);
+            console.log(">>> success textBlock.getText(): " + textBlock.getText());
+
+            result.features.push({
+              text: textBlock.getText()
+            });
+          }
+
+          firebaseVisionTextDetector.close();
+
+          resolve(result);
+        }
+      });
+
+      const onFailureListener = new com.google.android.gms.tasks.OnFailureListener({
+        onFailure: exception => reject(exception.getMessage())
+      });
+
+      firebaseVisionTextDetector
+          .detectInImage(getImage(options))
+          .addOnSuccessListener(onSuccessListener)
+          .addOnFailureListener(onFailureListener);
+
+    } catch (ex) {
+      console.log("Error in firebase.mlkit.recognizeText: " + ex);
+      reject(ex);
+    }
+  });
+}
+
+export function scanBarcodes(options: MLKitScanBarcodesOptions): Promise<MLKitScanBarcodesResult> {
+  return new Promise((resolve, reject) => {
+    try {
+      /*
+      // TODO from options.. it makes scanning faster (esp when camera support is added)
+      const firebaseVisionBarcodeDetectorOptions =
+          new com.google.firebase.ml.vision.barcode.FirebaseVisionBarcodeDetectorOptions.Builder()
+              .setBarcodeFormats([
+                  com.google.firebase.ml.vision.barcode.FirebaseVisionBarcode.FORMAT_QR_CODE,
+                  com.google.firebase.ml.vision.barcode.FirebaseVisionBarcode.FORMAT_AZTEC
+              ])
+              .build();
+      */
+
+      const firebaseVisionBarcodeDetector =
+          // com.google.firebase.ml.vision.FirebaseVision.getInstance().getVisionBarcodeDetector(firebaseVisionBarcodeDetectorOptions);
+          com.google.firebase.ml.vision.FirebaseVision.getInstance().getVisionBarcodeDetector();
+
+      const onSuccessListener = new com.google.android.gms.tasks.OnSuccessListener({
+        onSuccess: (barcodes) => {
+          console.log(">>> barcodes: " + barcodes);
+          console.log(">>> barcodes size: " + barcodes.size());
+
+          const result = <MLKitScanBarcodesResult>{
+            features: []
+          };
+
+          // 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 < barcodes.size(); i++) {
+            const barcode = barcodes.get(i);
+            console.log(">>> success barcode: " + barcode);
+            console.log(">>> success barcode.getRawValue(): " + barcode.getRawValue());
+            console.log(">>> success barcode.getDisplayValue(): " + barcode.getDisplayValue());
+
+            result.features.push({
+              text: barcode.getRawValue()
+            });
+          }
+
+          firebaseVisionBarcodeDetector.close();
+
+          resolve(result);
+        }
+      });
+
+      const onFailureListener = new com.google.android.gms.tasks.OnFailureListener({
+        onFailure: exception => reject(exception.getMessage())
+      });
+
+      console.log(">>> scanBarcodes D");
+
+      firebaseVisionBarcodeDetector
+          .detectInImage(getImage(options))
+          .addOnSuccessListener(onSuccessListener)
+          .addOnFailureListener(onFailureListener);
+
+    } catch (ex) {
+      console.log("Error in firebase.mlkit.scanBarcodes: " + ex);
+      reject(ex);
+    }
+  });
+}
+
+function getImage(options: MLKitOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {
+  const image: android.graphics.Bitmap = options.image instanceof ImageSource ? options.image.android : options.image.imageSource.android;
+  return com.google.firebase.ml.vision.common.FirebaseVisionImage.fromBitmap(image);
+}
+
diff --git a/src/mlkit/mlkit.d.ts b/src/mlkit/mlkit.d.ts
new file mode 100644
index 00000000..44625ba0
--- /dev/null
+++ b/src/mlkit/mlkit.d.ts
@@ -0,0 +1,29 @@
+import { QuerySnapshot } from "../firebase";
+import { Image } from "tns-core-modules/ui/image";
+import { ImageSource } from "tns-core-modules/image-source";
+
+export interface MLKitRecognizeTextResult {
+  features: Array<{
+    text: string;
+  }>;
+}
+
+export interface MLKitScanBarcodesResult {
+  features: Array<{
+    text: string;
+  }>;
+}
+
+export interface MLKitOptions {
+  engine?: "device" | "cloud"; // defaults to local, as cloud requires an additional plan
+  image: Image | ImageSource;
+}
+
+export interface MLKitRecognizeTextOptions extends MLKitOptions {
+}
+
+export interface MLKitScanBarcodesOptions extends MLKitOptions {
+}
+
+export declare function recognizeText(options: MLKitRecognizeTextOptions): Promise<MLKitRecognizeTextResult>;
+export declare function scanBarcodes(options: MLKitScanBarcodesOptions): Promise<MLKitScanBarcodesResult>;
diff --git a/src/mlkit/mlkit.ios.ts b/src/mlkit/mlkit.ios.ts
new file mode 100644
index 00000000..665e405b
--- /dev/null
+++ b/src/mlkit/mlkit.ios.ts
@@ -0,0 +1,40 @@
+import { MLKitRecognizeTextOptions, MLKitRecognizeTextResult } from "./mlkit";
+import { ImageSource } from "tns-core-modules/image-source";
+
+export function recognizeText(options: MLKitRecognizeTextOptions): Promise<MLKitRecognizeTextResult> {
+  return new Promise((resolve, reject) => {
+    try {
+      const firVision: FIRVision = FIRVision.vision();
+      const textDetector: FIRVisionTextDetector = firVision.textDetector();
+
+      const image: UIImage = options.image instanceof ImageSource ? options.image.ios : options.image.imageSource.ios;
+      const visionImage: FIRVisionImage = FIRVisionImage.alloc().initWithImage(image);
+
+      textDetector.detectInImageCompletion(visionImage, (features: NSArray<FIRVisionText>, error: NSError) => {
+        if (error !== null) {
+          console.log(">> recog text error: " + error);
+          reject(error.localizedDescription);
+        } else if (features !== null) {
+          console.log(">> recog text ok: " + features);
+          console.log(">> recog text ok, count: " + features.count);
+
+          const result = <MLKitRecognizeTextResult>{
+            features: []
+          };
+
+          for (let i = 0, l = features.count; i < l; i++) {
+            const feature: FIRVisionText = features.objectAtIndex(i);
+            console.log(">>> feature: " + feature.text);
+            result.features.push({
+              text: feature.text
+            });
+          }
+          resolve(result);
+        }
+      });
+    } catch (ex) {
+      console.log("Error in firebase.mlkit.recognizeText: " + ex);
+      reject(ex);
+    }
+  });
+}
diff --git a/src/package.json b/src/package.json
index a494efdc..f8d1cb24 100644
--- a/src/package.json
+++ b/src/package.json
@@ -39,7 +39,7 @@
     "tsc": "tsc -skipLibCheck",
     "plugin.tscwatch": "npm run tsc -- -w",
     "package": "cd ../publish && rimraf ./package && ./pack.sh",
-    "demo.ios": "npm run preparedemo && cd ../demo && rimraf platforms/ios && tns run ios",
+    "demo.ios": "npm run preparedemo && cd ../demo && tns run ios",
     "demo-ng.ios": "npm run preparedemo-ng && cd ../demo-ng && rimraf platforms/ios && tns run ios",
     "demo.android": "npm run preparedemo && cd ../demo && rimraf platforms/android && tns run android",
     "demo-ng.android": "npm run preparedemo-ng && cd ../demo-ng && tns run android",
diff --git a/src/platforms/android/include.gradle b/src/platforms/android/include.gradle
deleted file mode 100644
index 8f93d011..00000000
--- a/src/platforms/android/include.gradle
+++ /dev/null
@@ -1,72 +0,0 @@
-
-android {
-    productFlavors {
-        "fireb" {
-            dimension "fireb"
-        }
-    }
-}
-
-repositories {
-    jcenter()
-    mavenCentral()
-    maven {
-        url "https://maven.google.com"
-    }
-}
-
-def supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "26.0.0"
-def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : "12.0.1"
-
-dependencies {
-    compile "com.android.support:appcompat-v7:$supportVersion"
-    compile "com.android.support:cardview-v7:$supportVersion"
-    compile "com.android.support:customtabs:$supportVersion"
-    compile "com.android.support:design:$supportVersion"
-    compile "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)
-    compile "com.google.firebase:firebase-core:$googlePlayServicesVersion"
-    compile "com.google.firebase:firebase-auth:$googlePlayServicesVersion"
-
-    // for reading google-services.json and configuration
-    compile "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
-
-    // Uncomment if you want to use the regular Database (instead of 'Cloud Firestore')
-//    compile "com.google.firebase:firebase-database:$googlePlayServicesVersion"
-
-    // Uncomment if you want to use 'Cloud Firestore'
-//    compile "com.google.firebase:firebase-firestore:$googlePlayServicesVersion"
-
-    // Uncomment if you want to use 'Remote Config'
-//    compile "com.google.firebase:firebase-config:$googlePlayServicesVersion"
-
-    // Uncomment if you want to use 'Crash Reporting'
-//    compile "com.google.firebase:firebase-crash:$googlePlayServicesVersion"
-
-    // Uncomment if you want to enable 'Crashlytics' (1 / 2)
-//    compile 'com.crashlytics.sdk.android:crashlytics:2.9.1'
-
-    // Uncomment if you want FCM (Firebase Cloud Messaging)
-//    compile "com.google.firebase:firebase-messaging:$googlePlayServicesVersion"
-
-    // Uncomment if you want Google Cloud Storage
-//    compile "com.google.firebase:firebase-storage:$googlePlayServicesVersion"
-
-    // Uncomment if you want AdMob
-//    compile "com.google.firebase:firebase-ads:$googlePlayServicesVersion"
-
-    // Uncomment if you need Facebook Authentication
-//    compile ("com.facebook.android:facebook-android-sdk:4.+"){ exclude group: 'com.google.zxing' }
-
-    // Uncomment if you need Google Sign-In Authentication
-//    compile "com.google.android.gms:play-services-auth:$googlePlayServicesVersion"
-
-    // Uncomment if you need Firebase Invites or Dynamics Links
-//    compile "com.google.firebase:firebase-invites:$googlePlayServicesVersion"
-}
-
-apply plugin: "com.google.gms.google-services"
-
-// Uncomment if you want to enable 'Crashlytics' (2 / 2)
-//apply plugin: "io.fabric"
diff --git a/src/platforms/ios/Podfile b/src/platforms/ios/Podfile
deleted file mode 100644
index 307c9669..00000000
--- a/src/platforms/ios/Podfile
+++ /dev/null
@@ -1,37 +0,0 @@
-pod 'Firebase', '~> 4.11.0'
-pod 'Firebase/Auth'
-
-# Uncomment if you want to enable the regular Database (instead of Cloud Firestore)
-#pod 'Firebase/Database'
-
-# Uncomment if you want to enable Cloud Firestore
-#pod 'Firebase/Firestore'
-
-# Uncomment if you want to enable Remote Config
-#pod 'Firebase/RemoteConfig'
-
-# Uncomment if you want to enable Crash Reporting
-#pod 'Firebase/Crash'
-
-# Uncomment if you want to enable Crashlytics
-#pod 'Fabric'
-#pod 'Crashlytics'
-
-# Uncomment if you want to enable FCM (Firebase Cloud Messaging)
-#pod 'Firebase/Messaging'
-
-# Uncomment if you want to enable Firebase Storage
-#pod 'Firebase/Storage'
-
-# Uncomment if you want to enable AdMob
-#pod 'Firebase/AdMob'
-
-# Uncomment if you want to enable Invites and/or Dynamic Links
-#pod 'Firebase/Invites'
-
-# Uncomment if you want to enable Facebook Authentication
-#pod 'FBSDKCoreKit'
-#pod 'FBSDKLoginKit'
-
-# Uncomment if you want to enable Google Authentication
-#pod 'GoogleSignIn'
diff --git a/src/platforms/ios/typings/objc!FBSDKCoreKit.d.ts b/src/platforms/ios/typings/objc!FBSDKCoreKit.d.ts
index 7495673e..097ec40e 100644
--- a/src/platforms/ios/typings/objc!FBSDKCoreKit.d.ts
+++ b/src/platforms/ios/typings/objc!FBSDKCoreKit.d.ts
@@ -5,6 +5,8 @@ declare class FBSDKAccessToken extends NSObject implements FBSDKCopying, NSSecur
 
 	static currentAccessToken(): FBSDKAccessToken;
 
+	static currentAccessTokenIsActive(): boolean;
+
 	static new(): FBSDKAccessToken; // inherited from NSObject
 
 	static refreshCurrentAccessToken(completionHandler: (p1: FBSDKGraphRequestConnection, p2: any, p3: NSError) => void): void;
@@ -17,6 +19,8 @@ declare class FBSDKAccessToken extends NSObject implements FBSDKCopying, NSSecur
 
 	readonly expirationDate: Date;
 
+	readonly expired: boolean;
+
 	readonly permissions: NSSet<any>;
 
 	readonly refreshDate: Date;
@@ -88,6 +92,8 @@ declare var FBSDKAccessTokenDidChangeNotification: string;
 
 declare var FBSDKAccessTokenDidChangeUserID: string;
 
+declare var FBSDKAccessTokenDidExpire: string;
+
 declare var FBSDKAppEventNameAchievedLevel: string;
 
 declare var FBSDKAppEventNameAddedPaymentInfo: string;
diff --git a/src/platforms/ios/typings/objc!FBSDKLoginKit.d.ts b/src/platforms/ios/typings/objc!FBSDKLoginKit.d.ts
index 8594d5b1..66a50b64 100644
--- a/src/platforms/ios/typings/objc!FBSDKLoginKit.d.ts
+++ b/src/platforms/ios/typings/objc!FBSDKLoginKit.d.ts
@@ -8,6 +8,129 @@ declare const enum FBSDKDefaultAudience {
 	Everyone = 2
 }
 
+declare class FBSDKDeviceLoginCodeInfo extends NSObject {
+
+	static alloc(): FBSDKDeviceLoginCodeInfo; // inherited from NSObject
+
+	static new(): FBSDKDeviceLoginCodeInfo; // inherited from NSObject
+
+	readonly expirationDate: Date;
+
+	readonly identifier: string;
+
+	readonly loginCode: string;
+
+	readonly pollingInterval: number;
+
+	readonly verificationURL: NSURL;
+}
+
+declare const enum FBSDKDeviceLoginErrorSubcode {
+
+	ExcessivePollingErrorSubcode = 1349172,
+
+	AuthorizationDeclinedErrorSubcode = 1349173,
+
+	AuthorizationPendingErrorSubcode = 1349174,
+
+	CodeExpiredErrorSubcode = 1349152
+}
+
+declare class FBSDKDeviceLoginManager extends NSObject implements NSNetServiceDelegate {
+
+	static alloc(): FBSDKDeviceLoginManager; // inherited from NSObject
+
+	static new(): FBSDKDeviceLoginManager; // inherited from NSObject
+
+	delegate: FBSDKDeviceLoginManagerDelegate;
+
+	readonly permissions: NSArray<string>;
+
+	redirectURL: NSURL;
+
+	readonly debugDescription: string; // inherited from NSObjectProtocol
+
+	readonly description: string; // inherited from NSObjectProtocol
+
+	readonly hash: number; // inherited from NSObjectProtocol
+
+	readonly isProxy: boolean; // inherited from NSObjectProtocol
+
+	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
+
+	readonly  // inherited from NSObjectProtocol
+
+	constructor(o: { permissions: NSArray<string>; enableSmartLogin: boolean; });
+
+	cancel(): void;
+
+	class(): typeof NSObject;
+
+	conformsToProtocol(aProtocol: any /* Protocol */): boolean;
+
+	initWithPermissionsEnableSmartLogin(permissions: NSArray<string>, enableSmartLogin: boolean): this;
+
+	isEqual(object: any): boolean;
+
+	isKindOfClass(aClass: typeof NSObject): boolean;
+
+	isMemberOfClass(aClass: typeof NSObject): boolean;
+
+	netServiceDidAcceptConnectionWithInputStreamOutputStream(sender: NSNetService, inputStream: NSInputStream, outputStream: NSOutputStream): void;
+
+	netServiceDidNotPublish(sender: NSNetService, errorDict: NSDictionary<string, number>): void;
+
+	netServiceDidNotResolve(sender: NSNetService, errorDict: NSDictionary<string, number>): void;
+
+	netServiceDidPublish(sender: NSNetService): void;
+
+	netServiceDidResolveAddress(sender: NSNetService): void;
+
+	netServiceDidStop(sender: NSNetService): void;
+
+	netServiceDidUpdateTXTRecordData(sender: NSNetService, data: NSData): void;
+
+	netServiceWillPublish(sender: NSNetService): void;
+
+	netServiceWillResolve(sender: NSNetService): void;
+
+	performSelector(aSelector: string): any;
+
+	performSelectorWithObject(aSelector: string, object: any): any;
+
+	performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any;
+
+	respondsToSelector(aSelector: string): boolean;
+
+	retainCount(): number;
+
+	self(): this;
+
+	start(): void;
+}
+
+interface FBSDKDeviceLoginManagerDelegate extends NSObjectProtocol {
+
+	deviceLoginManagerCompletedWithResultError(loginManager: FBSDKDeviceLoginManager, result: FBSDKDeviceLoginManagerResult, error: NSError): void;
+
+	deviceLoginManagerStartedWithCodeInfo(loginManager: FBSDKDeviceLoginManager, codeInfo: FBSDKDeviceLoginCodeInfo): void;
+}
+declare var FBSDKDeviceLoginManagerDelegate: {
+
+	prototype: FBSDKDeviceLoginManagerDelegate;
+};
+
+declare class FBSDKDeviceLoginManagerResult extends NSObject {
+
+	static alloc(): FBSDKDeviceLoginManagerResult; // inherited from NSObject
+
+	static new(): FBSDKDeviceLoginManagerResult; // inherited from NSObject
+
+	readonly accessToken: FBSDKAccessToken;
+
+	readonly cancelled: boolean;
+}
+
 declare const enum FBSDKLoginBehavior {
 
 	Native = 0,
diff --git a/src/platforms/ios/typings/objc!FirebaseAnalytics.d.ts b/src/platforms/ios/typings/objc!FirebaseAnalytics.d.ts
index 2ccb6c6e..44a90ae9 100644
--- a/src/platforms/ios/typings/objc!FirebaseAnalytics.d.ts
+++ b/src/platforms/ios/typings/objc!FirebaseAnalytics.d.ts
@@ -15,6 +15,8 @@ declare class FIRAnalytics extends NSObject {
 
 	static new(): FIRAnalytics; // inherited from NSObject
 
+	static resetAnalyticsData(): void;
+
 	static setScreenNameScreenClass(screenName: string, screenClassOverride: string): void;
 
 	static setUserID(userID: string): void;
diff --git a/src/platforms/ios/typings/objc!FirebaseAuth.d.ts b/src/platforms/ios/typings/objc!FirebaseAuth.d.ts
index b5772d36..1df9f32a 100644
--- a/src/platforms/ios/typings/objc!FirebaseAuth.d.ts
+++ b/src/platforms/ios/typings/objc!FirebaseAuth.d.ts
@@ -86,6 +86,8 @@ declare class FIRAuth extends NSObject {
 
 	languageCode: string;
 
+	settings: FIRAuthSettings;
+
 	addAuthStateDidChangeListener(listener: (p1: FIRAuth, p2: FIRUser) => void): NSObjectProtocol;
 
 	addIDTokenDidChangeListener(listener: (p1: FIRAuth, p2: FIRUser) => void): NSObjectProtocol;
@@ -102,7 +104,7 @@ declare class FIRAuth extends NSObject {
 
 	createUserAndRetrieveDataWithEmailPasswordCompletion(email: string, password: string, completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
 
-	createUserWithEmailPasswordCompletion(email: string, password: string, completion: (p1: FIRUser, p2: NSError) => void): void;
+	createUserWithEmailPasswordCompletion(email: string, password: string, completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
 
 	fetchProvidersForEmailCompletion(email: string, completion: (p1: NSArray<string>, p2: NSError) => void): void;
 
@@ -130,18 +132,20 @@ declare class FIRAuth extends NSObject {
 
 	signInAnonymouslyAndRetrieveDataWithCompletion(completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
 
-	signInAnonymouslyWithCompletion(completion: (p1: FIRUser, p2: NSError) => void): void;
+	signInAnonymouslyWithCompletion(completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
 
 	signInWithCredentialCompletion(credential: FIRAuthCredential, completion: (p1: FIRUser, p2: NSError) => void): void;
 
-	signInWithCustomTokenCompletion(token: string, completion: (p1: FIRUser, p2: NSError) => void): void;
+	signInWithCustomTokenCompletion(token: string, completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
 
 	signInWithEmailLinkCompletion(email: string, link: string, completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
 
-	signInWithEmailPasswordCompletion(email: string, password: string, completion: (p1: FIRUser, p2: NSError) => void): void;
+	signInWithEmailPasswordCompletion(email: string, password: string, completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
 
 	signOut(): boolean;
 
+	updateCurrentUserCompletion(user: FIRUser, completion: (p1: NSError) => void): void;
+
 	useAppLanguage(): void;
 
 	verifyPasswordResetCodeCompletion(code: string, completion: (p1: string, p2: NSError) => void): void;
@@ -284,6 +288,8 @@ declare const enum FIRAuthErrorCode {
 
 	WebInternalError = 17062,
 
+	NullUser = 17067,
+
 	KeychainError = 17995,
 
 	InternalError = 17999
@@ -298,8 +304,36 @@ declare var FIRAuthErrorUserInfoEmailKey: string;
 declare class FIRAuthErrors {
 }
 
+declare class FIRAuthSettings extends NSObject {
+
+	static alloc(): FIRAuthSettings; // inherited from NSObject
+
+	static new(): FIRAuthSettings; // inherited from NSObject
+
+	appVerificationDisabledForTesting: boolean;
+}
+
 declare var FIRAuthStateDidChangeNotification: string;
 
+declare class FIRAuthTokenResult extends NSObject {
+
+	static alloc(): FIRAuthTokenResult; // inherited from NSObject
+
+	static new(): FIRAuthTokenResult; // inherited from NSObject
+
+	readonly authDate: Date;
+
+	readonly claims: NSDictionary<string, any>;
+
+	readonly expirationDate: Date;
+
+	readonly issuedAtDate: Date;
+
+	readonly signInProvider: string;
+
+	readonly token: string;
+}
+
 interface FIRAuthUIDelegate extends NSObjectProtocol {
 
 	dismissViewControllerAnimatedCompletion(flag: boolean, completion: () => void): void;
@@ -401,8 +435,6 @@ declare class FIRPhoneAuthProvider extends NSObject {
 
 	credentialWithVerificationIDVerificationCode(verificationID: string, verificationCode: string): FIRPhoneAuthCredential;
 
-	verifyPhoneNumberCompletion(phoneNumber: string, completion: (p1: string, p2: NSError) => void): void;
-
 	verifyPhoneNumberUIDelegateCompletion(phoneNumber: string, UIDelegate: FIRAuthUIDelegate, completion: (p1: string, p2: NSError) => void): void;
 }
 
@@ -471,11 +503,11 @@ declare class FIRUser extends NSObject implements FIRUserInfo {
 
 	getIDTokenForcingRefreshCompletion(forceRefresh: boolean, completion: (p1: string, p2: NSError) => void): void;
 
-	getIDTokenWithCompletion(completion: (p1: string, p2: NSError) => void): void;
+	getIDTokenResultForcingRefreshCompletion(forceRefresh: boolean, completion: (p1: FIRAuthTokenResult, p2: NSError) => void): void;
 
-	getTokenForcingRefreshCompletion(forceRefresh: boolean, completion: (p1: string, p2: NSError) => void): void;
+	getIDTokenResultWithCompletion(completion: (p1: FIRAuthTokenResult, p2: NSError) => void): void;
 
-	getTokenWithCompletion(completion: (p1: string, p2: NSError) => void): void;
+	getIDTokenWithCompletion(completion: (p1: string, p2: NSError) => void): void;
 
 	isEqual(object: any): boolean;
 
@@ -563,6 +595,10 @@ declare class FIRUserProfileChangeRequest extends NSObject {
 	commitChangesWithCompletion(completion: (p1: NSError) => void): void;
 }
 
+declare var FirebaseAuthVersionNum: number;
+
 declare var FirebaseAuthVersionNumber: number;
 
-declare var FirebaseAuthVersionString: string;
+declare var FirebaseAuthVersionStr: string;
+
+declare var FirebaseAuthVersionString: interop.Reference<number>;
diff --git a/src/platforms/ios/typings/objc!FirebaseCore.d.ts b/src/platforms/ios/typings/objc!FirebaseCore.d.ts
index 9ae2fe43..83240096 100644
--- a/src/platforms/ios/typings/objc!FirebaseCore.d.ts
+++ b/src/platforms/ios/typings/objc!FirebaseCore.d.ts
@@ -47,28 +47,11 @@ declare class FIRConfiguration extends NSObject {
 
 	analyticsConfiguration: FIRAnalyticsConfiguration;
 
-	logLevel: FIRLogLevel;
-
 	static readonly sharedInstance: FIRConfiguration;
 
 	setLoggerLevel(loggerLevel: FIRLoggerLevel): void;
 }
 
-declare const enum FIRLogLevel {
-
-	kFIRLogLevelError = 0,
-
-	kFIRLogLevelWarning = 1,
-
-	kFIRLogLevelInfo = 2,
-
-	kFIRLogLevelDebug = 3,
-
-	kFIRLogLevelAssert = 4,
-
-	kFIRLogLevelMax = 4
-}
-
 declare const enum FIRLoggerLevel {
 
 	Error = 3,
@@ -118,15 +101,15 @@ declare class FIROptions extends NSObject implements NSCopying {
 
 	constructor(o: { contentsOfFile: string; });
 
-	constructor(o: { googleAppID: string; bundleID: string; GCMSenderID: string; APIKey: string; clientID: string; trackingID: string; androidClientID: string; databaseURL: string; storageBucket: string; deepLinkURLScheme: string; });
-
 	constructor(o: { googleAppID: string; GCMSenderID: string; });
 
 	copyWithZone(zone: interop.Pointer | interop.Reference<any>): any;
 
 	initWithContentsOfFile(plistPath: string): this;
 
-	initWithGoogleAppIDBundleIDGCMSenderIDAPIKeyClientIDTrackingIDAndroidClientIDDatabaseURLStorageBucketDeepLinkURLScheme(googleAppID: string, bundleID: string, GCMSenderID: string, APIKey: string, clientID: string, trackingID: string, androidClientID: string, databaseURL: string, storageBucket: string, deepLinkURLScheme: string): this;
-
 	initWithGoogleAppIDGCMSenderID(googleAppID: string, GCMSenderID: string): this;
 }
+
+declare var FirebaseCoreVersionNumber: number;
+
+declare var FirebaseCoreVersionString: interop.Reference<number>;
diff --git a/src/platforms/ios/typings/objc!FirebaseDatabase.d.ts b/src/platforms/ios/typings/objc!FirebaseDatabase.d.ts
index fd817a0b..696e1967 100644
--- a/src/platforms/ios/typings/objc!FirebaseDatabase.d.ts
+++ b/src/platforms/ios/typings/objc!FirebaseDatabase.d.ts
@@ -252,3 +252,7 @@ declare class FIRTransactionResult extends NSObject {
 
 	static successWithValue(value: FIRMutableData): FIRTransactionResult;
 }
+
+declare var FirebaseDatabaseVersionNumber: number;
+
+declare var FirebaseDatabaseVersionString: interop.Reference<number>;
diff --git a/src/platforms/ios/typings/objc!FirebaseDynamicLinks.d.ts b/src/platforms/ios/typings/objc!FirebaseDynamicLinks.d.ts
index 334abc77..853d1d3b 100644
--- a/src/platforms/ios/typings/objc!FirebaseDynamicLinks.d.ts
+++ b/src/platforms/ios/typings/objc!FirebaseDynamicLinks.d.ts
@@ -16,8 +16,6 @@ declare class FIRDynamicLink extends NSObject {
 
 	static new(): FIRDynamicLink; // inherited from NSObject
 
-	readonly matchConfidence: FIRDynamicLinkMatchConfidence;
-
 	readonly matchType: FIRDLMatchType;
 
 	readonly minimumAppVersion: string;
@@ -161,13 +159,6 @@ declare class FIRDynamicLinkItunesConnectAnalyticsParameters extends NSObject {
 	providerToken: string;
 }
 
-declare const enum FIRDynamicLinkMatchConfidence {
-
-	Weak = 0,
-
-	Strong = 1
-}
-
 declare class FIRDynamicLinkNavigationInfoParameters extends NSObject {
 
 	static alloc(): FIRDynamicLinkNavigationInfoParameters; // inherited from NSObject
diff --git a/src/platforms/ios/typings/objc!FirebaseFirestore.d.ts b/src/platforms/ios/typings/objc!FirebaseFirestore.d.ts
index 2ed598d3..4b28237c 100644
--- a/src/platforms/ios/typings/objc!FirebaseFirestore.d.ts
+++ b/src/platforms/ios/typings/objc!FirebaseFirestore.d.ts
@@ -44,17 +44,6 @@ declare const enum FIRDocumentChangeType {
 	Removed = 2
 }
 
-declare class FIRDocumentListenOptions extends NSObject {
-
-	static alloc(): FIRDocumentListenOptions; // inherited from NSObject
-
-	static new(): FIRDocumentListenOptions; // inherited from NSObject
-
-	static options(): FIRDocumentListenOptions;
-
-	includeMetadataChanges(includeMetadataChanges: boolean): this;
-}
-
 declare class FIRDocumentReference extends NSObject {
 
 	static alloc(): FIRDocumentReference; // inherited from NSObject
@@ -71,7 +60,7 @@ declare class FIRDocumentReference extends NSObject {
 
 	addSnapshotListener(listener: (p1: FIRDocumentSnapshot, p2: NSError) => void): FIRListenerRegistration;
 
-	addSnapshotListenerWithOptionsListener(options: FIRDocumentListenOptions, listener: (p1: FIRDocumentSnapshot, p2: NSError) => void): FIRListenerRegistration;
+	addSnapshotListenerWithIncludeMetadataChangesListener(includeMetadataChanges: boolean, listener: (p1: FIRDocumentSnapshot, p2: NSError) => void): FIRListenerRegistration;
 
 	collectionWithPath(collectionPath: string): FIRCollectionReference;
 
@@ -81,13 +70,15 @@ declare class FIRDocumentReference extends NSObject {
 
 	getDocumentWithCompletion(completion: (p1: FIRDocumentSnapshot, p2: NSError) => void): void;
 
+	getDocumentWithSourceCompletion(source: FIRFirestoreSource, completion: (p1: FIRDocumentSnapshot, p2: NSError) => void): void;
+
 	setData(documentData: NSDictionary<string, any>): void;
 
 	setDataCompletion(documentData: NSDictionary<string, any>, completion: (p1: NSError) => void): void;
 
-	setDataOptions(documentData: NSDictionary<string, any>, options: FIRSetOptions): void;
+	setDataMerge(documentData: NSDictionary<string, any>, merge: boolean): void;
 
-	setDataOptionsCompletion(documentData: NSDictionary<string, any>, options: FIRSetOptions, completion: (p1: NSError) => void): void;
+	setDataMergeCompletion(documentData: NSDictionary<string, any>, merge: boolean, completion: (p1: NSError) => void): void;
 
 	updateData(fields: NSDictionary<any, any>): void;
 
@@ -110,13 +101,13 @@ declare class FIRDocumentSnapshot extends NSObject {
 
 	data(): NSDictionary<string, any>;
 
-	dataWithOptions(options: FIRSnapshotOptions): NSDictionary<string, any>;
+	dataWithServerTimestampBehavior(serverTimestampBehavior: FIRServerTimestampBehavior): NSDictionary<string, any>;
 
 	objectForKeyedSubscript(key: any): any;
 
 	valueForField(field: any): any;
 
-	valueForFieldOptions(field: any, options: FIRSnapshotOptions): any;
+	valueForFieldServerTimestampBehavior(field: any, serverTimestampBehavior: FIRServerTimestampBehavior): any;
 }
 
 declare class FIRFieldPath extends NSObject implements NSCopying {
@@ -227,9 +218,20 @@ declare class FIRFirestoreSettings extends NSObject implements NSCopying {
 
 	sslEnabled: boolean;
 
+	timestampsInSnapshotsEnabled: boolean;
+
 	copyWithZone(zone: interop.Pointer | interop.Reference<any>): any;
 }
 
+declare const enum FIRFirestoreSource {
+
+	Default = 0,
+
+	Server = 1,
+
+	Cache = 2
+}
+
 declare class FIRGeoPoint extends NSObject implements NSCopying {
 
 	static alloc(): FIRGeoPoint; // inherited from NSObject
@@ -266,10 +268,12 @@ declare class FIRQuery extends NSObject {
 
 	addSnapshotListener(listener: (p1: FIRQuerySnapshot, p2: NSError) => void): FIRListenerRegistration;
 
-	addSnapshotListenerWithOptionsListener(options: FIRQueryListenOptions, listener: (p1: FIRQuerySnapshot, p2: NSError) => void): FIRListenerRegistration;
+	addSnapshotListenerWithIncludeMetadataChangesListener(includeMetadataChanges: boolean, listener: (p1: FIRQuerySnapshot, p2: NSError) => void): FIRListenerRegistration;
 
 	getDocumentsWithCompletion(completion: (p1: FIRQuerySnapshot, p2: NSError) => void): void;
 
+	getDocumentsWithSourceCompletion(source: FIRFirestoreSource, completion: (p1: FIRQuerySnapshot, p2: NSError) => void): void;
+
 	queryEndingAtDocument(document: FIRDocumentSnapshot): FIRQuery;
 
 	queryEndingAtValues(fieldValues: NSArray<any>): FIRQuery;
@@ -326,19 +330,6 @@ declare class FIRQueryDocumentSnapshot extends FIRDocumentSnapshot {
 	static new(): FIRQueryDocumentSnapshot; // inherited from NSObject
 }
 
-declare class FIRQueryListenOptions extends NSObject {
-
-	static alloc(): FIRQueryListenOptions; // inherited from NSObject
-
-	static new(): FIRQueryListenOptions; // inherited from NSObject
-
-	static options(): FIRQueryListenOptions;
-
-	readonly includeDocumentMetadataChanges: boolean;
-
-	readonly includeQueryMetadataChanges: boolean;
-}
-
 declare class FIRQuerySnapshot extends NSObject {
 
 	static alloc(): FIRQuerySnapshot; // inherited from NSObject
@@ -356,6 +347,8 @@ declare class FIRQuerySnapshot extends NSObject {
 	readonly metadata: FIRSnapshotMetadata;
 
 	readonly query: FIRQuery;
+
+	documentChangesWithIncludeMetadataChanges(includeMetadataChanges: boolean): NSArray<FIRDocumentChange>;
 }
 
 declare const enum FIRServerTimestampBehavior {
@@ -367,17 +360,6 @@ declare const enum FIRServerTimestampBehavior {
 	Previous = 2
 }
 
-declare class FIRSetOptions extends NSObject {
-
-	static alloc(): FIRSetOptions; // inherited from NSObject
-
-	static merge(): FIRSetOptions;
-
-	static new(): FIRSetOptions; // inherited from NSObject
-
-	readonly merge: boolean;
-}
-
 declare class FIRSnapshotMetadata extends NSObject {
 
 	static alloc(): FIRSnapshotMetadata; // inherited from NSObject
@@ -389,15 +371,6 @@ declare class FIRSnapshotMetadata extends NSObject {
 	readonly pendingWrites: boolean;
 }
 
-declare class FIRSnapshotOptions extends NSObject {
-
-	static alloc(): FIRSnapshotOptions; // inherited from NSObject
-
-	static new(): FIRSnapshotOptions; // inherited from NSObject
-
-	static serverTimestampBehavior(serverTimestampBehavior: FIRServerTimestampBehavior): FIRSnapshotOptions;
-}
-
 declare class FIRTimestamp extends NSObject implements NSCopying {
 
 	static alloc(): FIRTimestamp; // inherited from NSObject
@@ -416,12 +389,12 @@ declare class FIRTimestamp extends NSObject implements NSCopying {
 
 	constructor(o: { seconds: number; nanoseconds: number; });
 
-	approximateDateValue(): Date;
-
 	compare(other: FIRTimestamp): NSComparisonResult;
 
 	copyWithZone(zone: interop.Pointer | interop.Reference<any>): any;
 
+	dateValue(): Date;
+
 	initWithSecondsNanoseconds(seconds: number, nanoseconds: number): this;
 }
 
@@ -437,7 +410,7 @@ declare class FIRTransaction extends NSObject {
 
 	setDataForDocument(data: NSDictionary<string, any>, document: FIRDocumentReference): FIRTransaction;
 
-	setDataForDocumentOptions(data: NSDictionary<string, any>, document: FIRDocumentReference, options: FIRSetOptions): FIRTransaction;
+	setDataForDocumentMerge(data: NSDictionary<string, any>, document: FIRDocumentReference, merge: boolean): FIRTransaction;
 
 	updateDataForDocument(fields: NSDictionary<any, any>, document: FIRDocumentReference): FIRTransaction;
 }
@@ -456,7 +429,11 @@ declare class FIRWriteBatch extends NSObject {
 
 	setDataForDocument(data: NSDictionary<string, any>, document: FIRDocumentReference): FIRWriteBatch;
 
-	setDataForDocumentOptions(data: NSDictionary<string, any>, document: FIRDocumentReference, options: FIRSetOptions): FIRWriteBatch;
+	setDataForDocumentMerge(data: NSDictionary<string, any>, document: FIRDocumentReference, merge: boolean): FIRWriteBatch;
 
 	updateDataForDocument(fields: NSDictionary<any, any>, document: FIRDocumentReference): FIRWriteBatch;
 }
+
+declare var FirebaseFirestoreVersionNumber: number;
+
+declare var FirebaseFirestoreVersionString: interop.Reference<number>;
diff --git a/src/platforms/ios/typings/objc!FirebaseInstanceID.d.ts b/src/platforms/ios/typings/objc!FirebaseInstanceID.d.ts
index 1eb0ace6..d58f4fa3 100644
--- a/src/platforms/ios/typings/objc!FirebaseInstanceID.d.ts
+++ b/src/platforms/ios/typings/objc!FirebaseInstanceID.d.ts
@@ -13,22 +13,11 @@ declare class FIRInstanceID extends NSObject {
 
 	getIDWithHandler(handler: (p1: string, p2: NSError) => void): void;
 
-	setAPNSTokenType(token: NSData, type: FIRInstanceIDAPNSTokenType): void;
-
 	token(): string;
 
 	tokenWithAuthorizedEntityScopeOptionsHandler(authorizedEntity: string, scope: string, options: NSDictionary<any, any>, handler: (p1: string, p2: NSError) => void): void;
 }
 
-declare const enum FIRInstanceIDAPNSTokenType {
-
-	Unknown = 0,
-
-	Sandbox = 1,
-
-	Prod = 2
-}
-
 declare const enum FIRInstanceIDError {
 
 	Unknown = 0,
diff --git a/src/platforms/ios/typings/objc!FirebaseMLModelInterpreter.d.ts b/src/platforms/ios/typings/objc!FirebaseMLModelInterpreter.d.ts
new file mode 100644
index 00000000..543e81a3
--- /dev/null
+++ b/src/platforms/ios/typings/objc!FirebaseMLModelInterpreter.d.ts
@@ -0,0 +1,140 @@
+
+declare class FIRCloudModelSource extends NSObject {
+
+	static alloc(): FIRCloudModelSource; // inherited from NSObject
+
+	static new(): FIRCloudModelSource; // inherited from NSObject
+
+	readonly enableModelUpdates: boolean;
+
+	readonly initialConditions: FIRModelDownloadConditions;
+
+	readonly modelName: string;
+
+	readonly updateConditions: FIRModelDownloadConditions;
+
+	constructor(o: { modelName: string; enableModelUpdates: boolean; initialConditions: FIRModelDownloadConditions; updateConditions: FIRModelDownloadConditions; });
+
+	initWithModelNameEnableModelUpdatesInitialConditionsUpdateConditions(modelName: string, enableModelUpdates: boolean, initialConditions: FIRModelDownloadConditions, updateConditions: FIRModelDownloadConditions): this;
+}
+
+declare class FIRLocalModelSource extends NSObject {
+
+	static alloc(): FIRLocalModelSource; // inherited from NSObject
+
+	static new(): FIRLocalModelSource; // inherited from NSObject
+
+	readonly modelName: string;
+
+	readonly path: string;
+
+	constructor(o: { modelName: string; path: string; });
+
+	initWithModelNamePath(modelName: string, path: string): this;
+}
+
+declare class FIRModelDownloadConditions extends NSObject implements NSCopying {
+
+	static alloc(): FIRModelDownloadConditions; // inherited from NSObject
+
+	static new(): FIRModelDownloadConditions; // inherited from NSObject
+
+	readonly isIdleRequired: boolean;
+
+	readonly isWiFiRequired: boolean;
+
+	constructor(o: { wiFiRequired: boolean; idleRequired: boolean; });
+
+	copyWithZone(zone: interop.Pointer | interop.Reference<any>): any;
+
+	initWithWiFiRequiredIdleRequired(isWiFiRequired: boolean, isIdleRequired: boolean): this;
+}
+
+declare const enum FIRModelElementType {
+
+	Unknown = 0,
+
+	Float32 = 1,
+
+	Int32 = 2,
+
+	UInt8 = 3,
+
+	Int64 = 4
+}
+
+declare class FIRModelInputOutputOptions extends NSObject {
+
+	static alloc(): FIRModelInputOutputOptions; // inherited from NSObject
+
+	static new(): FIRModelInputOutputOptions; // inherited from NSObject
+
+	setInputFormatForIndexTypeDimensionsError(index: number, type: FIRModelElementType, dimensions: NSArray<number>): boolean;
+
+	setOutputFormatForIndexTypeDimensionsError(index: number, type: FIRModelElementType, dimensions: NSArray<number>): boolean;
+}
+
+declare class FIRModelInputs extends NSObject {
+
+	static alloc(): FIRModelInputs; // inherited from NSObject
+
+	static new(): FIRModelInputs; // inherited from NSObject
+
+	addInputError(input: any): boolean;
+}
+
+declare class FIRModelInterpreter extends NSObject {
+
+	static alloc(): FIRModelInterpreter; // inherited from NSObject
+
+	static modelInterpreterWithOptions(options: FIRModelOptions): FIRModelInterpreter;
+
+	static new(): FIRModelInterpreter; // inherited from NSObject
+
+	inputIndexForOpCompletion(opName: string, completion: (p1: number, p2: NSError) => void): void;
+
+	outputIndexForOpCompletion(opName: string, completion: (p1: number, p2: NSError) => void): void;
+
+	runWithInputsOptionsCompletion(inputs: FIRModelInputs, options: FIRModelInputOutputOptions, completion: (p1: FIRModelOutputs, p2: NSError) => void): void;
+}
+
+declare class FIRModelManager extends NSObject {
+
+	static alloc(): FIRModelManager; // inherited from NSObject
+
+	static modelManager(): FIRModelManager;
+
+	static new(): FIRModelManager; // inherited from NSObject
+
+	cloudModelSourceForModelName(modelName: string): FIRCloudModelSource;
+
+	localModelSourceForModelName(modelName: string): FIRLocalModelSource;
+
+	registerCloudModelSource(cloudModelSource: FIRCloudModelSource): boolean;
+
+	registerLocalModelSource(localModelSource: FIRLocalModelSource): boolean;
+}
+
+declare class FIRModelOptions extends NSObject {
+
+	static alloc(): FIRModelOptions; // inherited from NSObject
+
+	static new(): FIRModelOptions; // inherited from NSObject
+
+	readonly cloudModelName: string;
+
+	readonly localModelName: string;
+
+	constructor(o: { cloudModelName: string; localModelName: string; });
+
+	initWithCloudModelNameLocalModelName(cloudModelName: string, localModelName: string): this;
+}
+
+declare class FIRModelOutputs extends NSObject {
+
+	static alloc(): FIRModelOutputs; // inherited from NSObject
+
+	static new(): FIRModelOutputs; // inherited from NSObject
+
+	outputAtIndexError(index: number): any;
+}
diff --git a/src/platforms/ios/typings/objc!FirebaseMLVision.d.ts b/src/platforms/ios/typings/objc!FirebaseMLVision.d.ts
new file mode 100644
index 00000000..5a419a4d
--- /dev/null
+++ b/src/platforms/ios/typings/objc!FirebaseMLVision.d.ts
@@ -0,0 +1,1014 @@
+
+declare var FIRFaceLandmarkTypeLeftCheek: string;
+
+declare var FIRFaceLandmarkTypeLeftEar: string;
+
+declare var FIRFaceLandmarkTypeLeftEye: string;
+
+declare var FIRFaceLandmarkTypeMouthBottom: string;
+
+declare var FIRFaceLandmarkTypeMouthLeft: string;
+
+declare var FIRFaceLandmarkTypeMouthRight: string;
+
+declare var FIRFaceLandmarkTypeNoseBase: string;
+
+declare var FIRFaceLandmarkTypeRightCheek: string;
+
+declare var FIRFaceLandmarkTypeRightEar: string;
+
+declare var FIRFaceLandmarkTypeRightEye: string;
+
+declare class FIRVision extends NSObject {
+
+	static alloc(): FIRVision; // inherited from NSObject
+
+	static new(): FIRVision; // inherited from NSObject
+
+	static vision(): FIRVision;
+
+	static visionForApp(app: FIRApp): FIRVision;
+
+	barcodeDetector(): FIRVisionBarcodeDetector;
+
+	barcodeDetectorWithOptions(options: FIRVisionBarcodeDetectorOptions): FIRVisionBarcodeDetector;
+
+	cloudDocumentTextDetector(): FIRVisionCloudDocumentTextDetector;
+
+	cloudDocumentTextDetectorWithOptions(options: FIRVisionCloudDetectorOptions): FIRVisionCloudDocumentTextDetector;
+
+	cloudLabelDetector(): FIRVisionCloudLabelDetector;
+
+	cloudLabelDetectorWithOptions(options: FIRVisionCloudDetectorOptions): FIRVisionCloudLabelDetector;
+
+	cloudLandmarkDetector(): FIRVisionCloudLandmarkDetector;
+
+	cloudLandmarkDetectorWithOptions(options: FIRVisionCloudDetectorOptions): FIRVisionCloudLandmarkDetector;
+
+	cloudTextDetector(): FIRVisionCloudTextDetector;
+
+	cloudTextDetectorWithOptions(options: FIRVisionCloudDetectorOptions): FIRVisionCloudTextDetector;
+
+	faceDetector(): FIRVisionFaceDetector;
+
+	faceDetectorWithOptions(options: FIRVisionFaceDetectorOptions): FIRVisionFaceDetector;
+
+	labelDetector(): FIRVisionLabelDetector;
+
+	labelDetectorWithOptions(options: FIRVisionLabelDetectorOptions): FIRVisionLabelDetector;
+
+	textDetector(): FIRVisionTextDetector;
+}
+
+declare class FIRVisionBarcode extends NSObject {
+
+	static alloc(): FIRVisionBarcode; // inherited from NSObject
+
+	static new(): FIRVisionBarcode; // inherited from NSObject
+
+	readonly URL: FIRVisionBarcodeURLBookmark;
+
+	readonly calendarEvent: FIRVisionBarcodeCalendarEvent;
+
+	readonly contactInfo: FIRVisionBarcodeContactInfo;
+
+	readonly cornerPoints: NSArray<NSValue>;
+
+	readonly displayValue: string;
+
+	readonly driverLicense: FIRVisionBarcodeDriverLicense;
+
+	readonly email: FIRVisionBarcodeEmail;
+
+	readonly format: FIRVisionBarcodeFormat;
+
+	readonly frame: CGRect;
+
+	readonly geoPoint: FIRVisionBarcodeGeoPoint;
+
+	readonly phone: FIRVisionBarcodePhone;
+
+	readonly rawValue: string;
+
+	readonly sms: FIRVisionBarcodeSMS;
+
+	readonly valueType: FIRVisionBarcodeValueType;
+
+	readonly wifi: FIRVisionBarcodeWiFi;
+}
+
+declare class FIRVisionBarcodeAddress extends NSObject {
+
+	static alloc(): FIRVisionBarcodeAddress; // inherited from NSObject
+
+	static new(): FIRVisionBarcodeAddress; // inherited from NSObject
+
+	readonly addressLines: NSArray<string>;
+
+	readonly type: FIRVisionBarcodeAddressType;
+}
+
+declare const enum FIRVisionBarcodeAddressType {
+
+	Unknown = 0,
+
+	Work = 1,
+
+	Home = 2
+}
+
+declare class FIRVisionBarcodeCalendarEvent extends NSObject {
+
+	static alloc(): FIRVisionBarcodeCalendarEvent; // inherited from NSObject
+
+	static new(): FIRVisionBarcodeCalendarEvent; // inherited from NSObject
+
+	readonly end: Date;
+
+	readonly eventDescription: string;
+
+	readonly location: string;
+
+	readonly organizer: string;
+
+	readonly start: Date;
+
+	readonly status: string;
+
+	readonly summary: string;
+}
+
+declare class FIRVisionBarcodeContactInfo extends NSObject {
+
+	static alloc(): FIRVisionBarcodeContactInfo; // inherited from NSObject
+
+	static new(): FIRVisionBarcodeContactInfo; // inherited from NSObject
+
+	readonly addresses: NSArray<FIRVisionBarcodeAddress>;
+
+	readonly emails: NSArray<FIRVisionBarcodeEmail>;
+
+	readonly jobTitle: string;
+
+	readonly name: FIRVisionBarcodePersonName;
+
+	readonly organization: string;
+
+	readonly phones: NSArray<FIRVisionBarcodePhone>;
+
+	readonly urls: NSArray<string>;
+}
+
+declare class FIRVisionBarcodeDetector extends NSObject {
+
+	static alloc(): FIRVisionBarcodeDetector; // inherited from NSObject
+
+	static new(): FIRVisionBarcodeDetector; // inherited from NSObject
+
+	detectInImageCompletion(image: FIRVisionImage, completion: (p1: NSArray<FIRVisionBarcode>, p2: NSError) => void): void;
+}
+
+declare class FIRVisionBarcodeDetectorOptions extends NSObject {
+
+	static alloc(): FIRVisionBarcodeDetectorOptions; // inherited from NSObject
+
+	static new(): FIRVisionBarcodeDetectorOptions; // inherited from NSObject
+
+	readonly formats: FIRVisionBarcodeFormat;
+
+	constructor(o: { formats: FIRVisionBarcodeFormat; });
+
+	initWithFormats(formats: FIRVisionBarcodeFormat): this;
+}
+
+declare class FIRVisionBarcodeDriverLicense extends NSObject {
+
+	static alloc(): FIRVisionBarcodeDriverLicense; // inherited from NSObject
+
+	static new(): FIRVisionBarcodeDriverLicense; // inherited from NSObject
+
+	readonly addressCity: string;
+
+	readonly addressState: string;
+
+	readonly addressStreet: string;
+
+	readonly addressZip: string;
+
+	readonly birthDate: string;
+
+	readonly documentType: string;
+
+	readonly expiryDate: string;
+
+	readonly firstName: string;
+
+	readonly gender: string;
+
+	readonly issuingCountry: string;
+
+	readonly issuingDate: string;
+
+	readonly lastName: string;
+
+	readonly licenseNumber: string;
+
+	readonly middleName: string;
+}
+
+declare class FIRVisionBarcodeEmail extends NSObject {
+
+	static alloc(): FIRVisionBarcodeEmail; // inherited from NSObject
+
+	static new(): FIRVisionBarcodeEmail; // inherited from NSObject
+
+	readonly address: string;
+
+	readonly body: string;
+
+	readonly subject: string;
+
+	readonly type: FIRVisionBarcodeEmailType;
+}
+
+declare const enum FIRVisionBarcodeEmailType {
+
+	Unknown = 0,
+
+	Work = 1,
+
+	Home = 2
+}
+
+declare const enum FIRVisionBarcodeFormat {
+
+	UnKnown = 0,
+
+	All = 65535,
+
+	Code128 = 1,
+
+	Code39 = 2,
+
+	Code93 = 4,
+
+	CodaBar = 8,
+
+	DataMatrix = 16,
+
+	EAN13 = 32,
+
+	EAN8 = 64,
+
+	ITF = 128,
+
+	QRCode = 256,
+
+	UPCA = 512,
+
+	UPCE = 1024,
+
+	PDF417 = 2048,
+
+	Aztec = 4096
+}
+
+declare class FIRVisionBarcodeGeoPoint extends NSObject {
+
+	static alloc(): FIRVisionBarcodeGeoPoint; // inherited from NSObject
+
+	static new(): FIRVisionBarcodeGeoPoint; // inherited from NSObject
+
+	readonly latitude: number;
+
+	readonly longitude: number;
+}
+
+declare class FIRVisionBarcodePersonName extends NSObject {
+
+	static alloc(): FIRVisionBarcodePersonName; // inherited from NSObject
+
+	static new(): FIRVisionBarcodePersonName; // inherited from NSObject
+
+	readonly first: string;
+
+	readonly formattedName: string;
+
+	readonly last: string;
+
+	readonly middle: string;
+
+	readonly prefix: string;
+
+	readonly pronounciation: string;
+
+	readonly suffix: string;
+}
+
+declare class FIRVisionBarcodePhone extends NSObject {
+
+	static alloc(): FIRVisionBarcodePhone; // inherited from NSObject
+
+	static new(): FIRVisionBarcodePhone; // inherited from NSObject
+
+	readonly number: string;
+
+	readonly type: FIRVisionBarcodePhoneType;
+}
+
+declare const enum FIRVisionBarcodePhoneType {
+
+	Unknown = 0,
+
+	Work = 1,
+
+	Home = 2,
+
+	Fax = 3,
+
+	Mobile = 4
+}
+
+declare class FIRVisionBarcodeSMS extends NSObject {
+
+	static alloc(): FIRVisionBarcodeSMS; // inherited from NSObject
+
+	static new(): FIRVisionBarcodeSMS; // inherited from NSObject
+
+	readonly message: string;
+
+	readonly phoneNumber: string;
+}
+
+declare class FIRVisionBarcodeURLBookmark extends NSObject {
+
+	static alloc(): FIRVisionBarcodeURLBookmark; // inherited from NSObject
+
+	static new(): FIRVisionBarcodeURLBookmark; // inherited from NSObject
+
+	readonly title: string;
+
+	readonly url: string;
+}
+
+declare const enum FIRVisionBarcodeValueType {
+
+	Unknown = 0,
+
+	ContactInfo = 1,
+
+	Email = 2,
+
+	ISBN = 3,
+
+	Phone = 4,
+
+	Product = 5,
+
+	SMS = 6,
+
+	Text = 7,
+
+	URL = 8,
+
+	WiFi = 9,
+
+	GeographicCoordinates = 10,
+
+	CalendarEvent = 11,
+
+	DriversLicense = 12
+}
+
+declare class FIRVisionBarcodeWiFi extends NSObject {
+
+	static alloc(): FIRVisionBarcodeWiFi; // inherited from NSObject
+
+	static new(): FIRVisionBarcodeWiFi; // inherited from NSObject
+
+	readonly password: string;
+
+	readonly ssid: string;
+
+	readonly type: FIRVisionBarcodeWiFiEncryptionType;
+}
+
+declare const enum FIRVisionBarcodeWiFiEncryptionType {
+
+	Unknown = 0,
+
+	Open = 1,
+
+	WPA = 2,
+
+	WEP = 3
+}
+
+declare class FIRVisionCloudBlock extends NSObject {
+
+	static alloc(): FIRVisionCloudBlock; // inherited from NSObject
+
+	static new(): FIRVisionCloudBlock; // inherited from NSObject
+
+	readonly confidence: number;
+
+	readonly frame: CGRect;
+
+	readonly paragraphs: NSArray<FIRVisionCloudParagraph>;
+
+	readonly textProperty: FIRVisionCloudTextProperty;
+
+	readonly type: FIRVisionCloudBlockType;
+}
+
+declare const enum FIRVisionCloudBlockType {
+
+	Unknown = 0,
+
+	Barcode = 1,
+
+	Picture = 2,
+
+	Ruler = 3,
+
+	Table = 4,
+
+	Text = 5
+}
+
+declare class FIRVisionCloudDetectedBreak extends NSObject {
+
+	static alloc(): FIRVisionCloudDetectedBreak; // inherited from NSObject
+
+	static new(): FIRVisionCloudDetectedBreak; // inherited from NSObject
+
+	readonly isPrefix: number;
+
+	readonly type: FIRVisionCloudDetectedBreakType;
+}
+
+declare const enum FIRVisionCloudDetectedBreakType {
+
+	Unknown = 0,
+
+	LineWrap = 1,
+
+	Hyphen = 2,
+
+	LineBreak = 3,
+
+	Space = 4,
+
+	SureSpace = 5
+}
+
+declare class FIRVisionCloudDetectedLanguage extends NSObject {
+
+	static alloc(): FIRVisionCloudDetectedLanguage; // inherited from NSObject
+
+	static new(): FIRVisionCloudDetectedLanguage; // inherited from NSObject
+
+	readonly confidence: number;
+
+	readonly languageCode: string;
+}
+
+declare class FIRVisionCloudDetectorOptions extends NSObject {
+
+	static alloc(): FIRVisionCloudDetectorOptions; // inherited from NSObject
+
+	static new(): FIRVisionCloudDetectorOptions; // inherited from NSObject
+
+	maxResults: number;
+
+	modelType: FIRVisionCloudModelType;
+}
+
+declare class FIRVisionCloudDocumentTextDetector extends NSObject {
+
+	static alloc(): FIRVisionCloudDocumentTextDetector; // inherited from NSObject
+
+	static new(): FIRVisionCloudDocumentTextDetector; // inherited from NSObject
+
+	detectInImageCompletion(image: FIRVisionImage, completion: (p1: FIRVisionCloudText, p2: NSError) => void): void;
+}
+
+declare class FIRVisionCloudLabel extends NSObject {
+
+	static alloc(): FIRVisionCloudLabel; // inherited from NSObject
+
+	static new(): FIRVisionCloudLabel; // inherited from NSObject
+
+	readonly confidence: number;
+
+	readonly entityId: string;
+
+	readonly label: string;
+}
+
+declare class FIRVisionCloudLabelDetector extends NSObject {
+
+	static alloc(): FIRVisionCloudLabelDetector; // inherited from NSObject
+
+	static new(): FIRVisionCloudLabelDetector; // inherited from NSObject
+
+	detectInImageCompletion(image: FIRVisionImage, completion: (p1: NSArray<FIRVisionCloudLabel>, p2: NSError) => void): void;
+}
+
+declare class FIRVisionCloudLandmark extends NSObject {
+
+	static alloc(): FIRVisionCloudLandmark; // inherited from NSObject
+
+	static new(): FIRVisionCloudLandmark; // inherited from NSObject
+
+	readonly confidence: number;
+
+	readonly entityId: string;
+
+	readonly frame: CGRect;
+
+	readonly landmark: string;
+
+	readonly locations: NSArray<FIRVisionLatitudeLongitude>;
+}
+
+declare class FIRVisionCloudLandmarkDetector extends NSObject {
+
+	static alloc(): FIRVisionCloudLandmarkDetector; // inherited from NSObject
+
+	static new(): FIRVisionCloudLandmarkDetector; // inherited from NSObject
+
+	detectInImageCompletion(image: FIRVisionImage, completion: (p1: NSArray<FIRVisionCloudLandmark>, p2: NSError) => void): void;
+}
+
+declare const enum FIRVisionCloudModelType {
+
+	Stable = 0,
+
+	Latest = 1
+}
+
+declare class FIRVisionCloudPage extends NSObject {
+
+	static alloc(): FIRVisionCloudPage; // inherited from NSObject
+
+	static new(): FIRVisionCloudPage; // inherited from NSObject
+
+	readonly blocks: NSArray<FIRVisionCloudBlock>;
+
+	readonly confidence: number;
+
+	readonly height: number;
+
+	readonly textProperty: FIRVisionCloudTextProperty;
+
+	readonly width: number;
+}
+
+declare class FIRVisionCloudParagraph extends NSObject {
+
+	static alloc(): FIRVisionCloudParagraph; // inherited from NSObject
+
+	static new(): FIRVisionCloudParagraph; // inherited from NSObject
+
+	readonly confidence: number;
+
+	readonly frame: CGRect;
+
+	readonly textProperty: FIRVisionCloudTextProperty;
+
+	readonly words: NSArray<FIRVisionCloudWord>;
+}
+
+declare class FIRVisionCloudSymbol extends NSObject {
+
+	static alloc(): FIRVisionCloudSymbol; // inherited from NSObject
+
+	static new(): FIRVisionCloudSymbol; // inherited from NSObject
+
+	readonly confidence: number;
+
+	readonly frame: CGRect;
+
+	readonly text: string;
+
+	readonly textProperty: FIRVisionCloudTextProperty;
+}
+
+declare class FIRVisionCloudText extends NSObject {
+
+	static alloc(): FIRVisionCloudText; // inherited from NSObject
+
+	static new(): FIRVisionCloudText; // inherited from NSObject
+
+	readonly pages: NSArray<FIRVisionCloudPage>;
+
+	readonly text: string;
+}
+
+declare class FIRVisionCloudTextDetector extends NSObject {
+
+	static alloc(): FIRVisionCloudTextDetector; // inherited from NSObject
+
+	static new(): FIRVisionCloudTextDetector; // inherited from NSObject
+
+	detectInImageCompletion(image: FIRVisionImage, completion: (p1: FIRVisionCloudText, p2: NSError) => void): void;
+}
+
+declare class FIRVisionCloudTextProperty extends NSObject {
+
+	static alloc(): FIRVisionCloudTextProperty; // inherited from NSObject
+
+	static new(): FIRVisionCloudTextProperty; // inherited from NSObject
+
+	readonly detectedBreak: FIRVisionCloudDetectedBreak;
+
+	readonly detectedLanguages: NSArray<FIRVisionCloudDetectedLanguage>;
+}
+
+declare class FIRVisionCloudWord extends NSObject {
+
+	static alloc(): FIRVisionCloudWord; // inherited from NSObject
+
+	static new(): FIRVisionCloudWord; // inherited from NSObject
+
+	readonly confidence: number;
+
+	readonly frame: CGRect;
+
+	readonly symbols: NSArray<FIRVisionCloudSymbol>;
+
+	readonly textProperty: FIRVisionCloudTextProperty;
+}
+
+declare const enum FIRVisionDetectorImageOrientation {
+
+	TopLeft = 1,
+
+	TopRight = 2,
+
+	BottomRight = 3,
+
+	BottomLeft = 4,
+
+	LeftTop = 5,
+
+	RightTop = 6,
+
+	RightBottom = 7,
+
+	LeftBottom = 8
+}
+
+declare class FIRVisionFace extends NSObject {
+
+	static alloc(): FIRVisionFace; // inherited from NSObject
+
+	static new(): FIRVisionFace; // inherited from NSObject
+
+	readonly frame: CGRect;
+
+	readonly hasHeadEulerAngleY: boolean;
+
+	readonly hasHeadEulerAngleZ: boolean;
+
+	readonly hasLeftEyeOpenProbability: boolean;
+
+	readonly hasRightEyeOpenProbability: boolean;
+
+	readonly hasSmilingProbability: boolean;
+
+	readonly hasTrackingID: boolean;
+
+	readonly headEulerAngleY: number;
+
+	readonly headEulerAngleZ: number;
+
+	readonly leftEyeOpenProbability: number;
+
+	readonly rightEyeOpenProbability: number;
+
+	readonly smilingProbability: number;
+
+	readonly trackingID: number;
+
+	landmarkOfType(type: string): FIRVisionFaceLandmark;
+}
+
+declare var FIRVisionFaceDetectionMinSize: number;
+
+declare class FIRVisionFaceDetector extends NSObject {
+
+	static alloc(): FIRVisionFaceDetector; // inherited from NSObject
+
+	static new(): FIRVisionFaceDetector; // inherited from NSObject
+
+	detectInImageCompletion(image: FIRVisionImage, completion: (p1: NSArray<FIRVisionFace>, p2: NSError) => void): void;
+}
+
+declare const enum FIRVisionFaceDetectorClassification {
+
+	None = 1,
+
+	All = 2
+}
+
+declare const enum FIRVisionFaceDetectorLandmark {
+
+	None = 1,
+
+	All = 2
+}
+
+declare const enum FIRVisionFaceDetectorMode {
+
+	Fast = 1,
+
+	Accurate = 2
+}
+
+declare class FIRVisionFaceDetectorOptions extends NSObject {
+
+	static alloc(): FIRVisionFaceDetectorOptions; // inherited from NSObject
+
+	static new(): FIRVisionFaceDetectorOptions; // inherited from NSObject
+
+	classificationType: FIRVisionFaceDetectorClassification;
+
+	isTrackingEnabled: boolean;
+
+	landmarkType: FIRVisionFaceDetectorLandmark;
+
+	minFaceSize: number;
+
+	modeType: FIRVisionFaceDetectorMode;
+}
+
+declare class FIRVisionFaceLandmark extends NSObject {
+
+	static alloc(): FIRVisionFaceLandmark; // inherited from NSObject
+
+	static new(): FIRVisionFaceLandmark; // inherited from NSObject
+
+	readonly position: FIRVisionPoint;
+
+	readonly type: string;
+}
+
+declare class FIRVisionImage extends NSObject {
+
+	static alloc(): FIRVisionImage; // inherited from NSObject
+
+	static new(): FIRVisionImage; // inherited from NSObject
+
+	metadata: FIRVisionImageMetadata;
+
+	constructor(o: { buffer: any; });
+
+	constructor(o: { image: UIImage; });
+
+	initWithBuffer(sampleBuffer: any): this;
+
+	initWithImage(image: UIImage): this;
+}
+
+declare class FIRVisionImageMetadata extends NSObject {
+
+	static alloc(): FIRVisionImageMetadata; // inherited from NSObject
+
+	static new(): FIRVisionImageMetadata; // inherited from NSObject
+
+	orientation: FIRVisionDetectorImageOrientation;
+}
+
+declare class FIRVisionLabel extends NSObject {
+
+	static alloc(): FIRVisionLabel; // inherited from NSObject
+
+	static new(): FIRVisionLabel; // inherited from NSObject
+
+	readonly confidence: number;
+
+	readonly entityID: string;
+
+	readonly frame: CGRect;
+
+	readonly label: string;
+}
+
+declare class FIRVisionLabelDetector extends NSObject {
+
+	static alloc(): FIRVisionLabelDetector; // inherited from NSObject
+
+	static new(): FIRVisionLabelDetector; // inherited from NSObject
+
+	detectInImageCompletion(image: FIRVisionImage, completion: (p1: NSArray<FIRVisionLabel>, p2: NSError) => void): void;
+}
+
+declare class FIRVisionLabelDetectorOptions extends NSObject {
+
+	static alloc(): FIRVisionLabelDetectorOptions; // inherited from NSObject
+
+	static new(): FIRVisionLabelDetectorOptions; // inherited from NSObject
+
+	readonly confidenceThreshold: number;
+
+	constructor(o: { confidenceThreshold: number; });
+
+	initWithConfidenceThreshold(confidenceThreshold: number): this;
+}
+
+declare class FIRVisionLatitudeLongitude extends NSObject {
+
+	static alloc(): FIRVisionLatitudeLongitude; // inherited from NSObject
+
+	static new(): FIRVisionLatitudeLongitude; // inherited from NSObject
+
+	latitude: number;
+
+	longitude: number;
+
+	constructor(o: { latitude: number; longitude: number; });
+
+	initWithLatitudeLongitude(latitude: number, longitude: number): this;
+}
+
+declare class FIRVisionPoint extends NSObject {
+
+	static alloc(): FIRVisionPoint; // inherited from NSObject
+
+	static new(): FIRVisionPoint; // inherited from NSObject
+
+	readonly x: number;
+
+	readonly y: number;
+
+	readonly z: number;
+}
+
+interface FIRVisionText extends NSObjectProtocol {
+
+	cornerPoints: NSArray<NSValue>;
+
+	frame: CGRect;
+
+	text: string;
+}
+declare var FIRVisionText: {
+
+	prototype: FIRVisionText;
+};
+
+declare class FIRVisionTextBlock extends NSObject implements FIRVisionText {
+
+	static alloc(): FIRVisionTextBlock; // inherited from NSObject
+
+	static new(): FIRVisionTextBlock; // inherited from NSObject
+
+	readonly lines: NSArray<FIRVisionTextLine>;
+
+	readonly cornerPoints: NSArray<NSValue>; // inherited from FIRVisionText
+
+	readonly debugDescription: string; // inherited from NSObjectProtocol
+
+	readonly description: string; // inherited from NSObjectProtocol
+
+	readonly frame: CGRect; // inherited from FIRVisionText
+
+	readonly hash: number; // inherited from NSObjectProtocol
+
+	readonly isProxy: boolean; // inherited from NSObjectProtocol
+
+	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
+
+	readonly text: string; // inherited from FIRVisionText
+
+	readonly  // inherited from NSObjectProtocol
+
+	class(): typeof NSObject;
+
+	conformsToProtocol(aProtocol: any /* Protocol */): boolean;
+
+	isEqual(object: any): boolean;
+
+	isKindOfClass(aClass: typeof NSObject): boolean;
+
+	isMemberOfClass(aClass: typeof NSObject): boolean;
+
+	performSelector(aSelector: string): any;
+
+	performSelectorWithObject(aSelector: string, object: any): any;
+
+	performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any;
+
+	respondsToSelector(aSelector: string): boolean;
+
+	retainCount(): number;
+
+	self(): this;
+}
+
+declare class FIRVisionTextDetector extends NSObject {
+
+	static alloc(): FIRVisionTextDetector; // inherited from NSObject
+
+	static new(): FIRVisionTextDetector; // inherited from NSObject
+
+	detectInImageCompletion(image: FIRVisionImage, completion: (p1: NSArray<FIRVisionText>, p2: NSError) => void): void;
+}
+
+declare class FIRVisionTextElement extends NSObject implements FIRVisionText {
+
+	static alloc(): FIRVisionTextElement; // inherited from NSObject
+
+	static new(): FIRVisionTextElement; // inherited from NSObject
+
+	readonly cornerPoints: NSArray<NSValue>; // inherited from FIRVisionText
+
+	readonly debugDescription: string; // inherited from NSObjectProtocol
+
+	readonly description: string; // inherited from NSObjectProtocol
+
+	readonly frame: CGRect; // inherited from FIRVisionText
+
+	readonly hash: number; // inherited from NSObjectProtocol
+
+	readonly isProxy: boolean; // inherited from NSObjectProtocol
+
+	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
+
+	readonly text: string; // inherited from FIRVisionText
+
+	readonly  // inherited from NSObjectProtocol
+
+	class(): typeof NSObject;
+
+	conformsToProtocol(aProtocol: any /* Protocol */): boolean;
+
+	isEqual(object: any): boolean;
+
+	isKindOfClass(aClass: typeof NSObject): boolean;
+
+	isMemberOfClass(aClass: typeof NSObject): boolean;
+
+	performSelector(aSelector: string): any;
+
+	performSelectorWithObject(aSelector: string, object: any): any;
+
+	performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any;
+
+	respondsToSelector(aSelector: string): boolean;
+
+	retainCount(): number;
+
+	self(): this;
+}
+
+declare class FIRVisionTextLine extends NSObject implements FIRVisionText {
+
+	static alloc(): FIRVisionTextLine; // inherited from NSObject
+
+	static new(): FIRVisionTextLine; // inherited from NSObject
+
+	readonly elements: NSArray<FIRVisionTextElement>;
+
+	readonly cornerPoints: NSArray<NSValue>; // inherited from FIRVisionText
+
+	readonly debugDescription: string; // inherited from NSObjectProtocol
+
+	readonly description: string; // inherited from NSObjectProtocol
+
+	readonly frame: CGRect; // inherited from FIRVisionText
+
+	readonly hash: number; // inherited from NSObjectProtocol
+
+	readonly isProxy: boolean; // inherited from NSObjectProtocol
+
+	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
+
+	readonly text: string; // inherited from FIRVisionText
+
+	readonly  // inherited from NSObjectProtocol
+
+	class(): typeof NSObject;
+
+	conformsToProtocol(aProtocol: any /* Protocol */): boolean;
+
+	isEqual(object: any): boolean;
+
+	isKindOfClass(aClass: typeof NSObject): boolean;
+
+	isMemberOfClass(aClass: typeof NSObject): boolean;
+
+	performSelector(aSelector: string): any;
+
+	performSelectorWithObject(aSelector: string, object: any): any;
+
+	performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any;
+
+	respondsToSelector(aSelector: string): boolean;
+
+	retainCount(): number;
+
+	self(): this;
+}
diff --git a/src/platforms/ios/typings/objc!FirebaseMessaging.d.ts b/src/platforms/ios/typings/objc!FirebaseMessaging.d.ts
index 06271f5f..0826cd6f 100644
--- a/src/platforms/ios/typings/objc!FirebaseMessaging.d.ts
+++ b/src/platforms/ios/typings/objc!FirebaseMessaging.d.ts
@@ -17,8 +17,6 @@ declare class FIRMessaging extends NSObject {
 
 	readonly isDirectChannelEstablished: boolean;
 
-	remoteMessageDelegate: FIRMessagingDelegate;
-
 	shouldEstablishDirectChannel: boolean;
 
 	appDidReceiveMessage(message: NSDictionary<any, any>): FIRMessagingMessageInfo;
@@ -37,7 +35,11 @@ declare class FIRMessaging extends NSObject {
 
 	subscribeToTopic(topic: string): void;
 
+	subscribeToTopicCompletion(topic: string, completion: (p1: NSError) => void): void;
+
 	unsubscribeFromTopic(topic: string): void;
+
+	unsubscribeFromTopicCompletion(topic: string, completion: (p1: NSError) => void): void;
 }
 
 declare const enum FIRMessagingAPNSTokenType {
@@ -53,13 +55,9 @@ declare var FIRMessagingConnectionStateChangedNotification: string;
 
 interface FIRMessagingDelegate extends NSObjectProtocol {
 
-	applicationReceivedRemoteMessage?(remoteMessage: FIRMessagingRemoteMessage): void;
-
 	messagingDidReceiveMessage?(messaging: FIRMessaging, remoteMessage: FIRMessagingRemoteMessage): void;
 
 	messagingDidReceiveRegistrationToken?(messaging: FIRMessaging, fcmToken: string): void;
-
-	messagingDidRefreshRegistrationToken?(messaging: FIRMessaging, fcmToken: string): void;
 }
 declare var FIRMessagingDelegate: {
 
@@ -115,3 +113,7 @@ declare class FIRMessagingRemoteMessage extends NSObject {
 declare var FIRMessagingSendErrorNotification: string;
 
 declare var FIRMessagingSendSuccessNotification: string;
+
+declare var FirebaseMessagingVersionNumber: number;
+
+declare var FirebaseMessagingVersionString: interop.Reference<number>;
diff --git a/src/platforms/ios/typings/objc!FirebaseStorage.d.ts b/src/platforms/ios/typings/objc!FirebaseStorage.d.ts
index 34fd3cad..508e92d9 100644
--- a/src/platforms/ios/typings/objc!FirebaseStorage.d.ts
+++ b/src/platforms/ios/typings/objc!FirebaseStorage.d.ts
@@ -126,8 +126,6 @@ declare class FIRStorageMetadata extends NSObject implements NSCopying {
 
 	customMetadata: NSDictionary<string, string>;
 
-	readonly downloadURLs: NSArray<NSURL>;
-
 	readonly file: boolean;
 
 	readonly folder: boolean;
@@ -156,8 +154,6 @@ declare class FIRStorageMetadata extends NSObject implements NSCopying {
 
 	dictionaryRepresentation(): NSDictionary<string, any>;
 
-	downloadURL(): NSURL;
-
 	initWithDictionary(dictionary: NSDictionary<string, any>): this;
 }
 
@@ -331,3 +327,7 @@ declare class FIRStorageUploadTask extends FIRStorageObservableTask implements F
 }
 
 declare var FIRStorageVersionString: string;
+
+declare var FirebaseStorageVersionNumber: number;
+
+declare var FirebaseStorageVersionString: interop.Reference<number>;
diff --git a/src/platforms/ios/typings/objc!GoogleMobileVision.d.ts b/src/platforms/ios/typings/objc!GoogleMobileVision.d.ts
new file mode 100644
index 00000000..5205f600
--- /dev/null
+++ b/src/platforms/ios/typings/objc!GoogleMobileVision.d.ts
@@ -0,0 +1,574 @@
+
+declare class GMVBarcodeFeature extends GMVFeature {
+
+	static alloc(): GMVBarcodeFeature; // inherited from NSObject
+
+	static new(): GMVBarcodeFeature; // inherited from NSObject
+
+	readonly calendarEvent: GMVBarcodeFeatureCalendarEvent;
+
+	readonly contactInfo: GMVBarcodeFeatureContactInfo;
+
+	readonly cornerPoints: NSArray<NSValue>;
+
+	readonly displayValue: string;
+
+	readonly driverLicense: GMVBarcodeFeatureDriverLicense;
+
+	readonly email: GMVBarcodeFeatureEmail;
+
+	readonly format: GMVDetectorBarcodeFormat;
+
+	readonly geoPoint: GMVBarcodeFeatureGeoPoint;
+
+	readonly phone: GMVBarcodeFeaturePhone;
+
+	readonly rawValue: string;
+
+	readonly sms: GMVBarcodeFeatureSMS;
+
+	readonly url: GMVBarcodeFeatureURLBookmark;
+
+	readonly valueFormat: GMVDetectorBarcodeValueFormat;
+
+	readonly wifi: GMVBarcodeFeatureWiFi;
+}
+
+declare class GMVBarcodeFeatureAddress extends NSObject {
+
+	static alloc(): GMVBarcodeFeatureAddress; // inherited from NSObject
+
+	static new(): GMVBarcodeFeatureAddress; // inherited from NSObject
+
+	readonly addressLines: NSArray<string>;
+
+	readonly type: GMVBarcodeFeatureAddressType;
+}
+
+declare const enum GMVBarcodeFeatureAddressType {
+
+	Unknown = 0,
+
+	Work = 1,
+
+	Home = 2
+}
+
+declare class GMVBarcodeFeatureCalendarEvent extends NSObject {
+
+	static alloc(): GMVBarcodeFeatureCalendarEvent; // inherited from NSObject
+
+	static new(): GMVBarcodeFeatureCalendarEvent; // inherited from NSObject
+
+	readonly end: Date;
+
+	readonly eventDescription: string;
+
+	readonly location: string;
+
+	readonly organizer: string;
+
+	readonly start: Date;
+
+	readonly status: string;
+
+	readonly summary: string;
+}
+
+declare class GMVBarcodeFeatureContactInfo extends NSObject {
+
+	static alloc(): GMVBarcodeFeatureContactInfo; // inherited from NSObject
+
+	static new(): GMVBarcodeFeatureContactInfo; // inherited from NSObject
+
+	readonly addresses: NSArray<GMVBarcodeFeatureAddress>;
+
+	readonly emails: NSArray<GMVBarcodeFeatureEmail>;
+
+	readonly jobTitle: string;
+
+	readonly name: GMVBarcodeFeaturePersonName;
+
+	readonly organization: string;
+
+	readonly phones: NSArray<GMVBarcodeFeaturePhone>;
+
+	readonly urls: NSArray<string>;
+}
+
+declare class GMVBarcodeFeatureDriverLicense extends NSObject {
+
+	static alloc(): GMVBarcodeFeatureDriverLicense; // inherited from NSObject
+
+	static new(): GMVBarcodeFeatureDriverLicense; // inherited from NSObject
+
+	readonly addressCity: string;
+
+	readonly addressState: string;
+
+	readonly addressStreet: string;
+
+	readonly addressZip: string;
+
+	readonly birthDate: string;
+
+	readonly documentType: string;
+
+	readonly expiryDate: string;
+
+	readonly firstName: string;
+
+	readonly gender: string;
+
+	readonly issuingCountry: string;
+
+	readonly issuingDate: string;
+
+	readonly lastName: string;
+
+	readonly licenseNumber: string;
+
+	readonly middleName: string;
+}
+
+declare class GMVBarcodeFeatureEmail extends NSObject {
+
+	static alloc(): GMVBarcodeFeatureEmail; // inherited from NSObject
+
+	static new(): GMVBarcodeFeatureEmail; // inherited from NSObject
+
+	readonly address: string;
+
+	readonly body: string;
+
+	readonly subject: string;
+
+	readonly type: GMVBarcodeFeatureEmailType;
+}
+
+declare const enum GMVBarcodeFeatureEmailType {
+
+	Unknown = 0,
+
+	Work = 1,
+
+	Home = 2
+}
+
+declare class GMVBarcodeFeatureGeoPoint extends NSObject {
+
+	static alloc(): GMVBarcodeFeatureGeoPoint; // inherited from NSObject
+
+	static new(): GMVBarcodeFeatureGeoPoint; // inherited from NSObject
+
+	readonly latitude: number;
+
+	readonly longitude: number;
+}
+
+declare class GMVBarcodeFeaturePersonName extends NSObject {
+
+	static alloc(): GMVBarcodeFeaturePersonName; // inherited from NSObject
+
+	static new(): GMVBarcodeFeaturePersonName; // inherited from NSObject
+
+	readonly first: string;
+
+	readonly formattedName: string;
+
+	readonly last: string;
+
+	readonly middle: string;
+
+	readonly prefix: string;
+
+	readonly pronounciation: string;
+
+	readonly suffix: string;
+}
+
+declare class GMVBarcodeFeaturePhone extends NSObject {
+
+	static alloc(): GMVBarcodeFeaturePhone; // inherited from NSObject
+
+	static new(): GMVBarcodeFeaturePhone; // inherited from NSObject
+
+	readonly number: string;
+
+	readonly type: GMVBarcodeFeaturePhoneType;
+}
+
+declare const enum GMVBarcodeFeaturePhoneType {
+
+	Unknown = 0,
+
+	Work = 1,
+
+	Home = 2,
+
+	Fax = 3,
+
+	Mobile = 4
+}
+
+declare class GMVBarcodeFeatureSMS extends NSObject {
+
+	static alloc(): GMVBarcodeFeatureSMS; // inherited from NSObject
+
+	static new(): GMVBarcodeFeatureSMS; // inherited from NSObject
+
+	readonly message: string;
+
+	readonly phoneNumber: string;
+}
+
+declare class GMVBarcodeFeatureURLBookmark extends NSObject {
+
+	static alloc(): GMVBarcodeFeatureURLBookmark; // inherited from NSObject
+
+	static new(): GMVBarcodeFeatureURLBookmark; // inherited from NSObject
+
+	readonly title: string;
+
+	readonly url: string;
+}
+
+declare class GMVBarcodeFeatureWiFi extends NSObject {
+
+	static alloc(): GMVBarcodeFeatureWiFi; // inherited from NSObject
+
+	static new(): GMVBarcodeFeatureWiFi; // inherited from NSObject
+
+	readonly password: string;
+
+	readonly ssid: string;
+
+	readonly type: GMVBarcodeFeatureWiFiEncryptionType;
+}
+
+declare const enum GMVBarcodeFeatureWiFiEncryptionType {
+
+	Unknown = 0,
+
+	Open = 1,
+
+	WPA = 2,
+
+	WEP = 3
+}
+
+declare class GMVDetector extends NSObject {
+
+	static alloc(): GMVDetector; // inherited from NSObject
+
+	static detectorOfTypeOptions(type: string, options: NSDictionary<any, any>): GMVDetector;
+
+	static new(): GMVDetector; // inherited from NSObject
+
+	featuresInBufferOptions(sampleBuffer: any, options: NSDictionary<any, any>): NSArray<GMVFeature>;
+
+	featuresInImageOptions(image: UIImage, options: NSDictionary<any, any>): NSArray<GMVFeature>;
+}
+
+declare const enum GMVDetectorBarcodeFormat {
+
+	Code128 = 1,
+
+	Code39 = 2,
+
+	Code93 = 4,
+
+	CodaBar = 8,
+
+	DataMatrix = 16,
+
+	EAN13 = 32,
+
+	EAN8 = 64,
+
+	ITF = 128,
+
+	QRCode = 256,
+
+	UPCA = 512,
+
+	UPCE = 1024,
+
+	PDF417 = 2048,
+
+	Aztec = 4096
+}
+
+declare var GMVDetectorBarcodeFormats: string;
+
+declare const enum GMVDetectorBarcodeValueFormat {
+
+	ContactInfo = 1,
+
+	Email = 2,
+
+	ISBN = 3,
+
+	Phone = 4,
+
+	Product = 5,
+
+	SMS = 6,
+
+	Text = 7,
+
+	URL = 8,
+
+	WiFi = 9,
+
+	GeographicCoordinates = 10,
+
+	CalendarEvent = 11,
+
+	DriversLicense = 12
+}
+
+declare const enum GMVDetectorError {
+
+	InvalidInput = -301
+}
+
+declare const enum GMVDetectorFaceClassification {
+
+	None = 1,
+
+	All = 2
+}
+
+declare var GMVDetectorFaceClassificationType: string;
+
+declare const enum GMVDetectorFaceLandmark {
+
+	None = 1,
+
+	All = 2
+}
+
+declare var GMVDetectorFaceLandmarkType: string;
+
+declare var GMVDetectorFaceMinSize: string;
+
+declare var GMVDetectorFaceMode: string;
+
+declare const enum GMVDetectorFaceModeOption {
+
+	FastMode = 200,
+
+	AccurateMode = 201
+}
+
+declare var GMVDetectorFaceTrackingEnabled: string;
+
+declare var GMVDetectorImageOrientation: string;
+
+declare var GMVDetectorLabelScoreThreshold: string;
+
+declare var GMVDetectorResultCoordinateSpace: string;
+
+declare var GMVDetectorTypeBarcode: string;
+
+declare var GMVDetectorTypeFace: string;
+
+declare var GMVDetectorTypeLabel: string;
+
+declare var GMVDetectorTypeText: string;
+
+declare class GMVFaceFeature extends GMVFeature {
+
+	static alloc(): GMVFaceFeature; // inherited from NSObject
+
+	static new(): GMVFaceFeature; // inherited from NSObject
+
+	readonly bottomMouthPosition: CGPoint;
+
+	readonly hasBottomMouthPosition: boolean;
+
+	readonly hasHeadEulerAngleY: boolean;
+
+	readonly hasHeadEulerAngleZ: boolean;
+
+	readonly hasLeftCheekPosition: boolean;
+
+	readonly hasLeftEarPosition: boolean;
+
+	readonly hasLeftEyeOpenProbability: boolean;
+
+	readonly hasLeftEyePosition: boolean;
+
+	readonly hasLeftMouthPosition: boolean;
+
+	readonly hasMouthPosition: boolean;
+
+	readonly hasNoseBasePosition: boolean;
+
+	readonly hasRightCheekPosition: boolean;
+
+	readonly hasRightEarPosition: boolean;
+
+	readonly hasRightEyeOpenProbability: boolean;
+
+	readonly hasRightEyePosition: boolean;
+
+	readonly hasRightMouthPosition: boolean;
+
+	readonly hasSmilingProbability: boolean;
+
+	readonly headEulerAngleY: number;
+
+	readonly headEulerAngleZ: number;
+
+	readonly leftCheekPosition: CGPoint;
+
+	readonly leftEarPosition: CGPoint;
+
+	readonly leftEyeOpenProbability: number;
+
+	readonly leftEyePosition: CGPoint;
+
+	readonly leftMouthPosition: CGPoint;
+
+	readonly mouthPosition: CGPoint;
+
+	readonly noseBasePosition: CGPoint;
+
+	readonly rightCheekPosition: CGPoint;
+
+	readonly rightEarPosition: CGPoint;
+
+	readonly rightEyeOpenProbability: number;
+
+	readonly rightEyePosition: CGPoint;
+
+	readonly rightMouthPosition: CGPoint;
+
+	readonly smilingProbability: number;
+}
+
+declare class GMVFeature extends NSObject {
+
+	static alloc(): GMVFeature; // inherited from NSObject
+
+	static new(): GMVFeature; // inherited from NSObject
+
+	readonly bounds: CGRect;
+
+	readonly hasTrackingID: boolean;
+
+	readonly trackingID: number;
+
+	readonly type: string;
+}
+
+declare var GMVFeatureTypeBarcode: string;
+
+declare var GMVFeatureTypeFace: string;
+
+declare var GMVFeatureTypeLabel: string;
+
+declare var GMVFeatureTypeTextBlock: string;
+
+declare var GMVFeatureTypeTextElement: string;
+
+declare var GMVFeatureTypeTextLine: string;
+
+declare const enum GMVImageOrientation {
+
+	TopLeft = 1,
+
+	TopRight = 2,
+
+	BottomRight = 3,
+
+	BottomLeft = 4,
+
+	LeftTop = 5,
+
+	RightTop = 6,
+
+	RightBottom = 7,
+
+	LeftBottom = 8
+}
+
+declare class GMVLabelFeature extends GMVFeature {
+
+	static alloc(): GMVLabelFeature; // inherited from NSObject
+
+	static new(): GMVLabelFeature; // inherited from NSObject
+
+	readonly MID: string;
+
+	readonly labelDescription: string;
+
+	readonly score: number;
+}
+
+declare const enum GMVResultCoordinateSpace {
+
+	CaptureDeviceEXIFCoordinateSpace = 1,
+
+	CaptureDeviceCoordinateSpace = 2
+}
+
+declare class GMVTextBlockFeature extends GMVFeature {
+
+	static alloc(): GMVTextBlockFeature; // inherited from NSObject
+
+	static new(): GMVTextBlockFeature; // inherited from NSObject
+
+	readonly cornerPoints: NSArray<NSValue>;
+
+	readonly language: string;
+
+	readonly lines: NSArray<GMVTextLineFeature>;
+
+	readonly value: string;
+}
+
+declare class GMVTextElementFeature extends GMVFeature {
+
+	static alloc(): GMVTextElementFeature; // inherited from NSObject
+
+	static new(): GMVTextElementFeature; // inherited from NSObject
+
+	readonly cornerPoints: NSArray<NSValue>;
+
+	readonly value: string;
+}
+
+declare class GMVTextLineFeature extends GMVFeature {
+
+	static alloc(): GMVTextLineFeature; // inherited from NSObject
+
+	static new(): GMVTextLineFeature; // inherited from NSObject
+
+	readonly cornerPoints: NSArray<NSValue>;
+
+	readonly elements: NSArray<GMVTextElementFeature>;
+
+	readonly language: string;
+
+	readonly value: string;
+}
+
+declare class GMVUtility extends NSObject {
+
+	static alloc(): GMVUtility; // inherited from NSObject
+
+	static anySampleBufferFormatTo32RGBA(sampleBuffer: any): NSData;
+
+	static imageFromDataWidthHeight(data: NSData, width: number, height: number): UIImage;
+
+	static imageOrientationFromOrientationWithCaptureDevicePositionDefaultDeviceOrientation(deviceOrientation: UIDeviceOrientation, position: AVCaptureDevicePosition, defaultOrientation: UIDeviceOrientation): GMVImageOrientation;
+
+	static new(): GMVUtility; // inherited from NSObject
+
+	static sampleBufferTo32RGBA(sampleBuffer: any): UIImage;
+}
+
+declare var kGMVDetectorLabelScoreThresholdDefaultValue: number;
diff --git a/src/scripts/entitlements-after-prepare.js b/src/scripts/entitlements-after-prepare.js
index 74cea25c..d41ec299 100644
--- a/src/scripts/entitlements-after-prepare.js
+++ b/src/scripts/entitlements-after-prepare.js
@@ -1,6 +1,14 @@
 var fs = require('fs');
 var path = require('path');
 
+function patchPluginsFile(pluginsFile) {
+  if (fs.existsSync(pluginsFile)) {
+    var xcconfigContent = fs.readFileSync(pluginsFile).toString();
+    xcconfigContent = xcconfigContent.replace('$(inherited) ${SRCROOT}/Pods/TensorFlowLite/Frameworks/tensorflow_lite.framework -L ', '$(inherited) -L ${SRCROOT}/Pods/TensorFlowLite/Frameworks/tensorflow_lite.framework ');
+    fs.writeFileSync(pluginsFile, xcconfigContent);
+  }
+}
+
 module.exports = function (logger, platformsData, projectData, hookArgs) {
   var platform = hookArgs.platform.toLowerCase(),
       appResourcesDirectoryPath = projectData.appResourcesDirectoryPath,
@@ -8,6 +16,10 @@ module.exports = function (logger, platformsData, projectData, hookArgs) {
       projectRoot = path.join(projectData.platformsDir, "ios"),
       project = path.join(projectRoot, projectData.projectName);
 
+  // TensorFlowLite needs a little patch that currently can't be done in any other way than with this hook
+  patchPluginsFile(path.join(projectRoot, "plugins-debug.xcconfig"));
+  patchPluginsFile(path.join(projectRoot, "plugins-release.xcconfig"));
+
   // look for both <projectname.entitlements and app.entitlements
   if (!fs.existsSync(entitlementsFile)) {
     entitlementsFile = path.join(appResourcesDirectoryPath, "iOS", "app.entitlements");
diff --git a/src/scripts/postinstall.js b/src/scripts/postinstall.js
index ff6dc210..5af7693f 100644
--- a/src/scripts/postinstall.js
+++ b/src/scripts/postinstall.js
@@ -2961,6 +2961,10 @@ function promptQuestions() {
         name: 'google_auth',
         description: 'Are you using Firebase Google Authentication (y/n)',
         default: 'n'
+    }, {
+        name: 'ml_kit',
+        description: 'Are you using ML Kit (y/n)',
+        default: 'n'
     }, {
       name: 'admob',
       description: 'Are you using AdMob (y/n)',
@@ -3026,7 +3030,9 @@ function writePodFile(result) {
     }
     try {
         fs.writeFileSync(directories.ios + '/Podfile',
-`pod 'Firebase', '~> 4.11.0' 
+`platform :ios, '9.0'
+
+pod 'Firebase/Core', '~> 5.0.0' 
 pod 'Firebase/Auth'
 
 # Uncomment if you want to enable Realtime DB
@@ -3066,6 +3072,17 @@ end`) + `
 # Uncomment if you want to enable Invites and/or Dynamic Links
 ` + (isSelected(result.invites) ? `` : `#`) + `pod 'Firebase/Invites'
 
+# Uncomment if you want to enable ML Kit
+` + (isSelected(result.ml_kit) ? `` : `#`) + `pod 'Firebase/MLVision'
+# TODO we'de better make these conditional as well
+` + (!isSelected(result.ml_kit) ? `` : `
+pod 'Firebase/MLVisionBarcodeModel'
+pod 'Firebase/MLVisionFaceModel'
+pod 'Firebase/MLVisionLabelModel'
+pod 'Firebase/MLVisionTextModel'
+pod 'Firebase/MLModelInterpreter'
+`) + `
+
 # Uncomment if you want to enable Facebook Authentication
 ` + (isSelected(result.facebook_auth) ? `` : `#`) + `pod 'FBSDKCoreKit'
 ` + (isSelected(result.facebook_auth) ? `` : `#`) + `pod 'FBSDKLoginKit'
@@ -3259,6 +3276,11 @@ repositories {
 }
 
 def supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "26.0.0"
+def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : "15.0.0"
+
+if ( VersionNumber.parse( googlePlayServicesVersion ) < VersionNumber.parse( '15.0.0' ) ) {
+    throw new GradleException(" googlePlayServicesVersion set too low, please update to at least 15.0.0 ( currently set to $googlePlayServicesVersion )");
+}
 
 dependencies {
     compile "com.android.support:appcompat-v7:$supportVersion"
@@ -3267,39 +3289,40 @@ dependencies {
     compile "com.android.support:design:$supportVersion"
     compile "com.android.support:support-compat:$supportVersion"
 
-    def firebaseVersion = "12.0.1"
-
     // make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
-    compile "com.google.firebase:firebase-core:$firebaseVersion"
-    compile "com.google.firebase:firebase-auth:$firebaseVersion"
+    compile "com.google.firebase:firebase-core:15.0.2"
+    compile "com.google.firebase:firebase-auth:15.1.0"
 
     // for reading google-services.json and configuration
-    def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : firebaseVersion
     compile "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
 
     // Uncomment if you want to use the regular Database
-    ` + (!isPresent(result.realtimedb) || isSelected(result.realtimedb) ? `` : `//`) + ` compile "com.google.firebase:firebase-database:$firebaseVersion"
+    ` + (!isPresent(result.realtimedb) || isSelected(result.realtimedb) ? `` : `//`) + ` compile "com.google.firebase:firebase-database:15.0.0"
 
     // Uncomment if you want to use 'Cloud Firestore'
-    ` + (isSelected(result.firestore) ? `` : `//`) + ` compile "com.google.firebase:firebase-firestore:$firebaseVersion"
+    ` + (isSelected(result.firestore) ? `` : `//`) + ` compile "com.google.firebase:firebase-firestore:16.0.0"
 
     // Uncomment if you want to use 'Remote Config'
-    ` + (isSelected(result.remote_config) ? `` : `//`) + ` compile "com.google.firebase:firebase-config:$firebaseVersion"
+    ` + (isSelected(result.remote_config) ? `` : `//`) + ` compile "com.google.firebase:firebase-config:15.0.2"
 
     // Uncomment if you want to use 'Crash Reporting'
-    ` + (isSelected(result.crash_reporting) && !isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.google.firebase:firebase-crash:$firebaseVersion"
+    ` + (isSelected(result.crash_reporting) && !isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.google.firebase:firebase-crash:15.0.2"
 
     // Uncomment if you want to use 'Crashlytics'
     ` + (isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.crashlytics.sdk.android:crashlytics:2.9.1"
 
-    // Uncomment if you want FCM (Firebase Cloud Messaging)
-    ` + (isSelected(result.messaging) ? `` : `//`) + ` compile "com.google.firebase:firebase-messaging:$firebaseVersion"
+    // Uncomment if you want to use FCM (Firebase Cloud Messaging)
+    ` + (isSelected(result.messaging) ? `` : `//`) + ` compile "com.google.firebase:firebase-messaging:15.0.2"
+
+    // Uncomment if you want to use Google Cloud Storage
+    ` + (isSelected(result.storage) ? `` : `//`) + ` compile "com.google.firebase:firebase-storage:15.0.2"
 
-    // Uncomment if you want Google Cloud Storage
-    ` + (isSelected(result.storage) ? `` : `//`) + ` compile "com.google.firebase:firebase-storage:$firebaseVersion"
+    // Uncomment if you want to use AdMob
+    ` + (isSelected(result.admob) ? `` : `//`) + ` compile "com.google.firebase:firebase-ads:15.0.0"
 
-    // Uncomment if you want AdMob
-    ` + (isSelected(result.admob) ? `` : `//`) + ` compile "com.google.firebase:firebase-ads:$firebaseVersion"
+    // Uncomment if you want to use ML Kit
+    // TODO see step 3 @ https://firebase.google.com/docs/ml-kit/android/recognize-text, but that could be done with documentation
+    ` + (isSelected(result.ml_kit) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision:15.0.0"
 
     // Uncomment if you need Facebook Authentication
     ` + (isSelected(result.facebook_auth) ? `` : `//`) + ` compile ("com.facebook.android:facebook-android-sdk:4.+"){ exclude group: 'com.google.zxing' }
@@ -3308,7 +3331,7 @@ dependencies {
     ` + (isSelected(result.google_auth) ? `` : `//`) + ` compile "com.google.android.gms:play-services-auth:$googlePlayServicesVersion"
 
     // Uncomment if you need Firebase Invites or Dynamic Links
-    ` + (isSelected(result.invites) ? `` : `//`) + ` compile "com.google.firebase:firebase-invites:$firebaseVersion"
+    ` + (isSelected(result.invites) ? `` : `//`) + ` compile "com.google.firebase:firebase-invites:$googlePlayServicesVersion"
 }
 
 apply plugin: "com.google.gms.google-services"
@@ -3402,7 +3425,7 @@ module.exports = function($logger, $projectData) {
 
             let gradlePattern = /classpath ('|")com\\.android\\.tools\\.build:gradle:\\d+\\.\\d+\\.\\d+('|")/;
             let googleServicesPattern = /classpath ('|")com\\.google\\.gms:google-services:\\d+\\.\\d+\\.\\d+('|")/;
-            let latestGoogleServicesPlugin = 'classpath "com.google.gms:google-services:3.1.2"';
+            let latestGoogleServicesPlugin = 'classpath "com.google.gms:google-services:3.3.1"';
             if (googleServicesPattern.test(buildGradleContent)) {
                 buildGradleContent = buildGradleContent.replace(googleServicesPattern, latestGoogleServicesPlugin);
             } else {