From 9a17c4f24dd5a09f3c3235eabdaab3248e639d7c Mon Sep 17 00:00:00 2001
From: Lennon Jesus <lennon.jesus@gmail.com>
Date: Wed, 21 Nov 2018 18:36:26 -0200
Subject: [PATCH 001/410] docs: Improves READMEs styles (#919)

---
 packages/firebase_admob/README.md         | 14 +++++++-------
 packages/firebase_ml_vision/README.md     |  2 +-
 packages/firebase_remote_config/README.md | 10 +++++-----
 packages/google_sign_in/README.md         |  6 +++---
 packages/local_auth/README.md             |  4 ++--
 packages/shared_preferences/README.md     |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/firebase_admob/README.md b/packages/firebase_admob/README.md
index c8f6cf002f6d..7e458218f3fc 100644
--- a/packages/firebase_admob/README.md
+++ b/packages/firebase_admob/README.md
@@ -28,13 +28,13 @@ and setting up your App ID.
 ## Initializing the plugin
 The AdMob plugin must be initialized with an AdMob App ID.
 
-```
+```dart
 FirebaseAdMob.instance.initialize(appId: appId);
 ```
 *Note Android*:
 Starting in version 17.0.0, if you are an AdMob publisher you are now required to add your AdMob app ID in your **AndroidManifest.xml** file. Once you find your AdMob app ID in the AdMob UI, add it to your manifest adding the following tag:
 
-```
+```xml
 <manifest>
     <application>
         <!-- TODO: Replace with your real AdMob app ID -->
@@ -90,7 +90,7 @@ InterstitialAd myInterstitial = InterstitialAd(
 ```
 
 Ads must be loaded before they're shown.
-```
+```dart
 myBanner
   // typically this happens well before the ad is shown
   ..load()
@@ -102,7 +102,7 @@ myBanner
   );
 ```
 
-```
+```dart
 myInterstitial
   ..load()
   ..show(
@@ -124,7 +124,7 @@ listener can be used to detect when the ad has actually finished loading
 Unlike banners and interstitials, rewarded video ads are loaded one at a time
 via a singleton object, `RewardedVideoAd.instance`. Its `load` method takes an
 AdMob ad unit ID and an instance of `MobileAdTargetingInfo`:
-```
+```dart
 RewardedVideoAd.instance.load(myAdMobAdUnitId, targetingInfo);
 ```
 
@@ -135,13 +135,13 @@ function will be invoked whenever one of the events in the `RewardedVideAdEvent`
 enum occurs. After a rewarded video ad loads, for example, the
 `RewardedVideoAdEvent.loaded` is sent. Any time after that, apps can show the ad
 by calling `show`:
-```
+```dart
 RewardedVideoAd.instance.show();
 ```
 
 When the AdMob SDK decides it's time to grant an in-app reward, it does so via
 the `RewardedVideoAdEvent.rewarded` event:
-```
+```dart
 RewardedVideoAd.instance.listener =
     (RewardedVideoAdEvent event, [String rewardType, int rewardAmount]) {
   if (event == RewardedVideoAdEvent.rewarded) {
diff --git a/packages/firebase_ml_vision/README.md b/packages/firebase_ml_vision/README.md
index a06d017e24a6..fb4de076d547 100644
--- a/packages/firebase_ml_vision/README.md
+++ b/packages/firebase_ml_vision/README.md
@@ -15,7 +15,7 @@ To use this plugin, add `firebase_ml_vision` as a [dependency in your pubspec.ya
 ### Android
 Optional but recommended: If you use the on-device API, configure your app to automatically download the ML model to the device after your app is installed from the Play Store. To do so, add the following declaration to your app's AndroidManifest.xml file:
 
-```manifest
+```xml
 <application ...>
   ...
   <meta-data
diff --git a/packages/firebase_remote_config/README.md b/packages/firebase_remote_config/README.md
index 764f3ee24f26..f57d7cefb335 100644
--- a/packages/firebase_remote_config/README.md
+++ b/packages/firebase_remote_config/README.md
@@ -18,7 +18,7 @@ To use the firebase_remote_config plugin, follow the [plugin installation instru
 Enable the Google services by configuring the Gradle scripts as such.
 
 1. Add the classpath to the `[project]/android/build.gradle` file.
-```
+```gradle
 dependencies {
   // Example existing classpath
   classpath 'com.android.tools.build:gradle:3.2.1'
@@ -28,7 +28,7 @@ dependencies {
 ```
 
 2. Add the apply plugin to the `[project]/android/app/build.gradle` file.
-```
+```gradle
 // ADD THIS AT THE BOTTOM
 apply plugin: 'com.google.gms.google-services'
 ```
@@ -46,17 +46,17 @@ Otherwise you will not be able to use Firebase Remote Config.
 ### Use the plugin
 
 Add the following imports to your Dart code:
-```
+```dart
 import 'package:firebase_remote_config/firebase_remote_config.dart';
 ```
 
 Initialize `RemoteConfig`:
-```
+```dart
 final RemoteConfig remoteConfig = await RemoteConfig.instance;
 ```
 
 You can now use the Firebase `remoteConfig` to fetch remote configurations in your Dart code, e.g.
-```
+```dart
 final defaults = <String, dynamic>{'welcome': 'default welcome'};
 await remoteConfig.setDefaults(defaults);
 
diff --git a/packages/google_sign_in/README.md b/packages/google_sign_in/README.md
index 8abeae5b1729..50e20e729872 100755
--- a/packages/google_sign_in/README.md
+++ b/packages/google_sign_in/README.md
@@ -26,7 +26,7 @@ enable the [Google People API](https://developers.google.com/people/).
 4. A dialog will show up and ask you to select the targets, select the `Runner` target.
 5. Then add the `CFBundleURLTypes` attributes below into the `[my_project]/ios/Runner/Info.plist` file.
 
-```
+```xml
 <!-- Put me in the [my_project]/ios/Runner/Info.plist file -->
 <!-- Google Sign-in Section -->
 <key>CFBundleURLTypes</key>
@@ -53,7 +53,7 @@ To use this plugin, follow the [plugin installation instructions](https://pub.da
 ### Use the plugin
 Add the following import to your Dart code:
 
-```
+```dart
 import 'package:google_sign_in/google_sign_in.dart';
 ```
 
@@ -71,7 +71,7 @@ GoogleSignIn _googleSignIn = GoogleSignIn(
 
 You can now use the `GoogleSignIn` class to authenticate in your Dart code, e.g.
 
-```
+```dart
 Future<void> _handleSignIn() async {
   try {
     await _googleSignIn.signIn();
diff --git a/packages/local_auth/README.md b/packages/local_auth/README.md
index 71001e1ab5b3..89eeb9d2bc72 100644
--- a/packages/local_auth/README.md
+++ b/packages/local_auth/README.md
@@ -116,7 +116,7 @@ try {
 Note that this plugin works with both TouchID and FaceID. However, to use the latter,
 you need to also add:
 
-```
+```xml
 <key>NSFaceIDUsageDescription</key>
 <string>Why is my app authenticating using face id?</string>
 ```
@@ -130,7 +130,7 @@ app has not been updated to use TouchID.
 Update your project's `AndroidManifest.xml` file to include the
 `USE_FINGERPRINT` permissions:
 
-```
+```xml
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.app">
   <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
diff --git a/packages/shared_preferences/README.md b/packages/shared_preferences/README.md
index 5153945bcd09..136c6de3dd99 100644
--- a/packages/shared_preferences/README.md
+++ b/packages/shared_preferences/README.md
@@ -41,7 +41,7 @@ _incrementCounter() async {
 
 You can populate `SharedPreferences` with initial values in your tests by running this code:
 
-```
+```dart
 const MethodChannel('plugins.flutter.io/shared_preferences')
   .setMockMethodCallHandler((MethodCall methodCall) async {
     if (methodCall.method == 'getAll') {

From e84d61fc6607a05c361f74aea9777e3e532a1d67 Mon Sep 17 00:00:00 2001
From: David Guralnick <dguralnick@google.com>
Date: Wed, 21 Nov 2018 16:04:46 -0800
Subject: [PATCH 002/410] Use context() instead of activity() (#921)

Using activity() causes a crash if the plugin is registered before the activity.

Fixes https://github.com/flutter/flutter/issues/24633
---
 .../java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java b/packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java
index 44d197c12d7d..a22009f09ba7 100644
--- a/packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java
+++ b/packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java
@@ -30,7 +30,7 @@ public class DeviceInfoPlugin implements MethodCallHandler {
   public static void registerWith(Registrar registrar) {
     final MethodChannel channel =
         new MethodChannel(registrar.messenger(), "plugins.flutter.io/device_info");
-    channel.setMethodCallHandler(new DeviceInfoPlugin(registrar.activity()));
+    channel.setMethodCallHandler(new DeviceInfoPlugin(registrar.context()));
   }
 
   /** Do not allow direct instantiation. */

From e96fb0c350328ff77baae758b6dc70797117ac98 Mon Sep 17 00:00:00 2001
From: Simon Lightfoot <simon@devangels.london>
Date: Thu, 22 Nov 2018 00:05:16 +0000
Subject: [PATCH 003/410] Improved error handling for Android and iOS. (#775)

Updated FireAuth docs.
Updated deprecated API "fetchProvidersForEmail" to "fetchSignInMethodsForEmail".
Added "unlinkCredential".
Updated changelog and brought wrapper inline with (#915).
---
 packages/firebase_auth/CHANGELOG.md           |  10 +
 packages/firebase_auth/android/build.gradle   |   2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../firebaseauth/FirebaseAuthPlugin.java      | 304 +++++-----
 .../ios/Classes/FirebaseAuthPlugin.m          | 127 ++--
 packages/firebase_auth/lib/firebase_auth.dart | 554 ++++++++++++++++--
 .../test/firebase_auth_test.dart              | 178 +++++-
 7 files changed, 917 insertions(+), 263 deletions(-)
 create mode 100644 packages/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index 104de5398129..d0aa9da89192 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.6.7
+
+* `FirebaseAuth` and `FirebaseUser` are now fully documented.
+* `PlatformExceptions` now report error codes as stated in docs.
+* Credentials can now be unlinked from Accounts with new methods on `FirebaseUser`.
+
+## 0.6.6
+
+* Users can now reauthenticate in response to operations that require a recent sign-in.
+
 ## 0.6.5
 
 * Fixing async method `verifyPhoneNumber`, that would never return even in a successful call.
diff --git a/packages/firebase_auth/android/build.gradle b/packages/firebase_auth/android/build.gradle
index 21495d43a35b..7f96901337ba 100755
--- a/packages/firebase_auth/android/build.gradle
+++ b/packages/firebase_auth/android/build.gradle
@@ -32,6 +32,6 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-auth:16.0.4'
+        api 'com.google.firebase:firebase-auth:16.0.5'
     }
 }
diff --git a/packages/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..019065d1d650
--- /dev/null
+++ b/packages/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
diff --git a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
index a3a68ded7497..4bf1ce277a29 100755
--- a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
+++ b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
@@ -6,14 +6,34 @@
 
 import android.net.Uri;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.SparseArray;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApiNotAvailableException;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseException;
+import com.google.firebase.FirebaseNetworkException;
 import com.google.firebase.FirebaseTooManyRequestsException;
-import com.google.firebase.auth.*;
+import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.AuthResult;
+import com.google.firebase.auth.EmailAuthProvider;
+import com.google.firebase.auth.FacebookAuthProvider;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseAuth.AuthStateListener;
+import com.google.firebase.auth.FirebaseAuthException;
+import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.GetTokenResult;
+import com.google.firebase.auth.GithubAuthProvider;
+import com.google.firebase.auth.GoogleAuthProvider;
+import com.google.firebase.auth.PhoneAuthCredential;
+import com.google.firebase.auth.PhoneAuthProvider;
+import com.google.firebase.auth.PhoneAuthProvider.ForceResendingToken;
+import com.google.firebase.auth.SignInMethodQueryResult;
+import com.google.firebase.auth.TwitterAuthProvider;
+import com.google.firebase.auth.UserInfo;
+import com.google.firebase.auth.UserProfileChangeRequest;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -23,23 +43,20 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /** Flutter plugin for Firebase Auth. */
 public class FirebaseAuthPlugin implements MethodCallHandler {
   private final PluginRegistry.Registrar registrar;
-  private final SparseArray<FirebaseAuth.AuthStateListener> authStateListeners =
-      new SparseArray<>();
-  private final SparseArray<PhoneAuthProvider.ForceResendingToken> forceResendingTokens =
-      new SparseArray<>();
+  private final SparseArray<AuthStateListener> authStateListeners = new SparseArray<>();
+  private final SparseArray<ForceResendingToken> forceResendingTokens = new SparseArray<>();
   private final MethodChannel channel;
 
   // Handles are ints used as indexes into the sparse array of active observers
   private int nextHandle = 0;
 
-  private static final String ERROR_REASON_EXCEPTION = "exception";
-
   public static void registerWith(PluginRegistry.Registrar registrar) {
     MethodChannel channel =
         new MethodChannel(registrar.messenger(), "plugins.flutter.io/firebase_auth");
@@ -53,7 +70,7 @@ private FirebaseAuthPlugin(PluginRegistry.Registrar registrar, MethodChannel cha
   }
 
   private FirebaseAuth getAuth(MethodCall call) {
-    Map<String, Object> arguments = (Map<String, Object>) call.arguments;
+    Map<String, Object> arguments = call.arguments();
     String appName = (String) arguments.get("app");
     FirebaseApp app = FirebaseApp.getInstance(appName);
     return FirebaseAuth.getInstance(app);
@@ -71,8 +88,8 @@ public void onMethodCall(MethodCall call, Result result) {
       case "createUserWithEmailAndPassword":
         handleCreateUserWithEmailAndPassword(call, result, getAuth(call));
         break;
-      case "fetchProvidersForEmail":
-        handleFetchProvidersForEmail(call, result, getAuth(call));
+      case "fetchSignInMethodsForEmail":
+        handleFetchSignInMethodsForEmail(call, result, getAuth(call));
         break;
       case "sendPasswordResetEmail":
         handleSendPasswordResetEmail(call, result, getAuth(call));
@@ -140,6 +157,9 @@ public void onMethodCall(MethodCall call, Result result) {
       case "linkWithGithubCredential":
         handleLinkWithGithubCredential(call, result, getAuth(call));
         break;
+      case "unlinkCredential":
+        handleUnlinkCredential(call, result, getAuth(call));
+        break;
       case "updateEmail":
         handleUpdateEmail(call, result, getAuth(call));
         break;
@@ -172,8 +192,7 @@ public void onMethodCall(MethodCall call, Result result) {
 
   private void handleSignInWithPhoneNumber(
       MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+    Map<String, String> arguments = call.arguments();
     String verificationId = arguments.get("verificationId");
     String smsCode = arguments.get("smsCode");
 
@@ -186,10 +205,10 @@ private void handleSignInWithPhoneNumber(
 
   private void handleVerifyPhoneNumber(
       MethodCall call, Result result, final FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    final int handle = call.argument("handle");
-    String phoneNumber = call.argument("phoneNumber");
-    int timeout = call.argument("timeout");
+    Map<String, Object> arguments = call.arguments();
+    final int handle = (int) arguments.get("handle");
+    String phoneNumber = (String) arguments.get("phoneNumber");
+    int timeout = (int) arguments.get("timeout");
 
     PhoneAuthProvider.OnVerificationStateChangedCallbacks verificationCallbacks =
         new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
@@ -238,7 +257,7 @@ public void onCodeAutoRetrievalTimeOut(String verificationId) {
         };
 
     if (call.argument("forceResendingToken") != null) {
-      int forceResendingTokenKey = call.argument("forceResendingToken");
+      int forceResendingTokenKey = (int) arguments.get("forceResendingToken");
       PhoneAuthProvider.ForceResendingToken forceResendingToken =
           forceResendingTokens.get(forceResendingTokenKey);
       PhoneAuthProvider.getInstance()
@@ -263,9 +282,7 @@ public void onCodeAutoRetrievalTimeOut(String verificationId) {
   }
 
   private Map<String, Object> getVerifyPhoneNumberExceptionMap(FirebaseException e) {
-    Map<String, Object> exceptionMap = new HashMap<>();
     String errorCode = "verifyPhoneNumberError";
-
     if (e instanceof FirebaseAuthInvalidCredentialsException) {
       errorCode = "invalidCredential";
     } else if (e instanceof FirebaseAuthException) {
@@ -275,6 +292,8 @@ private Map<String, Object> getVerifyPhoneNumberExceptionMap(FirebaseException e
     } else if (e instanceof FirebaseApiNotAvailableException) {
       errorCode = "apiNotAvailable";
     }
+
+    Map<String, Object> exceptionMap = new HashMap<>();
     exceptionMap.put("code", errorCode);
     exceptionMap.put("message", e.getMessage());
     return exceptionMap;
@@ -282,8 +301,7 @@ private Map<String, Object> getVerifyPhoneNumberExceptionMap(FirebaseException e
 
   private void handleLinkWithEmailAndPassword(
       MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+    Map<String, String> arguments = call.arguments();
     String email = arguments.get("email");
     String password = arguments.get("password");
 
@@ -294,7 +312,8 @@ private void handleLinkWithEmailAndPassword(
         .addOnCompleteListener(new SignInCompleteListener(result));
   }
 
-  private void handleCurrentUser(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
+  private void handleCurrentUser(
+      @SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
     FirebaseUser user = firebaseAuth.getCurrentUser();
     if (user == null) {
       result.success(null);
@@ -305,14 +324,13 @@ private void handleCurrentUser(MethodCall call, final Result result, FirebaseAut
   }
 
   private void handleSignInAnonymously(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
+      @SuppressWarnings("unused") MethodCall call, Result result, FirebaseAuth firebaseAuth) {
     firebaseAuth.signInAnonymously().addOnCompleteListener(new SignInCompleteListener(result));
   }
 
   private void handleCreateUserWithEmailAndPassword(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
     String email = arguments.get("email");
     String password = arguments.get("password");
 
@@ -321,21 +339,19 @@ private void handleCreateUserWithEmailAndPassword(
         .addOnCompleteListener(new SignInCompleteListener(result));
   }
 
-  private void handleFetchProvidersForEmail(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+  private void handleFetchSignInMethodsForEmail(
+      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
     String email = arguments.get("email");
 
     firebaseAuth
-        .fetchProvidersForEmail(email)
-        .addOnCompleteListener(new ProvidersCompleteListener(result));
+        .fetchSignInMethodsForEmail(email)
+        .addOnCompleteListener(new GetSignInMethodsCompleteListener(result));
   }
 
   private void handleSendPasswordResetEmail(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
     String email = arguments.get("email");
 
     firebaseAuth
@@ -344,24 +360,30 @@ private void handleSendPasswordResetEmail(
   }
 
   private void handleSendEmailVerification(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
+      @SuppressWarnings("unused") MethodCall call, Result result, FirebaseAuth firebaseAuth) {
     firebaseAuth
         .getCurrentUser()
         .sendEmailVerification()
         .addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
-  private void handleReload(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
+  private void handleReload(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
     firebaseAuth
         .getCurrentUser()
         .reload()
         .addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
+  private void handleDelete(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    firebaseAuth
+        .getCurrentUser()
+        .delete()
+        .addOnCompleteListener(new TaskVoidCompleteListener(result));
+  }
+
   private void handleSignInWithEmailAndPassword(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
     String email = arguments.get("email");
     String password = arguments.get("password");
 
@@ -370,19 +392,11 @@ private void handleSignInWithEmailAndPassword(
         .addOnCompleteListener(new SignInCompleteListener(result));
   }
 
-  private void handleDelete(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    firebaseAuth
-        .getCurrentUser()
-        .delete()
-        .addOnCompleteListener(new TaskVoidCompleteListener(result));
-  }
-
-  private void handleSignInWithGoogle(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+  private void handleSignInWithGoogle(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
     String idToken = arguments.get("idToken");
     String accessToken = arguments.get("accessToken");
+
     AuthCredential credential = GoogleAuthProvider.getCredential(idToken, accessToken);
     firebaseAuth
         .signInWithCredential(credential)
@@ -391,8 +405,7 @@ private void handleSignInWithGoogle(
 
   private void handleReauthenticateWithEmailAndPassword(
       MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+    Map<String, String> arguments = call.arguments();
     String email = arguments.get("email");
     String password = arguments.get("password");
 
@@ -405,10 +418,10 @@ private void handleReauthenticateWithEmailAndPassword(
 
   private void handleReauthenticateWithGoogleCredential(
       MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+    Map<String, String> arguments = call.arguments();
     String idToken = arguments.get("idToken");
     String accessToken = arguments.get("accessToken");
+
     AuthCredential credential = GoogleAuthProvider.getCredential(idToken, accessToken);
     firebaseAuth
         .getCurrentUser()
@@ -418,9 +431,9 @@ private void handleReauthenticateWithGoogleCredential(
 
   private void handleReauthenticateWithFacebookCredential(
       MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+    Map<String, String> arguments = call.arguments();
     String accessToken = arguments.get("accessToken");
+
     AuthCredential credential = FacebookAuthProvider.getCredential(accessToken);
     firebaseAuth
         .getCurrentUser()
@@ -430,10 +443,10 @@ private void handleReauthenticateWithFacebookCredential(
 
   private void handleReauthenticateWithTwitterCredential(
       MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+    Map<String, String> arguments = call.arguments();
     String authToken = arguments.get("authToken");
     String authTokenSecret = arguments.get("authTokenSecret");
+
     AuthCredential credential = TwitterAuthProvider.getCredential(authToken, authTokenSecret);
     firebaseAuth
         .getCurrentUser()
@@ -444,6 +457,7 @@ private void handleReauthenticateWithTwitterCredential(
   private void handleReauthenticateWithGithubCredential(
       MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
     String token = call.argument("token");
+
     AuthCredential credential = GithubAuthProvider.getCredential(token);
     firebaseAuth
         .getCurrentUser()
@@ -452,11 +466,11 @@ private void handleReauthenticateWithGithubCredential(
   }
 
   private void handleLinkWithGoogleCredential(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
     String idToken = arguments.get("idToken");
     String accessToken = arguments.get("accessToken");
+
     AuthCredential credential = GoogleAuthProvider.getCredential(idToken, accessToken);
     firebaseAuth
         .getCurrentUser()
@@ -465,10 +479,10 @@ private void handleLinkWithGoogleCredential(
   }
 
   private void handleLinkWithFacebookCredential(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
     String accessToken = arguments.get("accessToken");
+
     AuthCredential credential = FacebookAuthProvider.getCredential(accessToken);
     firebaseAuth
         .getCurrentUser()
@@ -476,63 +490,73 @@ private void handleLinkWithFacebookCredential(
         .addOnCompleteListener(new SignInCompleteListener(result));
   }
 
-  private void handleLinkWithTwitterCredential(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
-    String authToken = arguments.get("authToken");
-    String authTokenSecret = arguments.get("authTokenSecret");
-    AuthCredential credential = TwitterAuthProvider.getCredential(authToken, authTokenSecret);
-    firebaseAuth
-        .getCurrentUser()
-        .linkWithCredential(credential)
-        .addOnCompleteListener(new SignInCompleteListener(result));
-  }
+  private void handleSignInWithFacebook(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
+    String accessToken = arguments.get("accessToken");
 
-  private void handleLinkWithGithubCredential(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    String token = call.argument("token");
-    AuthCredential credential = GithubAuthProvider.getCredential(token);
+    AuthCredential credential = FacebookAuthProvider.getCredential(accessToken);
     firebaseAuth
-        .getCurrentUser()
-        .linkWithCredential(credential)
+        .signInWithCredential(credential)
         .addOnCompleteListener(new SignInCompleteListener(result));
   }
 
-  private void handleSignInWithFacebook(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
-    String accessToken = arguments.get("accessToken");
-    AuthCredential credential = FacebookAuthProvider.getCredential(accessToken);
+  private void handleSignInWithTwitter(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    String authToken = call.argument("authToken");
+    String authTokenSecret = call.argument("authTokenSecret");
+
+    AuthCredential credential = TwitterAuthProvider.getCredential(authToken, authTokenSecret);
     firebaseAuth
         .signInWithCredential(credential)
         .addOnCompleteListener(new SignInCompleteListener(result));
   }
 
-  private void handleSignInWithTwitter(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
+  private void handleLinkWithTwitterCredential(
+      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
     String authToken = call.argument("authToken");
     String authTokenSecret = call.argument("authTokenSecret");
+
     AuthCredential credential = TwitterAuthProvider.getCredential(authToken, authTokenSecret);
     firebaseAuth
-        .signInWithCredential(credential)
+        .getCurrentUser()
+        .linkWithCredential(credential)
         .addOnCompleteListener(new SignInCompleteListener(result));
   }
 
-  private void handleSignInWithGithub(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
+  private void handleSignInWithGithub(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
     String token = call.argument("token");
+
     AuthCredential credential = GithubAuthProvider.getCredential(token);
     firebaseAuth
         .signInWithCredential(credential)
         .addOnCompleteListener(new SignInCompleteListener(result));
   }
 
+  private void handleLinkWithGithubCredential(
+      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    String token = call.argument("token");
+
+    AuthCredential credential = GithubAuthProvider.getCredential(token);
+    firebaseAuth
+        .getCurrentUser()
+        .linkWithCredential(credential)
+        .addOnCompleteListener(new SignInCompleteListener(result));
+  }
+
+  private void handleUnlinkCredential(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
+    final String provider = arguments.get("provider");
+
+    firebaseAuth
+        .getCurrentUser()
+        .unlink(provider)
+        .addOnCompleteListener(new SignInCompleteListener(result));
+  }
+
   private void handleSignInWithCustomToken(
       MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
     Map<String, String> arguments = call.arguments();
     String token = arguments.get("token");
+
     firebaseAuth
         .signInWithCustomToken(token)
         .addOnCompleteListener(new SignInCompleteListener(result));
@@ -544,9 +568,9 @@ private void handleSignOut(MethodCall call, final Result result, FirebaseAuth fi
   }
 
   private void handleGetToken(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, Boolean> arguments = (Map<String, Boolean>) call.arguments;
+    Map<String, Boolean> arguments = call.arguments();
     boolean refresh = arguments.get("refresh");
+
     firebaseAuth
         .getCurrentUser()
         .getIdToken(refresh)
@@ -557,35 +581,34 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
                   String idToken = task.getResult().getToken();
                   result.success(idToken);
                 } else {
-                  result.error(ERROR_REASON_EXCEPTION, task.getException().getMessage(), null);
+                  reportException(result, task.getException());
                 }
               }
             });
   }
 
-  private void handleUpdateEmail(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+  private void handleUpdateEmail(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
+    final String email = arguments.get("email");
+
     firebaseAuth
         .getCurrentUser()
-        .updateEmail(arguments.get("email"))
+        .updateEmail(email)
         .addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
-  private void handleUpdatePassword(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+  private void handleUpdatePassword(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
+    final String password = arguments.get("password");
+
     firebaseAuth
         .getCurrentUser()
-        .updatePassword(arguments.get("password"))
+        .updatePassword(password)
         .addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
-  private void handleUpdateProfile(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+  private void handleUpdateProfile(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
 
     UserProfileChangeRequest.Builder builder = new UserProfileChangeRequest.Builder();
     if (arguments.containsKey("displayName")) {
@@ -602,7 +625,7 @@ private void handleUpdateProfile(
   }
 
   private void handleStartListeningAuthState(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
+      @SuppressWarnings("unused") MethodCall call, Result result, FirebaseAuth firebaseAuth) {
     final int handle = nextHandle++;
     FirebaseAuth.AuthStateListener listener =
         new FirebaseAuth.AuthStateListener() {
@@ -612,7 +635,6 @@ public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
             Map<String, Object> userMap = mapFromUser(user);
             Map<String, Object> map = new HashMap<>();
             map.put("id", handle);
-
             if (userMap != null) {
               map.put("user", userMap);
             }
@@ -625,7 +647,7 @@ public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
   }
 
   private void handleStopListeningAuthState(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
+      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
     Map<String, Integer> arguments = call.arguments();
     Integer id = arguments.get("id");
 
@@ -635,17 +657,16 @@ private void handleStopListeningAuthState(
       authStateListeners.remove(id);
       result.success(null);
     } else {
-      result.error(
-          ERROR_REASON_EXCEPTION,
-          String.format("Listener with identifier '%d' not found.", id),
-          null);
+      reportException(
+          result,
+          new FirebaseAuthException(
+              "ERROR_LISTENER_NOT_FOUND",
+              String.format(Locale.US, "Listener with identifier '%d' not found.", id)));
     }
   }
 
-  private void handleSetLanguageCode(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    @SuppressWarnings("unchecked")
-    Map<String, String> arguments = (Map<String, String>) call.arguments;
+  private void handleSetLanguageCode(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
     String language = arguments.get("language");
 
     firebaseAuth.setLanguageCode(language);
@@ -661,9 +682,8 @@ private class SignInCompleteListener implements OnCompleteListener<AuthResult> {
 
     @Override
     public void onComplete(@NonNull Task<AuthResult> task) {
-      if (!task.isSuccessful()) {
-        Exception e = task.getException();
-        result.error(ERROR_REASON_EXCEPTION, e.getMessage(), null);
+      if (!task.isSuccessful() || task.getResult() == null) {
+        reportException(result, task.getException());
       } else {
         FirebaseUser user = task.getResult().getUser();
         Map<String, Object> userMap = Collections.unmodifiableMap(mapFromUser(user));
@@ -682,28 +702,27 @@ private class TaskVoidCompleteListener implements OnCompleteListener<Void> {
     @Override
     public void onComplete(@NonNull Task<Void> task) {
       if (!task.isSuccessful()) {
-        Exception e = task.getException();
-        result.error(ERROR_REASON_EXCEPTION, e.getMessage(), null);
+        reportException(result, task.getException());
       } else {
         result.success(null);
       }
     }
   }
 
-  private class ProvidersCompleteListener implements OnCompleteListener<ProviderQueryResult> {
+  private class GetSignInMethodsCompleteListener
+      implements OnCompleteListener<SignInMethodQueryResult> {
     private final Result result;
 
-    ProvidersCompleteListener(Result result) {
+    GetSignInMethodsCompleteListener(Result result) {
       this.result = result;
     }
 
     @Override
-    public void onComplete(@NonNull Task<ProviderQueryResult> task) {
-      if (!task.isSuccessful()) {
-        Exception e = task.getException();
-        result.error(ERROR_REASON_EXCEPTION, e.getMessage(), null);
+    public void onComplete(@NonNull Task<SignInMethodQueryResult> task) {
+      if (!task.isSuccessful() || task.getResult() == null) {
+        reportException(result, task.getException());
       } else {
-        List<String> providers = task.getResult().getProviders();
+        List<String> providers = task.getResult().getSignInMethods();
         result.success(providers);
       }
     }
@@ -749,4 +768,23 @@ private Map<String, Object> mapFromUser(FirebaseUser user) {
       return null;
     }
   }
+
+  private void reportException(Result result, @Nullable Exception exception) {
+    if (exception != null) {
+      if (exception instanceof FirebaseAuthException) {
+        final FirebaseAuthException authException = (FirebaseAuthException) exception;
+        result.error(authException.getErrorCode(), exception.getMessage(), null);
+      } else if (exception instanceof FirebaseApiNotAvailableException) {
+        result.error("ERROR_API_NOT_AVAILABLE", exception.getMessage(), null);
+      } else if (exception instanceof FirebaseTooManyRequestsException) {
+        result.error("ERROR_TOO_MANY_REQUESTS", exception.getMessage(), null);
+      } else if (exception instanceof FirebaseNetworkException) {
+        result.error("ERROR_NETWORK_REQUEST_FAILED", exception.getMessage(), null);
+      } else {
+        result.error(exception.getClass().getSimpleName(), exception.getMessage(), null);
+      }
+    } else {
+      result.error("ERROR_UNKNOWN", "An unknown error occurred.", null);
+    }
+  }
 }
diff --git a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
index ebac80fea00e..5bbeaf30a77d 100644
--- a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
+++ b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
@@ -6,15 +6,17 @@
 
 #import "Firebase/Firebase.h"
 
-@interface NSError (FlutterError)
-@property(readonly, nonatomic) FlutterError *flutterError;
+@interface NSError (FIRAuthErrorCode)
+@property(readonly, nonatomic) NSString *firAuthErrorCode;
 @end
 
-@implementation NSError (FlutterError)
-- (FlutterError *)flutterError {
-  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)self.code]
-                             message:self.domain
-                             details:self.localizedDescription];
+@implementation NSError (FIRAuthErrorCode)
+- (NSString *)firAuthErrorCode {
+  NSString *code = [self userInfo][FIRAuthErrorNameKey];
+  if (code != nil) {
+    return code;
+  }
+  return [NSString stringWithFormat:@"ERROR_%d", (int)self.code];
 }
 @end
 
@@ -73,8 +75,8 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
         }];
   } else if ([@"signInAnonymously" isEqualToString:call.method]) {
     [[self getAuth:call.arguments]
-        signInAnonymouslyWithCompletion:^(FIRAuthDataResult *dataResult, NSError *error) {
-          [self sendResult:result forUser:dataResult.user error:error];
+        signInAnonymouslyWithCompletion:^(FIRAuthDataResult *authResult, NSError *error) {
+          [self sendResult:result forUser:authResult.user error:error];
         }];
   } else if ([@"signInWithGoogle" isEqualToString:call.method]) {
     NSString *idToken = call.arguments[@"idToken"];
@@ -114,35 +116,35 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [[self getAuth:call.arguments]
         createUserWithEmail:email
                    password:password
-                 completion:^(FIRAuthDataResult *dataResult, NSError *error) {
-                   [self sendResult:result forUser:dataResult.user error:error];
+                 completion:^(FIRAuthDataResult *authResult, NSError *error) {
+                   [self sendResult:result forUser:authResult.user error:error];
                  }];
-  } else if ([@"fetchProvidersForEmail" isEqualToString:call.method]) {
+  } else if ([@"fetchSignInMethodsForEmail" isEqualToString:call.method]) {
     NSString *email = call.arguments[@"email"];
     [[self getAuth:call.arguments]
         fetchProvidersForEmail:email
                     completion:^(NSArray<NSString *> *providers, NSError *error) {
-                      [self sendResult:result forProviders:providers error:error];
+                      [self sendResult:result forObject:providers error:error];
                     }];
   } else if ([@"sendEmailVerification" isEqualToString:call.method]) {
     [[self getAuth:call.arguments].currentUser
         sendEmailVerificationWithCompletion:^(NSError *_Nullable error) {
-          [self sendResult:result forProviders:nil error:error];
+          [self sendResult:result forObject:nil error:error];
         }];
   } else if ([@"reload" isEqualToString:call.method]) {
     [[self getAuth:call.arguments].currentUser reloadWithCompletion:^(NSError *_Nullable error) {
-      [self sendResult:result forProviders:nil error:error];
+      [self sendResult:result forObject:nil error:error];
     }];
   } else if ([@"delete" isEqualToString:call.method]) {
     [[self getAuth:call.arguments].currentUser deleteWithCompletion:^(NSError *_Nullable error) {
-      [self sendResult:result forProviders:nil error:error];
+      [self sendResult:result forObject:nil error:error];
     }];
   } else if ([@"sendPasswordResetEmail" isEqualToString:call.method]) {
     NSString *email = call.arguments[@"email"];
     [[self getAuth:call.arguments] sendPasswordResetWithEmail:email
                                                    completion:^(NSError *error) {
                                                      [self sendResult:result
-                                                              forUser:nil
+                                                            forObject:nil
                                                                 error:error];
                                                    }];
   } else if ([@"signInWithEmailAndPassword" isEqualToString:call.method]) {
@@ -151,23 +153,23 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [[self getAuth:call.arguments]
         signInWithEmail:email
                password:password
-             completion:^(FIRAuthDataResult *dataResult, NSError *error) {
-               [self sendResult:result forUser:dataResult.user error:error];
+             completion:^(FIRAuthDataResult *authResult, NSError *error) {
+               [self sendResult:result forUser:authResult.user error:error];
              }];
   } else if ([@"signOut" isEqualToString:call.method]) {
     NSError *signOutError;
     BOOL status = [[self getAuth:call.arguments] signOut:&signOutError];
     if (!status) {
       NSLog(@"Error signing out: %@", signOutError);
-      [self sendResult:result forUser:nil error:signOutError];
+      [self sendResult:result forObject:nil error:signOutError];
     } else {
-      [self sendResult:result forUser:nil error:nil];
+      [self sendResult:result forObject:nil error:nil];
     }
   } else if ([@"getIdToken" isEqualToString:call.method]) {
     [[self getAuth:call.arguments].currentUser
         getIDTokenForcingRefresh:YES
                       completion:^(NSString *_Nullable token, NSError *_Nullable error) {
-                        result(error != nil ? error.flutterError : token);
+                        [self sendResult:result forObject:token error:error];
                       }];
   } else if ([@"reauthenticateWithEmailAndPassword" isEqualToString:call.method]) {
     NSString *email = call.arguments[@"email"];
@@ -177,7 +179,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [[self getAuth:call.arguments].currentUser
         reauthenticateWithCredential:credential
                           completion:^(NSError *_Nullable error) {
-                            [self sendResult:result forUser:nil error:error];
+                            [self sendResult:result forObject:nil error:error];
                           }];
   } else if ([@"reauthenticateWithGoogleCredential" isEqualToString:call.method]) {
     NSString *idToken = call.arguments[@"idToken"];
@@ -187,7 +189,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [[self getAuth:call.arguments].currentUser
         reauthenticateWithCredential:credential
                           completion:^(NSError *_Nullable error) {
-                            [self sendResult:result forUser:nil error:error];
+                            [self sendResult:result forObject:nil error:error];
                           }];
   } else if ([@"reauthenticateWithFacebookCredential" isEqualToString:call.method]) {
     NSString *accessToken = call.arguments[@"accessToken"];
@@ -195,7 +197,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [[self getAuth:call.arguments].currentUser
         reauthenticateWithCredential:credential
                           completion:^(NSError *_Nullable error) {
-                            [self sendResult:result forUser:nil error:error];
+                            [self sendResult:result forObject:nil error:error];
                           }];
   } else if ([@"reauthenticateWithTwitterCredential" isEqualToString:call.method]) {
     NSString *authToken = call.arguments[@"authToken"];
@@ -205,7 +207,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [[self getAuth:call.arguments].currentUser
         reauthenticateWithCredential:credential
                           completion:^(NSError *_Nullable error) {
-                            [self sendResult:result forUser:nil error:error];
+                            [self sendResult:result forObject:nil error:error];
                           }];
   } else if ([@"reauthenticateWithGithubCredential" isEqualToString:call.method]) {
     NSString *token = call.arguments[@"token"];
@@ -213,7 +215,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [[self getAuth:call.arguments].currentUser
         reauthenticateWithCredential:credential
                           completion:^(NSError *_Nullable error) {
-                            [self sendResult:result forUser:nil error:error];
+                            [self sendResult:result forObject:nil error:error];
                           }];
   } else if ([@"linkWithEmailAndPassword" isEqualToString:call.method]) {
     NSString *email = call.arguments[@"email"];
@@ -260,24 +262,32 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
   } else if ([@"linkWithGithubCredential" isEqualToString:call.method]) {
     NSString *token = call.arguments[@"token"];
     FIRAuthCredential *credential = [FIRGitHubAuthProvider credentialWithToken:token];
-    [[self getAuth:call.arguments].currentUser linkWithCredential:credential
-                                                       completion:^(FIRUser *user, NSError *error) {
-                                                         [self sendResult:result
-                                                                  forUser:user
-                                                                    error:error];
-                                                       }];
+    [[self getAuth:call.arguments].currentUser
+        linkWithCredential:credential
+                completion:^(FIRUser *_Nullable user, NSError *_Nullable error) {
+                  [self sendResult:result forUser:user error:error];
+                }];
+  } else if ([@"unlinkCredential" isEqualToString:call.method]) {
+    NSString *provider = call.arguments[@"provider"];
+    [[self getAuth:call.arguments].currentUser
+        unlinkFromProvider:provider
+                completion:^(FIRUser *_Nullable user, NSError *_Nullable error) {
+                  [self sendResult:result forUser:user error:error];
+                }];
   } else if ([@"updateEmail" isEqualToString:call.method]) {
     NSString *email = call.arguments[@"email"];
     [[self getAuth:call.arguments].currentUser updateEmail:email
                                                 completion:^(NSError *error) {
-                                                  [self sendResult:result forUser:nil error:error];
+                                                  [self sendResult:result
+                                                         forObject:nil
+                                                             error:error];
                                                 }];
   } else if ([@"updatePassword" isEqualToString:call.method]) {
     NSString *password = call.arguments[@"password"];
     [[self getAuth:call.arguments].currentUser updatePassword:password
                                                    completion:^(NSError *error) {
                                                      [self sendResult:result
-                                                              forUser:nil
+                                                            forObject:nil
                                                                 error:error];
                                                    }];
   } else if ([@"updateProfile" isEqualToString:call.method]) {
@@ -290,20 +300,14 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
       changeRequest.photoURL = [NSURL URLWithString:call.arguments[@"photoUrl"]];
     }
     [changeRequest commitChangesWithCompletion:^(NSError *error) {
-      [self sendResult:result forUser:nil error:error];
+      [self sendResult:result forObject:nil error:error];
     }];
-  } else if ([@"updateEmail" isEqualToString:call.method]) {
-    NSString *toEmail = call.arguments[@"email"];
-    [[self getAuth:call.arguments].currentUser updateEmail:toEmail
-                                                completion:^(NSError *_Nullable error) {
-                                                  [self sendResult:result forUser:nil error:error];
-                                                }];
   } else if ([@"signInWithCustomToken" isEqualToString:call.method]) {
     NSString *token = call.arguments[@"token"];
     [[self getAuth:call.arguments]
         signInWithCustomToken:token
-                   completion:^(FIRAuthDataResult *dataResult, NSError *error) {
-                     [self sendResult:result forUser:dataResult.user error:error];
+                   completion:^(FIRAuthDataResult *authResult, NSError *error) {
+                     [self sendResult:result forUser:authResult.user error:error];
                    }];
 
   } else if ([@"startListeningAuthState" isEqualToString:call.method]) {
@@ -332,7 +336,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
       result(nil);
     } else {
       result([FlutterError
-          errorWithCode:@"not_found"
+          errorWithCode:@"ERROR_LISTENER_NOT_FOUND"
                 message:[NSString stringWithFormat:@"Listener with identifier '%d' not found.",
                                                    identifier.intValue]
                 details:nil]);
@@ -364,14 +368,15 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     FIRPhoneAuthCredential *credential =
         [[FIRPhoneAuthProvider provider] credentialWithVerificationID:verificationId
                                                      verificationCode:smsCode];
-    [[self getAuth:call.arguments] signInWithCredential:credential
-                                             completion:^(FIRUser *user, NSError *error) {
-                                               [self sendResult:result forUser:user error:error];
-                                             }];
+    [[self getAuth:call.arguments]
+        signInWithCredential:credential
+                  completion:^(FIRUser *_Nullable user, NSError *_Nullable error) {
+                    [self sendResult:result forUser:user error:error];
+                  }];
   } else if ([@"setLanguageCode" isEqualToString:call.method]) {
     NSString *language = call.arguments[@"language"];
     [[self getAuth:call.arguments] setLanguageCode:language];
-    [self sendResult:result forUser:nil error:nil];
+    [self sendResult:result forObject:nil error:nil];
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -397,24 +402,20 @@ - (NSMutableDictionary *)dictionaryFromUser:(FIRUser *)user {
 }
 
 - (void)sendResult:(FlutterResult)result forUser:(FIRUser *)user error:(NSError *)error {
-  if (error != nil) {
-    result(error.flutterError);
-  } else if (user == nil) {
-    result(nil);
-  } else {
-    result([self dictionaryFromUser:user]);
-  }
+  [self sendResult:result
+         forObject:(user != nil ? [self dictionaryFromUser:user] : nil)
+             error:error];
 }
 
-- (void)sendResult:(FlutterResult)result
-      forProviders:(NSArray<NSString *> *)providers
-             error:(NSError *)error {
+- (void)sendResult:(FlutterResult)result forObject:(NSObject *)object error:(NSError *)error {
   if (error != nil) {
-    result(error.flutterError);
-  } else if (providers == nil) {
+    result([FlutterError errorWithCode:error.firAuthErrorCode
+                               message:error.localizedDescription
+                               details:nil]);
+  } else if (object == nil) {
     result(nil);
   } else {
-    result(providers);
+    result(object);
   }
 }
 
diff --git a/packages/firebase_auth/lib/firebase_auth.dart b/packages/firebase_auth/lib/firebase_auth.dart
index 9392695bf837..1c377e581ab6 100755
--- a/packages/firebase_auth/lib/firebase_auth.dart
+++ b/packages/firebase_auth/lib/firebase_auth.dart
@@ -52,6 +52,7 @@ class UserInfo {
 }
 
 /// Represents user profile data that can be updated by [updateProfile]
+///
 /// The purpose of having separate class with a map is to give possibility
 /// to check if value was set to null or not provided
 class UserUpdateInfo {
@@ -59,13 +60,13 @@ class UserUpdateInfo {
   final Map<String, String> _updateData = <String, String>{};
 
   set displayName(String displayName) =>
-      _updateData["displayName"] = displayName;
+      _updateData['displayName'] = displayName;
 
-  String get displayName => _updateData["displayName"];
+  String get displayName => _updateData['displayName'];
 
-  set photoUrl(String photoUri) => _updateData["photoUrl"] = photoUri;
+  set photoUrl(String photoUri) => _updateData['photoUrl'] = photoUri;
 
-  String get photoUrl => _updateData["photoUrl"];
+  String get photoUrl => _updateData['photoUrl'];
 }
 
 /// Represents a user.
@@ -92,6 +93,10 @@ class FirebaseUser extends UserInfo {
 
   /// Obtains the id token for the current user, forcing a [refresh] if desired.
   ///
+  /// Useful when authenticating against your own backend. Use our server
+  /// SDKs or follow the official documentation to securely verify the
+  /// integrity and validity of this token.
+  ///
   /// Completes with an error if the user is signed out.
   Future<String> getIdToken({bool refresh = false}) async {
     return await FirebaseAuth.channel
@@ -101,12 +106,14 @@ class FirebaseUser extends UserInfo {
     });
   }
 
+  /// Initiates email verification for the user.
   Future<void> sendEmailVerification() async {
     await FirebaseAuth.channel.invokeMethod(
         'sendEmailVerification', <String, String>{'app': _app.name});
   }
 
-  /// Manually refreshes the data of the current user (for example, attached providers, display name, and so on).
+  /// Manually refreshes the data of the current user (for example,
+  /// attached providers, display name, and so on).
   Future<void> reload() async {
     await FirebaseAuth.channel
         .invokeMethod('reload', <String, String>{'app': _app.name});
@@ -119,6 +126,21 @@ class FirebaseUser extends UserInfo {
   }
 
   /// Updates the email address of the user.
+  ///
+  /// The original email address recipient will receive an email that allows
+  /// them to revoke the email address change, in order to protect them
+  /// from account hijacking.
+  ///
+  /// **Important**: This is a security sensitive operation that requires
+  /// the user to have recently signed in.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the email address is malformed.
+  ///   • `ERROR_EMAIL_ALREADY_IN_USE` - If the email is already in use by a different account.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
   Future<void> updateEmail(String email) async {
     assert(email != null);
     return await FirebaseAuth.channel.invokeMethod(
@@ -128,6 +150,19 @@ class FirebaseUser extends UserInfo {
   }
 
   /// Updates the password of the user.
+  ///
+  /// Anonymous users who update both their email and password will no
+  /// longer be anonymous. They will be able to log in with these credentials.
+  ///
+  /// **Important**: This is a security sensitive operation that requires
+  /// the user to have recently signed in.
+  ///
+  /// Errors:
+  ///   • `ERROR_WEAK_PASSWORD` - If the password is not strong enough.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
   Future<void> updatePassword(String password) async {
     assert(password != null);
     return await FirebaseAuth.channel.invokeMethod(
@@ -137,6 +172,10 @@ class FirebaseUser extends UserInfo {
   }
 
   /// Updates the user profile information.
+  ///
+  /// Errors:
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
   Future<void> updateProfile(UserUpdateInfo userUpdateInfo) async {
     assert(userUpdateInfo != null);
     final Map<String, String> data = userUpdateInfo._updateData;
@@ -147,6 +186,96 @@ class FirebaseUser extends UserInfo {
     );
   }
 
+  /// Detaches Email & Password from this user.
+  ///
+  /// This detaches the Email & Password from the current user. This will
+  /// prevent the user from signing in to this account with those credentials.
+  ///
+  /// **Important**: This is a security sensitive operation that requires
+  /// the user to have recently signed in.
+  ///
+  /// Errors:
+  ///   • `ERROR_NO_SUCH_PROVIDER` - If the user does not have an Email & Password linked to their account.
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  Future<void> unlinkEmailAndPassword() async {
+    return await FirebaseAuth.channel.invokeMethod(
+      'unlinkCredential',
+      <String, String>{'provider': 'password', 'app': _app.name},
+    );
+  }
+
+  /// Detaches Google from this user.
+  ///
+  /// This detaches the Google Account from the current user. This will
+  /// prevent the user from signing in to this account with those credentials.
+  ///
+  /// **Important**: This is a security sensitive operation that requires
+  /// the user to have recently signed in.
+  ///
+  /// Errors:
+  ///   • `ERROR_NO_SUCH_PROVIDER` - If the user does not have a Google Account linked to their account.
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  Future<void> unlinkGoogleCredential() async {
+    return await FirebaseAuth.channel.invokeMethod(
+      'unlinkCredential',
+      <String, String>{'provider': 'google.com', 'app': _app.name},
+    );
+  }
+
+  /// Detaches Facebook from this user.
+  ///
+  /// This detaches the Facebook Account from the current user. This will
+  /// prevent the user from signing in to this account with those credentials.
+  ///
+  /// **Important**: This is a security sensitive operation that requires
+  /// the user to have recently signed in.
+  ///
+  /// Errors:
+  ///   • `ERROR_NO_SUCH_PROVIDER` - If the user does not have a Facebook Account linked to their account.
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  Future<void> unlinkFacebookCredential() async {
+    return await FirebaseAuth.channel.invokeMethod(
+      'unlinkCredential',
+      <String, String>{'provider': 'facebook.com', 'app': _app.name},
+    );
+  }
+
+  /// Detaches Twitter from this user.
+  ///
+  /// This detaches the Twitter Account from the current user. This will
+  /// prevent the user from signing in to this account with those credentials.
+  ///
+  /// **Important**: This is a security sensitive operation that requires
+  /// the user to have recently signed in.
+  ///
+  /// Errors:
+  ///   • `ERROR_NO_SUCH_PROVIDER` - If the user does not have a Twitter Account linked to their account.
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  Future<void> unlinkTwitterCredential() async {
+    return await FirebaseAuth.channel.invokeMethod(
+      'unlinkCredential',
+      <String, String>{'provider': 'twitter.com', 'app': _app.name},
+    );
+  }
+
+  /// Detaches Github from this user.
+  ///
+  /// This detaches the Github Account from the current user. This will
+  /// prevent the user from signing in to this account with those credentials.
+  ///
+  /// **Important**: This is a security sensitive operation that requires
+  /// the user to have recently signed in.
+  ///
+  /// Errors:
+  ///   • `ERROR_NO_SUCH_PROVIDER` - If the user does not have a Github Account linked to their account.
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  Future<void> unlinkGithubCredential() async {
+    return await FirebaseAuth.channel.invokeMethod(
+      'unlinkCredential',
+      <String, String>{'provider': 'github.com', 'app': _app.name},
+    );
+  }
+
   @override
   String toString() {
     return '$runtimeType($_data)';
@@ -221,9 +350,11 @@ class FirebaseAuth {
   /// returned instead. If there is any other existing user signed in, that
   /// user will be signed out.
   ///
-  /// Will throw a PlatformException if
-  /// FIRAuthErrorCodeOperationNotAllowed - Indicates that anonymous accounts are not enabled. Enable them in the Auth section of the Firebase console.
-  /// See FIRAuthErrors for a list of error codes that are common to all API methods.
+  /// **Important**: You must enable Anonymous accounts in the Auth section
+  /// of the Firebase console before being able to use them.
+  ///
+  /// Errors:
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Anonymous accounts are not enabled.
   Future<FirebaseUser> signInAnonymously() async {
     final Map<dynamic, dynamic> data = await channel
         .invokeMethod('signInAnonymously', <String, String>{"app": app.name});
@@ -231,6 +362,15 @@ class FirebaseAuth {
     return currentUser;
   }
 
+  /// Tries to create a new user account with the given email address and password.
+  ///
+  /// If successful, it also signs the user in into the app and updates
+  /// the [onAuthStateChanged] stream.
+  ///
+  /// Errors:
+  ///   • `ERROR_WEAK_PASSWORD` - If the password is not strong enough.
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the email address is malformed.
+  ///   • `ERROR_EMAIL_ALREADY_IN_USE` - If the email is already in use by a different account.
   Future<FirebaseUser> createUserWithEmailAndPassword({
     @required String email,
     @required String password,
@@ -245,17 +385,33 @@ class FirebaseAuth {
     return currentUser;
   }
 
-  Future<List<String>> fetchProvidersForEmail({
+  /// Returns a list of sign-in methods that can be used to sign in a given
+  /// user (identified by its main email address).
+  ///
+  /// This method is useful when you support multiple authentication mechanisms
+  /// if you want to implement an email-first authentication flow.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [email] address is malformed.
+  ///   • `ERROR_USER_NOT_FOUND` - If there is no user corresponding to the given [email] address.
+  Future<List<String>> fetchSignInMethodsForEmail({
     @required String email,
   }) async {
     assert(email != null);
     final List<dynamic> providers = await channel.invokeMethod(
-      'fetchProvidersForEmail',
+      'fetchSignInMethodsForEmail',
       <String, String>{'email': email, 'app': app.name},
     );
     return providers?.cast<String>();
   }
 
+  /// Triggers the Firebase Authentication backend to send a password-reset
+  /// email to the given email address, which must correspond to an existing
+  /// user of your app.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_EMAIL` - If the [email] address is malformed.
+  ///   • `ERROR_USER_NOT_FOUND` - If there is no user corresponding to the given [email] address.
   Future<void> sendPasswordResetEmail({
     @required String email,
   }) async {
@@ -266,6 +422,21 @@ class FirebaseAuth {
     );
   }
 
+  /// Tries to sign in a user with the given email address and password.
+  ///
+  /// If successful, it also signs the user in into the app and updates
+  /// the [onAuthStateChanged] stream.
+  ///
+  /// **Important**: You must enable Email & Password accounts in the Auth
+  /// section of the Firebase console before being able to use them.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_EMAIL` - If the [email] address is malformed.
+  ///   • `ERROR_WRONG_PASSWORD` - If the [password] is wrong.
+  ///   • `ERROR_USER_NOT_FOUND` - If there is no user corresponding to the given [email] address, or if the user has been deleted.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_TOO_MANY_REQUESTS` - If there was too many attempts to sign in as this user.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
   Future<FirebaseUser> signInWithEmailAndPassword({
     @required String email,
     @required String password,
@@ -280,36 +451,123 @@ class FirebaseAuth {
     return currentUser;
   }
 
+  /// Tries to sign in a user with the given Google [idToken] and [accessToken].
+  ///
+  /// If successful, it also signs the user in into the app and updates
+  /// the [onAuthStateChanged] stream.
+  ///
+  /// If the user doesn't have an account already, one will be created automatically.
+  ///
+  /// **Important**: You must enable Google accounts in the Auth section
+  /// of the Firebase console before being able to use them.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [authToken] or [authTokenSecret] is malformed or has expired.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_ACCOUNT_EXISTS_WITH_DIFFERENT_CREDENTIAL` - If there already exists an account with the email address asserted by Google.
+  ///       Resolve this case by calling [fetchSignInMethodsForEmail] and then asking the user to sign in using one of them.
+  ///       This error will only be thrown if the "One account per email address" setting is enabled in the Firebase console (recommended).
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Google accounts are not enabled.
+  Future<FirebaseUser> signInWithGoogle({
+    @required String idToken,
+    @required String accessToken,
+  }) async {
+    assert(idToken != null);
+    assert(accessToken != null);
+    final Map<dynamic, dynamic> data = await channel.invokeMethod(
+      'signInWithGoogle',
+      <String, String>{
+        'idToken': idToken,
+        'accessToken': accessToken,
+        'app': app.name,
+      },
+    );
+    final FirebaseUser currentUser = FirebaseUser._(data, app);
+    return currentUser;
+  }
+
+  /// Tries to sign in a user with the given Facebook [accessToken].
+  ///
+  /// If successful, it also signs the user in into the app and updates
+  /// the [onAuthStateChanged] stream.
+  ///
+  /// If the user doesn't have an account already, one will be created automatically.
+  ///
+  /// **Important**: You must enable Facebook accounts in the Auth section
+  /// of the Firebase console before being able to use them.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [accessToken] is malformed or has expired.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_ACCOUNT_EXISTS_WITH_DIFFERENT_CREDENTIAL` - If there already exists an account with the email address asserted by Facebook.
+  ///       Resolve this case by calling [fetchSignInMethodsForEmail] and then asking the user to sign in using one of them.
+  ///       This error will only be thrown if the "One account per email address" setting is enabled in the Firebase console (recommended).
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Facebook accounts are not enabled.
   Future<FirebaseUser> signInWithFacebook(
       {@required String accessToken}) async {
     assert(accessToken != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-        'signInWithFacebook',
-        <String, String>{'accessToken': accessToken, 'app': app.name});
+    final Map<dynamic, dynamic> data =
+        await channel.invokeMethod('signInWithFacebook', <String, String>{
+      'accessToken': accessToken,
+      'app': app.name,
+    });
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
   }
 
-  /// Signs in with a Twitter account using the specified credentials.
+  /// Tries to sign in a user with the given Twitter [authToken] and [authTokenSecret].
   ///
-  /// The returned future completes with the signed-in user or a [PlatformException], if sign in failed.
+  /// If successful, it also signs the user in into the app and updates
+  /// the [onAuthStateChanged] stream.
+  ///
+  /// If the user doesn't have an account already, one will be created automatically.
+  ///
+  /// **Important**: You must enable Twitter accounts in the Auth section
+  /// of the Firebase console before being able to use them.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [authToken] or [authTokenSecret] is malformed or has expired.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_ACCOUNT_EXISTS_WITH_DIFFERENT_CREDENTIAL` - If there already exists an account with the email address asserted by Twitter.
+  ///       Resolve this case by calling [fetchSignInMethodsForEmail] and then asking the user to sign in using one of them.
+  ///       This error will only be thrown if the "One account per email address" setting is enabled in the Firebase console (recommended).
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Twitter accounts are not enabled.
   Future<FirebaseUser> signInWithTwitter({
     @required String authToken,
     @required String authTokenSecret,
   }) async {
     assert(authToken != null);
     assert(authTokenSecret != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-        'signInWithTwitter', <String, String>{
+    final Map<dynamic, dynamic> data =
+        await channel.invokeMethod('signInWithTwitter', <String, String>{
       'authToken': authToken,
       'authTokenSecret': authTokenSecret,
-      'app': app.name
+      'app': app.name,
     });
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
   }
 
-  Future<FirebaseUser> signInWithGithub({@required String token}) async {
+  /// Tries to sign in a user with the given Github [token].
+  ///
+  /// If successful, it also signs the user in into the app and updates
+  /// the [onAuthStateChanged] stream.
+  ///
+  /// If the user doesn't have an account already, one will be created automatically.
+  ///
+  /// **Important**: You must enable Github accounts in the Auth section
+  /// of the Firebase console before being able to use them.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [token] is malformed or has expired.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_ACCOUNT_EXISTS_WITH_DIFFERENT_CREDENTIAL` - If there already exists an account with the email address asserted by Github.
+  ///       Resolve this case by calling [fetchSignInMethodsForEmail] and then asking the user to sign in using one of them.
+  ///       This error will only be thrown if the "One account per email address" setting is enabled in the Firebase console (recommended).
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Github accounts are not enabled.
+  Future<FirebaseUser> signInWithGithub({
+    @required String token,
+  }) async {
     assert(token != null);
     final Map<dynamic, dynamic> data =
         await channel.invokeMethod('signInWithGithub', <String, String>{
@@ -320,24 +578,20 @@ class FirebaseAuth {
     return currentUser;
   }
 
-  Future<FirebaseUser> signInWithGoogle({
-    @required String idToken,
-    @required String accessToken,
-  }) async {
-    assert(idToken != null);
-    assert(accessToken != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-      'signInWithGoogle',
-      <String, String>{
-        'idToken': idToken,
-        'accessToken': accessToken,
-        'app': app.name
-      },
-    );
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
+  /// Tries to sign in a user with the given Phone [verificationId] and [smsCode].
+  ///
+  /// If successful, it also signs the user in into the app and updates
+  /// the [onAuthStateChanged] stream.
+  ///
+  /// If the user doesn't have an account already, one will be created automatically.
+  ///
+  /// **Important**: You must enable Phone accounts in the Auth section
+  /// of the Firebase console before being able to use them.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [verificationId] or [smsCode] is malformed or has expired.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Phone accounts are not enabled.
   Future<FirebaseUser> signInWithPhoneNumber({
     @required String verificationId,
     @required String smsCode,
@@ -347,13 +601,55 @@ class FirebaseAuth {
       <String, String>{
         'verificationId': verificationId,
         'smsCode': smsCode,
-        'app': app.name
+        'app': app.name,
       },
     );
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
   }
 
+  /// Starts the phone number verification process for the given phone number.
+  ///
+  /// Either sends an SMS with a 6 digit code to the phone number specified,
+  /// or sign's the user in and [verificationCompleted] is called.
+  ///
+  /// No duplicated SMS will be sent out upon re-entry (before timeout).
+  ///
+  /// Make sure to test all scenarios below:
+  ///   • You directly get logged in if Google Play Services verified the phone
+  ///     number instantly or helped you auto-retrieve the verification code.
+  ///   • Auto-retrieve verification code timed out.
+  ///   • Error cases when you receive [verificationFailed] callback.
+  ///
+  /// [phoneNumber] The phone number for the account the user is signing up
+  ///   for or signing into. Make sure to pass in a phone number with country
+  ///   code prefixed with plus sign ('+').
+  ///
+  /// [timeout] The maximum amount of time you are willing to wait for SMS
+  ///   auto-retrieval to be completed by the library. Maximum allowed value
+  ///   is 2 minutes. Use 0 to disable SMS-auto-retrieval. Setting this to 0
+  ///   will also cause [codeAutoRetrievalTimeout] to be called immediately.
+  ///   If you specified a positive value less than 30 seconds, library will
+  ///   default to 30 seconds.
+  ///
+  /// [forceResendingToken] The [forceResendingToken] obtained from [codeSent]
+  ///   callback to force re-sending another verification SMS before the
+  ///   auto-retrieval timeout.
+  ///
+  /// [verificationCompleted] This callback must be implemented.
+  ///   It will trigger when an SMS is auto-retrieved or the phone number has
+  ///   been instantly verified. The callback will provide a [FirebaseUser].
+  ///
+  /// [verificationFailed] This callback must be implemented.
+  ///   Triggered when an error occurred during phone number verification.
+  ///
+  /// [codeSent] Optional callback.
+  ///   It will trigger when an SMS has been sent to the users phone,
+  ///   and will include a [verificationId] and [forceResendingToken].
+  ///
+  /// [codeAutoRetrievalTimeout] Optional callback.
+  ///   It will trigger when SMS auto-retrieval times out and provide a
+  ///   [verificationId].
   Future<void> verifyPhoneNumber({
     @required String phoneNumber,
     @required Duration timeout,
@@ -377,12 +673,30 @@ class FirebaseAuth {
       'phoneNumber': phoneNumber,
       'timeout': timeout.inMilliseconds,
       'forceResendingToken': forceResendingToken,
-      'app': app.name
+      'app': app.name,
     };
 
     await channel.invokeMethod('verifyPhoneNumber', params);
   }
 
+  /// Tries to sign in a user with a given Custom Token [token].
+  ///
+  /// If successful, it also signs the user in into the app and updates
+  /// the [onAuthStateChanged] stream.
+  ///
+  /// Use this method after you retrieve a Firebase Auth Custom Token from your server.
+  ///
+  /// If the user identified by the [uid] specified in the token doesn't
+  /// have an account already, one will be created automatically.
+  ///
+  /// Read how to use Custom Token authentication and the cases where it is
+  /// useful in [the guides](https://firebase.google.com/docs/auth/android/custom-auth).
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CUSTOM_TOKEN` - The custom token format is incorrect.
+  ///     Please check the documentation.
+  ///   • `ERROR_CUSTOM_TOKEN_MISMATCH` - Invalid configuration.
+  ///     Ensure your app's SHA1 is correct in the Firebase console.
   Future<FirebaseUser> signInWithCustomToken({@required String token}) async {
     assert(token != null);
     final Map<dynamic, dynamic> data = await channel.invokeMethod(
@@ -393,12 +707,16 @@ class FirebaseAuth {
     return currentUser;
   }
 
+  /// Signs out the current user and clears it from the disk cache.
+  ///
+  /// If successful, it signs the user out of the app and updates
+  /// the [onAuthStateChanged] stream.
   Future<void> signOut() async {
     return await channel
         .invokeMethod("signOut", <String, String>{'app': app.name});
   }
 
-  /// Asynchronously gets current user, or `null` if there is none.
+  /// Returns the currently signed-in [FirebaseUser] or [null] if there is none.
   Future<FirebaseUser> currentUser() async {
     final Map<dynamic, dynamic> data = await channel
         .invokeMethod("currentUser", <String, String>{'app': app.name});
@@ -407,12 +725,19 @@ class FirebaseAuth {
     return currentUser;
   }
 
-  /// Links email account with current user and returns [Future<FirebaseUser>]
-  /// basically current user with additional email information
+  /// Links the given [email] and [password] to the current user.
+  ///
+  /// This allows the user to sign in to this account in the future with
+  /// the given [email] and [password].
   ///
-  /// throws [PlatformException] when
-  /// 1. email address is already used
-  /// 2. wrong email and password provided
+  /// Errors:
+  ///   • `ERROR_WEAK_PASSWORD` - If the password is not strong enough.
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the email address is malformed.
+  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the email is already in use by a different account.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has an Email & Password linked.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
   Future<FirebaseUser> linkWithEmailAndPassword({
     @required String email,
     @required String password,
@@ -427,14 +752,18 @@ class FirebaseAuth {
     return currentUser;
   }
 
-  /// Links google account with current user and returns [Future<FirebaseUser>]
+  /// Links the Google Account to the current user using [idToken] and [accessToken].
+  ///
+  /// This allows the user to sign in to this account in the future with
+  /// the given Google Account.
   ///
-  /// throws [PlatformException] when
-  /// 1. No current user provided (user has not logged in)
-  /// 2. No google credentials were found for given [idToken] and [accessToken]
-  /// 3. Google account already linked with another [FirebaseUser]
-  /// Detailed documentation on possible error causes can be found in [Android docs](https://firebase.google.com/docs/reference/android/com/google/firebase/auth/FirebaseUser#exceptions_4) and [iOS docs](https://firebase.google.com/docs/reference/ios/firebaseauth/api/reference/Classes/FIRUser#/c:objc(cs)FIRUser(im)linkWithCredential:completion:)
-  /// TODO: Throw custom exceptions with error codes indicating cause of exception
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [idToken] or [accessToken] is malformed or has expired.
+  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the Google account is already in use by a different account.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has a Google account linked.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Google accounts are not enabled.
   Future<FirebaseUser> linkWithGoogleCredential({
     @required String idToken,
     @required String accessToken,
@@ -446,51 +775,107 @@ class FirebaseAuth {
       <String, String>{
         'idToken': idToken,
         'accessToken': accessToken,
-        'app': app.name
+        'app': app.name,
       },
     );
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
   }
 
+  /// Links the Facebook Account to the current user using [accessToken].
+  ///
+  /// This allows the user to sign in to this account in the future with
+  /// the given Facebook Account.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [accessToken] is malformed or has expired.
+  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the Facebook account is already in use by a different account.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has a Facebook account linked.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Facebook accounts are not enabled.
   Future<FirebaseUser> linkWithFacebookCredential({
     @required String accessToken,
   }) async {
     assert(accessToken != null);
     final Map<dynamic, dynamic> data = await channel.invokeMethod(
       'linkWithFacebookCredential',
-      <String, String>{'accessToken': accessToken, 'app': app.name},
+      <String, String>{
+        'accessToken': accessToken,
+        'app': app.name,
+      },
     );
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
   }
 
+  /// Links the Twitter Account to the current user using [authToken] and [authTokenSecret].
+  ///
+  /// This allows the user to sign in to this account in the future with
+  /// the given Twitter Account.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [authToken] or [authTokenSecret] is malformed or has expired.
+  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the Twitter account is already in use by a different account.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has a Twitter account linked.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Twitter accounts are not enabled.
   Future<FirebaseUser> linkWithTwitterCredential({
     @required String authToken,
     @required String authTokenSecret,
   }) async {
+    assert(authToken != null);
+    assert(authTokenSecret != null);
     final Map<dynamic, dynamic> data = await channel.invokeMethod(
       'linkWithTwitterCredential',
       <String, String>{
-        'app': app.name,
         'authToken': authToken,
         'authTokenSecret': authTokenSecret,
+        'app': app.name,
       },
     );
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
   }
 
-  Future<FirebaseUser> linkWithGithubCredential(
-      {@required String token}) async {
+  /// Links the Github Account to the current user using [token].
+  ///
+  /// This allows the user to sign in to this account in the future with
+  /// the given Github Account.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [token] is malformed or has expired.
+  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the Github account is already in use by a different account.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has a Github account linked.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Github accounts are not enabled.
+  Future<FirebaseUser> linkWithGithubCredential({
+    @required String token,
+  }) async {
     assert(token != null);
     final Map<dynamic, dynamic> data = await channel.invokeMethod(
-        'linkWithGithubCredential',
-        <String, String>{'app': app.name, 'token': token});
+      'linkWithGithubCredential',
+      <String, String>{
+        'app': app.name,
+        'token': token,
+      },
+    );
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
   }
 
+  /// Reauthenticates the current user with given [email] and [password].
+  ///
+  /// This is used to prevent or resolve `ERROR_REQUIRES_RECENT_LOGIN`
+  /// response to operations that require a recent sign-in.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [email] and/or [password] are incorrect.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
   Future<void> reauthenticateWithEmailAndPassword({
     @required String email,
     @required String password,
@@ -503,6 +888,16 @@ class FirebaseAuth {
     );
   }
 
+  /// Reauthenticates the current user with the Google Account specified by [idToken] and [accessToken].
+  ///
+  /// This is used to prevent or resolve `ERROR_REQUIRES_RECENT_LOGIN`
+  /// response to operations that require a recent sign-in.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [idToken] or [accessToken] is malformed or has expired.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
   Future<void> reauthenticateWithGoogleCredential({
     @required String idToken,
     @required String accessToken,
@@ -519,6 +914,16 @@ class FirebaseAuth {
     );
   }
 
+  /// Reauthenticates the current user with the Facebook Account specified by [accessToken].
+  ///
+  /// This is used to prevent or resolve `ERROR_REQUIRES_RECENT_LOGIN`
+  /// response to operations that require a recent sign-in.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [accessToken] is malformed or has expired.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
   Future<void> reauthenticateWithFacebookCredential({
     @required String accessToken,
   }) {
@@ -529,6 +934,16 @@ class FirebaseAuth {
     );
   }
 
+  /// Reauthenticates the current user with the Twitter Account specified by [authToken] and [authTokenSecret].
+  ///
+  /// This is used to prevent or resolve `ERROR_REQUIRES_RECENT_LOGIN`
+  /// response to operations that require a recent sign-in.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [authToken] or [authTokenSecret] is malformed or has expired.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
   Future<void> reauthenticateWithTwitterCredential({
     @required String authToken,
     @required String authTokenSecret,
@@ -543,10 +958,25 @@ class FirebaseAuth {
     );
   }
 
+  /// Reauthenticates the current user with the Github Account specified by [token].
+  ///
+  /// This is used to prevent or resolve `ERROR_REQUIRES_RECENT_LOGIN`
+  /// response to operations that require a recent sign-in.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [token] is malformed or has expired.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
   Future<void> reauthenticateWithGithubCredential({@required String token}) {
     assert(token != null);
-    return channel.invokeMethod('reauthenticateWithGithubCredential',
-        <String, String>{'app': app.name, 'token': token});
+    return channel.invokeMethod(
+      'reauthenticateWithGithubCredential',
+      <String, String>{
+        'app': app.name,
+        'token': token,
+      },
+    );
   }
 
   /// Sets the user-facing language code for auth operations that can be
@@ -560,7 +990,7 @@ class FirebaseAuth {
     });
   }
 
-  Future<dynamic> _callHandler(MethodCall call) async {
+  Future<void> _callHandler(MethodCall call) async {
     switch (call.method) {
       case 'onAuthStateChanged':
         _onAuthStageChangedHandler(call);
diff --git a/packages/firebase_auth/test/firebase_auth_test.dart b/packages/firebase_auth/test/firebase_auth_test.dart
index 868d4ff3e9cd..ae83be64e65e 100755
--- a/packages/firebase_auth/test/firebase_auth_test.dart
+++ b/packages/firebase_auth/test/firebase_auth_test.dart
@@ -52,7 +52,7 @@ void main() {
           case "updateProfile":
             return null;
             break;
-          case "fetchProvidersForEmail":
+          case "fetchSignInMethodsForEmail":
             return List<String>(0);
             break;
           case "verifyPhoneNumber":
@@ -135,16 +135,16 @@ void main() {
       );
     });
 
-    test('fetchProvidersForEmail', () async {
+    test('fetchSignInMethodsForEmail', () async {
       final List<String> providers =
-          await auth.fetchProvidersForEmail(email: kMockEmail);
+          await auth.fetchSignInMethodsForEmail(email: kMockEmail);
       expect(providers, isNotNull);
       expect(providers.length, 0);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'fetchProvidersForEmail',
+            'fetchSignInMethodsForEmail',
             arguments: <String, String>{
               'email': kMockEmail,
               'app': auth.app.name
@@ -154,6 +154,86 @@ void main() {
       );
     });
 
+    test('linkWithTwitterCredential', () async {
+      final FirebaseUser user = await auth.linkWithTwitterCredential(
+        authToken: kMockIdToken,
+        authTokenSecret: kMockAccessToken,
+      );
+      verifyUser(user);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'linkWithTwitterCredential',
+            arguments: <String, String>{
+              'authToken': kMockIdToken,
+              'authTokenSecret': kMockAccessToken,
+              'app': auth.app.name,
+            },
+          ),
+        ],
+      );
+    });
+
+    test('signInWithTwitter', () async {
+      final FirebaseUser user = await auth.signInWithTwitter(
+        authToken: kMockIdToken,
+        authTokenSecret: kMockAccessToken,
+      );
+      verifyUser(user);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'signInWithTwitter',
+            arguments: <String, String>{
+              'authToken': kMockIdToken,
+              'authTokenSecret': kMockAccessToken,
+              'app': auth.app.name,
+            },
+          ),
+        ],
+      );
+    });
+
+    test('linkWithGithubCredential', () async {
+      final FirebaseUser user = await auth.linkWithGithubCredential(
+        token: kMockGithubToken,
+      );
+      verifyUser(user);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'linkWithGithubCredential',
+            arguments: <String, String>{
+              'token': kMockGithubToken,
+              'app': auth.app.name,
+            },
+          ),
+        ],
+      );
+    });
+
+    test('signInWithGithub', () async {
+      final FirebaseUser user = await auth.signInWithGithub(
+        token: kMockGithubToken,
+      );
+      verifyUser(user);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'signInWithGithub',
+            arguments: <String, String>{
+              'token': kMockGithubToken,
+              'app': auth.app.name,
+            },
+          ),
+        ],
+      );
+    });
+
     test('linkWithEmailAndPassword', () async {
       final FirebaseUser user = await auth.linkWithEmailAndPassword(
         email: kMockEmail,
@@ -637,6 +717,96 @@ void main() {
       ]);
     });
 
+    test('unlinkEmailAndPassword', () async {
+      final FirebaseUser user = await auth.currentUser();
+      await user.unlinkEmailAndPassword();
+      expect(log, <Matcher>[
+        isMethodCall(
+          'currentUser',
+          arguments: <String, String>{'app': auth.app.name},
+        ),
+        isMethodCall(
+          'unlinkCredential',
+          arguments: <String, String>{
+            'app': auth.app.name,
+            'provider': 'password',
+          },
+        ),
+      ]);
+    });
+
+    test('unlinkGoogleCredential', () async {
+      final FirebaseUser user = await auth.currentUser();
+      await user.unlinkGoogleCredential();
+      expect(log, <Matcher>[
+        isMethodCall(
+          'currentUser',
+          arguments: <String, String>{'app': auth.app.name},
+        ),
+        isMethodCall(
+          'unlinkCredential',
+          arguments: <String, String>{
+            'app': auth.app.name,
+            'provider': 'google.com',
+          },
+        ),
+      ]);
+    });
+
+    test('unlinkFacebookCredential', () async {
+      final FirebaseUser user = await auth.currentUser();
+      await user.unlinkFacebookCredential();
+      expect(log, <Matcher>[
+        isMethodCall(
+          'currentUser',
+          arguments: <String, String>{'app': auth.app.name},
+        ),
+        isMethodCall(
+          'unlinkCredential',
+          arguments: <String, String>{
+            'app': auth.app.name,
+            'provider': 'facebook.com',
+          },
+        ),
+      ]);
+    });
+
+    test('unlinkTwitterCredential', () async {
+      final FirebaseUser user = await auth.currentUser();
+      await user.unlinkTwitterCredential();
+      expect(log, <Matcher>[
+        isMethodCall(
+          'currentUser',
+          arguments: <String, String>{'app': auth.app.name},
+        ),
+        isMethodCall(
+          'unlinkCredential',
+          arguments: <String, String>{
+            'app': auth.app.name,
+            'provider': 'twitter.com',
+          },
+        ),
+      ]);
+    });
+
+    test('unlinkGithubCredential', () async {
+      final FirebaseUser user = await auth.currentUser();
+      await user.unlinkGithubCredential();
+      expect(log, <Matcher>[
+        isMethodCall(
+          'currentUser',
+          arguments: <String, String>{'app': auth.app.name},
+        ),
+        isMethodCall(
+          'unlinkCredential',
+          arguments: <String, String>{
+            'app': auth.app.name,
+            'provider': 'github.com',
+          },
+        ),
+      ]);
+    });
+
     test('signInWithCustomToken', () async {
       final FirebaseUser user =
           await auth.signInWithCustomToken(token: kMockCustomToken);

From 952a99e770e4b7fd68bf4a65e1a689469321a4af Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Thu, 22 Nov 2018 10:59:36 -0800
Subject: [PATCH 004/410] Update Google Maps Plugin README. (#920)

Adds instructions for iOS and notes that this is a developers preview.
---
 packages/google_maps_flutter/README.md | 53 ++++++++++++++++++++------
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/packages/google_maps_flutter/README.md b/packages/google_maps_flutter/README.md
index 315a7e28fbc4..190b44921434 100644
--- a/packages/google_maps_flutter/README.md
+++ b/packages/google_maps_flutter/README.md
@@ -1,19 +1,22 @@
-# Google Maps for Flutter
+# Google Maps for Flutter (Developers Preview)
 
 [![pub package](https://img.shields.io/pub/v/google_maps_flutter.svg)](https://pub.dartlang.org/packages/google_maps_flutter)
 
-A Flutter plugin to use [Google Maps](https://developers.google.com/maps/).
+A Flutter plugin that provides a [Google Maps](https://developers.google.com/maps/) widget.
 
-## Caveat
+## Developers Preview Status
+The plugin relies on Flutter's new mechanism for embedding Android and iOS views.
+As that mechanism is currently in a developers preview, this plugin should also be
+considered a developers preview.
+
+Known issues are tagged with the [platform-views](https://github.com/flutter/flutter/labels/a%3A%20platform-views) and/or [maps](https://github.com/flutter/flutter/labels/p%3A%20maps) labels.
+
+To use this plugin on iOS you need to opt-in for the embedded views preview by
+adding a boolean property to the app's `Info.plist` file, with the key `io.flutter.embedded_views_preview`
+and the value `YES`.
+
+The API exposed by this plugin is not yet stable, and we expect some breaking changes to land soon.
 
-This plugin provides an *unpublished preview* of the Flutter API for Google Maps:
-* Dart APIs for controlling and interacting with a GoogleMap view from Flutter
-  code are still being consolidated and expanded. The intention is to grow
-  current coverage into a complete offering. Issues and pull requests aimed to
-  help us prioritize and speed up this effort are very welcome.
-* Currently the plugin only supports Android as it embeds a platform view in the
-  Flutter hierarchy which is currently only supported for Android ([tracking
-  issue](https://github.com/flutter/flutter/issues/19030)).
 
 ## Usage
 
@@ -30,6 +33,8 @@ as a [dependency in your pubspec.yaml file](https://flutter.io/platform-plugins/
 
 Get an API key at <https://cloud.google.com/maps-platform/>.
 
+### Android
+
 Specify your API key in the application manifest `android/app/src/main/AndroidManifest.xml`:
 
 ```xml
@@ -39,6 +44,32 @@ Specify your API key in the application manifest `android/app/src/main/AndroidMa
                android:value="YOUR KEY HERE"/>
 ```
 
+### iOS
+
+Specify your API key in the application delegate `ios/Runner/AppDelegate.m`:
+
+```objectivec
+#include "AppDelegate.h"
+#include "GeneratedPluginRegistrant.h"
+#import "GoogleMaps/GoogleMaps.h"
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application
+    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+  [GMSServices provideAPIKey:@"YOUR KEY HERE"];
+  [GeneratedPluginRegistrant registerWithRegistry:self];
+  return [super application:application didFinishLaunchingWithOptions:launchOptions];
+}
+@end
+```
+
+Opt-in to the embedded views preview by adding a boolean property to the app's `Info.plist` file
+with the key `io.flutter.embedded_views_preview` and the value `YES`.
+
+### Both
+
+
 You can now add a `GoogleMap` widget to your widget tree.
 
 The map view can be controlled with the `GoogleMapController` that is passed to

From f31aa8cfed597e8e119a89082a2ab2f32f8e306a Mon Sep 17 00:00:00 2001
From: Sebastian Roth <sebastian.roth@gmail.com>
Date: Fri, 23 Nov 2018 12:49:47 +0800
Subject: [PATCH 005/410] [android_alarm_manager] bump firebase_auth
 dependencies (#922)

---
 packages/android_alarm_manager/CHANGELOG.md         | 3 +++
 packages/android_alarm_manager/example/pubspec.yaml | 4 ++--
 packages/android_alarm_manager/pubspec.yaml         | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index 54a4b6a974e9..180c105bd69e 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.2.2
+* Update dependencies for example to point to published versions of firebase_auth
+
 ## 0.2.1
 * Update dependencies for example to point to published versions of firebase_auth
   and google_sign_in.
diff --git a/packages/android_alarm_manager/example/pubspec.yaml b/packages/android_alarm_manager/example/pubspec.yaml
index a338613f5fc2..56af4c68eabe 100644
--- a/packages/android_alarm_manager/example/pubspec.yaml
+++ b/packages/android_alarm_manager/example/pubspec.yaml
@@ -6,8 +6,8 @@ dependencies:
     sdk: flutter
   android_alarm_manager:
     path: ../
-  firebase_auth: ^0.5.18
-  google_sign_in: ^3.0.4
+  firebase_auth: ^0.6.6
+  google_sign_in: ^3.2.4
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index 169045bcc004..906a13f6e503 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -1,12 +1,12 @@
 name: android_alarm_manager
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.2.1
+version: 0.2.2
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 
 dependencies:
-  firebase_auth: ^0.5.18
+  firebase_auth: ^0.6.6
   flutter:
     sdk: flutter
 

From b401d362e6e96ccce19a7c39eebd63cf31e36157 Mon Sep 17 00:00:00 2001
From: Sebastian Roth <sebastian.roth@gmail.com>
Date: Fri, 23 Nov 2018 15:00:52 +0800
Subject: [PATCH 006/410] Upgrade Google services plugin to 4.2.0 (#917)

* Upgrade Google services plugin to 4.2.0

https://github.com/google/play-services-plugins/tree/master/google-services-plugin

The plugin now highlights dependency conflicts a lot better.

* Also upgrade google-services plugin reference in android_alarm_manager plugin and the README.md files
---
 packages/android_alarm_manager/example/android/build.gradle  | 2 +-
 packages/cloud_firestore/example/android/build.gradle        | 2 +-
 packages/cloud_functions/example/android/build.gradle        | 2 +-
 packages/firebase_admob/example/android/build.gradle         | 2 +-
 packages/firebase_analytics/example/android/build.gradle     | 2 +-
 packages/firebase_auth/README.md                             | 2 +-
 packages/firebase_auth/example/android/build.gradle          | 2 +-
 packages/firebase_database/example/android/build.gradle      | 2 +-
 packages/firebase_dynamic_links/example/android/build.gradle | 2 +-
 packages/firebase_messaging/example/android/build.gradle     | 2 +-
 packages/firebase_ml_vision/example/android/build.gradle     | 2 +-
 packages/firebase_performance/example/android/build.gradle   | 2 +-
 packages/firebase_remote_config/README.md                    | 2 +-
 packages/firebase_remote_config/example/android/build.gradle | 2 +-
 packages/firebase_storage/example/android/build.gradle       | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/android_alarm_manager/example/android/build.gradle b/packages/android_alarm_manager/example/android/build.gradle
index 18252e506260..83f45572c5a3 100644
--- a/packages/android_alarm_manager/example/android/build.gradle
+++ b/packages/android_alarm_manager/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:3.2.1'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/packages/cloud_firestore/example/android/build.gradle b/packages/cloud_firestore/example/android/build.gradle
index 85f0c0e9c202..c9ffd24e9e5f 100755
--- a/packages/cloud_firestore/example/android/build.gradle
+++ b/packages/cloud_firestore/example/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/packages/cloud_functions/example/android/build.gradle b/packages/cloud_functions/example/android/build.gradle
index ea9a5cd661b3..83f45572c5a3 100644
--- a/packages/cloud_functions/example/android/build.gradle
+++ b/packages/cloud_functions/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/packages/firebase_admob/example/android/build.gradle b/packages/firebase_admob/example/android/build.gradle
index 85f0c0e9c202..c9ffd24e9e5f 100644
--- a/packages/firebase_admob/example/android/build.gradle
+++ b/packages/firebase_admob/example/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/packages/firebase_analytics/example/android/build.gradle b/packages/firebase_analytics/example/android/build.gradle
index 85f0c0e9c202..c9ffd24e9e5f 100755
--- a/packages/firebase_analytics/example/android/build.gradle
+++ b/packages/firebase_analytics/example/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/packages/firebase_auth/README.md b/packages/firebase_auth/README.md
index befa4d79f25b..9e08bff99deb 100755
--- a/packages/firebase_auth/README.md
+++ b/packages/firebase_auth/README.md
@@ -25,7 +25,7 @@ dependencies {
   // Example existing classpath
   classpath 'com.android.tools.build:gradle:3.2.1'
   // Add the google services classpath
-  classpath 'com.google.gms:google-services:3.2.1'
+  classpath 'com.google.gms:google-services:4.2.0'
 }
 ```
 
diff --git a/packages/firebase_auth/example/android/build.gradle b/packages/firebase_auth/example/android/build.gradle
index ea9a5cd661b3..83f45572c5a3 100755
--- a/packages/firebase_auth/example/android/build.gradle
+++ b/packages/firebase_auth/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/packages/firebase_database/example/android/build.gradle b/packages/firebase_database/example/android/build.gradle
index ea9a5cd661b3..83f45572c5a3 100755
--- a/packages/firebase_database/example/android/build.gradle
+++ b/packages/firebase_database/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/packages/firebase_dynamic_links/example/android/build.gradle b/packages/firebase_dynamic_links/example/android/build.gradle
index 46a29f4b862c..02952e08c58c 100644
--- a/packages/firebase_dynamic_links/example/android/build.gradle
+++ b/packages/firebase_dynamic_links/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/packages/firebase_messaging/example/android/build.gradle b/packages/firebase_messaging/example/android/build.gradle
index ea9a5cd661b3..83f45572c5a3 100644
--- a/packages/firebase_messaging/example/android/build.gradle
+++ b/packages/firebase_messaging/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/packages/firebase_ml_vision/example/android/build.gradle b/packages/firebase_ml_vision/example/android/build.gradle
index 46a29f4b862c..02952e08c58c 100644
--- a/packages/firebase_ml_vision/example/android/build.gradle
+++ b/packages/firebase_ml_vision/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/packages/firebase_performance/example/android/build.gradle b/packages/firebase_performance/example/android/build.gradle
index 85f0c0e9c202..c9ffd24e9e5f 100644
--- a/packages/firebase_performance/example/android/build.gradle
+++ b/packages/firebase_performance/example/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/packages/firebase_remote_config/README.md b/packages/firebase_remote_config/README.md
index f57d7cefb335..027c4ee0a91f 100644
--- a/packages/firebase_remote_config/README.md
+++ b/packages/firebase_remote_config/README.md
@@ -23,7 +23,7 @@ dependencies {
   // Example existing classpath
   classpath 'com.android.tools.build:gradle:3.2.1'
   // Add the google services classpath
-  classpath 'com.google.gms:google-services:3.1.2'
+  classpath 'com.google.gms:google-services:4.2.0'
 }
 ```
 
diff --git a/packages/firebase_remote_config/example/android/build.gradle b/packages/firebase_remote_config/example/android/build.gradle
index ea9a5cd661b3..83f45572c5a3 100644
--- a/packages/firebase_remote_config/example/android/build.gradle
+++ b/packages/firebase_remote_config/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/packages/firebase_storage/example/android/build.gradle b/packages/firebase_storage/example/android/build.gradle
index 85f0c0e9c202..c9ffd24e9e5f 100755
--- a/packages/firebase_storage/example/android/build.gradle
+++ b/packages/firebase_storage/example/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 

From 2908b42a5c8c0ed1e0026e7a6a9989fc4acaacb1 Mon Sep 17 00:00:00 2001
From: Raouf Rahiche <37366956+Rahiche@users.noreply.github.com>
Date: Sat, 24 Nov 2018 22:59:18 +0100
Subject: [PATCH 007/410] Delete reference to the pub plugin (#925)

the pub plugin referenced here is unofficial and make people confused
---
 packages/google_maps_flutter/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/google_maps_flutter/README.md b/packages/google_maps_flutter/README.md
index 190b44921434..f8f6461427bb 100644
--- a/packages/google_maps_flutter/README.md
+++ b/packages/google_maps_flutter/README.md
@@ -1,6 +1,5 @@
 # Google Maps for Flutter (Developers Preview)
 
-[![pub package](https://img.shields.io/pub/v/google_maps_flutter.svg)](https://pub.dartlang.org/packages/google_maps_flutter)
 
 A Flutter plugin that provides a [Google Maps](https://developers.google.com/maps/) widget.
 

From f057a22423e7fd858deb2c01bc5cdd2dcf5c91a1 Mon Sep 17 00:00:00 2001
From: Tim Traversy <timtrav@gmail.com>
Date: Sun, 25 Nov 2018 17:55:26 -0500
Subject: [PATCH 008/410] Adding closeWebView feature to url_launcher (#924)

---
 packages/url_launcher/CHANGELOG.md            |  4 +++
 .../urllauncher/UrlLauncherPlugin.java        | 26 ++++++++++++++-----
 packages/url_launcher/example/lib/main.dart   | 11 ++++++++
 .../ios/Classes/UrlLauncherPlugin.m           | 25 +++++++++++++++---
 packages/url_launcher/lib/url_launcher.dart   | 11 ++++++++
 packages/url_launcher/pubspec.yaml            |  2 +-
 .../url_launcher/test/url_launcher_test.dart  |  8 ++++++
 7 files changed, 76 insertions(+), 11 deletions(-)

diff --git a/packages/url_launcher/CHANGELOG.md b/packages/url_launcher/CHANGELOG.md
index b45c70e7021a..e8f388377ea6 100644
--- a/packages/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.2
+
+* Added `closeWebView` function to programmatically close the current WebView.
+
 ## 4.0.1
 
 * Added enableJavaScript field to `launch` to enable javascript in Android WebView.
diff --git a/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java b/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
index 2f8003dbc65f..7d856d98749d 100644
--- a/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
+++ b/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
@@ -5,9 +5,11 @@
 package io.flutter.plugins.urllauncher;
 
 import android.app.Activity;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.KeyEvent;
@@ -37,6 +39,7 @@ private UrlLauncherPlugin(Registrar registrar) {
 
   @Override
   public void onMethodCall(MethodCall call, Result result) {
+    Context context = mRegistrar.context();
     String url = call.argument("url");
     if (call.method.equals("canLaunch")) {
       canLaunch(url, result);
@@ -44,12 +47,6 @@ public void onMethodCall(MethodCall call, Result result) {
       Intent launchIntent;
       boolean useWebView = call.argument("useWebView");
       boolean enableJavaScript = call.argument("enableJavaScript");
-      Context context;
-      if (mRegistrar.activity() != null) {
-        context = (Context) mRegistrar.activity();
-      } else {
-        context = mRegistrar.context();
-      }
       if (useWebView) {
         launchIntent = new Intent(context, WebViewActivity.class);
         launchIntent.putExtra("url", url);
@@ -63,6 +60,10 @@ public void onMethodCall(MethodCall call, Result result) {
       }
       context.startActivity(launchIntent);
       result.success(null);
+    } else if (call.method.equals("closeWebView")) {
+      Intent intent = new Intent("close");
+      context.sendBroadcast(intent);
+      result.success(null);
     } else {
       result.notImplemented();
     }
@@ -107,6 +108,19 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
               return false;
             }
           });
+
+      // Set broadcast receiver to handle calls to close the web view
+      BroadcastReceiver broadcast_receiver =
+          new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context arg0, Intent intent) {
+              String action = intent.getAction();
+              if (action.equals("close")) {
+                finish();
+              }
+            }
+          };
+      registerReceiver(broadcast_receiver, new IntentFilter("close"));
     }
 
     @Override
diff --git a/packages/url_launcher/example/lib/main.dart b/packages/url_launcher/example/lib/main.dart
index f330bc56a3f2..1ebb13e79b33 100644
--- a/packages/url_launcher/example/lib/main.dart
+++ b/packages/url_launcher/example/lib/main.dart
@@ -108,6 +108,17 @@ class _MyHomePageState extends State<MyHomePage> {
               child: const Text('Launch in app(JavaScript ON)'),
             ),
             const Padding(padding: EdgeInsets.all(16.0)),
+            RaisedButton(
+              onPressed: () => setState(() {
+                    _launched = _launchInWebViewOrVC(toLaunch);
+                    Timer(const Duration(seconds: 5), () {
+                      print('Closing WebView after 5 seconds...');
+                      closeWebView();
+                    });
+                  }),
+              child: const Text('Launch in app + close after 5 seconds'),
+            ),
+            const Padding(padding: EdgeInsets.all(16.0)),
             FutureBuilder<void>(future: _launched, builder: _launchStatus),
           ],
         ),
diff --git a/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m b/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
index 942a272a842f..6cd5851a9bf0 100644
--- a/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
+++ b/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
@@ -7,6 +7,7 @@
 #import "UrlLauncherPlugin.h"
 
 @interface FLTUrlLaunchSession : NSObject <SFSafariViewControllerDelegate>
+@property(strong) SFSafariViewController *safari;
 @end
 
 @implementation FLTUrlLaunchSession {
@@ -19,6 +20,8 @@ - (instancetype)initWithUrl:url withFlutterResult:result {
   if (self) {
     _url = url;
     _flutterResult = result;
+    _safari = [[SFSafariViewController alloc] initWithURL:url];
+    _safari.delegate = self;
   }
   return self;
 }
@@ -39,6 +42,10 @@ - (void)safariViewControllerDidFinish:(SFSafariViewController *)controller {
   [controller dismissViewControllerAnimated:YES completion:nil];
 }
 
+- (void)close {
+  [self safariViewControllerDidFinish:_safari];
+}
+
 @end
 
 @implementation FLTUrlLauncherPlugin {
@@ -76,6 +83,8 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     } else {
       [self launchURL:url result:result];
     }
+  } else if ([@"closeWebView" isEqualToString:call.method]) {
+    [self closeWebView:url result:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -118,11 +127,19 @@ - (void)launchURL:(NSString *)urlString result:(FlutterResult)result {
 
 - (void)launchURLInVC:(NSString *)urlString result:(FlutterResult)result {
   NSURL *url = [NSURL URLWithString:urlString];
-
-  SFSafariViewController *safari = [[SFSafariViewController alloc] initWithURL:url];
   _currentSession = [[FLTUrlLaunchSession alloc] initWithUrl:url withFlutterResult:result];
-  safari.delegate = _currentSession;
-  [_viewController presentViewController:safari animated:YES completion:nil];
+  [_viewController presentViewController:_currentSession.safari
+                                animated:YES
+                              completion:^void() {
+                                self->_currentSession = nil;
+                              }];
+}
+
+- (void)closeWebView:(NSString *)urlString result:(FlutterResult)result {
+  if (_currentSession != nil) {
+    [_currentSession close];
+  }
+  result(nil);
 }
 
 @end
diff --git a/packages/url_launcher/lib/url_launcher.dart b/packages/url_launcher/lib/url_launcher.dart
index 2eac13aea502..0aedb201e2e0 100644
--- a/packages/url_launcher/lib/url_launcher.dart
+++ b/packages/url_launcher/lib/url_launcher.dart
@@ -90,3 +90,14 @@ Future<bool> canLaunch(String urlString) async {
     <String, Object>{'url': urlString},
   );
 }
+
+/// Closes the current WebView, if one was previously opened via a call to [launch].
+///
+/// If [launch] was never called, then this call will not have any effect.
+///
+/// On Android systems, if [launch] was called without `forceWebView` being set to
+/// `true`, this call will not do anything either, simply because there is no
+/// WebView available to be closed.
+Future<void> closeWebView() async {
+  return await _channel.invokeMethod('closeWebView');
+}
diff --git a/packages/url_launcher/pubspec.yaml b/packages/url_launcher/pubspec.yaml
index bad3667631d9..83ad771b3fc1 100644
--- a/packages/url_launcher/pubspec.yaml
+++ b/packages/url_launcher/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher
-version: 4.0.1
+version: 4.0.2
 
 flutter:
   plugin:
diff --git a/packages/url_launcher/test/url_launcher_test.dart b/packages/url_launcher/test/url_launcher_test.dart
index 3fdefb343131..a007ded205c8 100644
--- a/packages/url_launcher/test/url_launcher_test.dart
+++ b/packages/url_launcher/test/url_launcher_test.dart
@@ -110,4 +110,12 @@ void main() {
     expect(() async => await launch('tel:555-555-5555', forceWebView: true),
         throwsA(isInstanceOf<PlatformException>()));
   });
+
+  test('closeWebView default behavior', () async {
+    await closeWebView();
+    expect(
+      log,
+      <Matcher>[isMethodCall('closeWebView', arguments: null)],
+    );
+  });
 }

From 136663b676488b9fffded685ef5be5d78a955970 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Mon, 26 Nov 2018 12:54:00 -0800
Subject: [PATCH 009/410] Initial README for the WebView plugin (#930)

---
 packages/webview_flutter/README.md | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/packages/webview_flutter/README.md b/packages/webview_flutter/README.md
index ced7b12ed351..948d90d1aac7 100644
--- a/packages/webview_flutter/README.md
+++ b/packages/webview_flutter/README.md
@@ -1,7 +1,31 @@
-# webview_flutter
+# WebView for Flutter (Developers Preview)
 
 [![pub package](https://img.shields.io/pub/v/webview_flutter.svg)](https://pub.dartlang.org/packages/webview_flutter)
 
-A WebView Plugin for Flutter.
+A Flutter plugin that provides a WebView widget.
 
-**This is an unpublished preview.**
+On iOS the WebView widget is backed by a [WKWebView](https://developer.apple.com/documentation/webkit/wkwebview);
+On Android the WebView widget is backed by a [WebView](https://developer.android.com/reference/android/webkit/WebView).
+
+## Developers Preview Status
+The plugin relies on Flutter's new mechanism for embedding Android and iOS views.
+As that mechanism is currently in a developers preview, this plugin should also be
+considered a developers preview.
+
+Known issues are tagged with the [platform-views](https://github.com/flutter/flutter/labels/a%3A%20platform-views) and/or [webview](https://github.com/flutter/flutter/labels/p%3A%20webview) labels.
+
+To use this plugin on iOS you need to opt-in for the embedded views preview by
+adding a boolean property to the app's `Info.plist` file, with the key `io.flutter.embedded_views_preview`
+and the value `YES`.
+
+## Setup
+
+### iOS
+Opt-in to the embedded views preview by adding a boolean property to the app's `Info.plist` file
+with the key `io.flutter.embedded_views_preview` and the value `YES`.
+
+## Usage
+Add `webview_flutter` as a [dependency in your pubspec.yaml file](https://flutter.io/platform-plugins/).
+
+You can now include a WebView widget in your widget tree.
+See the WebView widget's Dartdoc for more details on how to use the widget.

From a444ad120418d622c4dea2882190968722abbcfe Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Tue, 27 Nov 2018 12:45:16 -0800
Subject: [PATCH 010/410] Introduce credentials to firebase_auth (#928)

* Move classes into separate files

* Refactoring to use auth providers

* Merge refactoring

* Update to use revised signInWithCredential API
---
 packages/firebase_auth/CHANGELOG.md           |    7 +
 .../firebaseauth/FirebaseAuthPlugin.java      |  248 +---
 packages/firebase_auth/example/lib/main.dart  |    7 +-
 .../ios/Classes/FirebaseAuthPlugin.m          |  168 +--
 packages/firebase_auth/lib/firebase_auth.dart | 1054 +----------------
 .../lib/src/auth_credential.dart              |   13 +
 .../firebase_auth/lib/src/auth_exception.dart |   14 +
 .../auth_provider/email_auth_provider.dart    |   19 +
 .../auth_provider/facebook_auth_provider.dart |   16 +
 .../auth_provider/github_auth_provider.dart   |   13 +
 .../auth_provider/google_auth_provider.dart   |   19 +
 .../auth_provider/phone_auth_provider.dart    |   19 +
 .../auth_provider/twitter_auth_provider.dart  |   19 +
 .../firebase_auth/lib/src/firebase_auth.dart  |  408 +++++++
 .../firebase_auth/lib/src/firebase_user.dart  |  179 +++
 packages/firebase_auth/lib/src/user_info.dart |   37 +
 .../firebase_auth/lib/src/user_metadata.dart  |   16 +
 .../lib/src/user_update_info.dart             |   23 +
 packages/firebase_auth/pubspec.yaml           |    2 +-
 .../test/firebase_auth_test.dart              |  389 +++---
 20 files changed, 1167 insertions(+), 1503 deletions(-)
 create mode 100644 packages/firebase_auth/lib/src/auth_credential.dart
 create mode 100644 packages/firebase_auth/lib/src/auth_exception.dart
 create mode 100644 packages/firebase_auth/lib/src/auth_provider/email_auth_provider.dart
 create mode 100644 packages/firebase_auth/lib/src/auth_provider/facebook_auth_provider.dart
 create mode 100644 packages/firebase_auth/lib/src/auth_provider/github_auth_provider.dart
 create mode 100644 packages/firebase_auth/lib/src/auth_provider/google_auth_provider.dart
 create mode 100644 packages/firebase_auth/lib/src/auth_provider/phone_auth_provider.dart
 create mode 100644 packages/firebase_auth/lib/src/auth_provider/twitter_auth_provider.dart
 create mode 100644 packages/firebase_auth/lib/src/firebase_auth.dart
 create mode 100644 packages/firebase_auth/lib/src/firebase_user.dart
 create mode 100644 packages/firebase_auth/lib/src/user_info.dart
 create mode 100644 packages/firebase_auth/lib/src/user_metadata.dart
 create mode 100644 packages/firebase_auth/lib/src/user_update_info.dart

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index d0aa9da89192..ab3894449584 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.7.0
+
+* Introduce third-party auth provider classes that generate `AuthCredential`s
+* **Breaking Change** Signing in, linking, and reauthenticating now require an `AuthCredential`
+* **Breaking Change** Unlinking now uses providerId
+* **Breaking Change** Moved reauthentication to FirebaseUser
+
 ## 0.6.7
 
 * `FirebaseAuth` and `FirebaseUser` are now fully documented.
diff --git a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
index 4bf1ce277a29..9bf2032da72f 100755
--- a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
+++ b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
@@ -103,62 +103,26 @@ public void onMethodCall(MethodCall call, Result result) {
       case "delete":
         handleDelete(call, result, getAuth(call));
         break;
-      case "signInWithEmailAndPassword":
-        handleSignInWithEmailAndPassword(call, result, getAuth(call));
-        break;
-      case "signInWithGoogle":
-        handleSignInWithGoogle(call, result, getAuth(call));
+      case "signInWithCredential":
+        handleSignInWithCredential(call, result, getAuth(call));
         break;
       case "signInWithCustomToken":
         handleSignInWithCustomToken(call, result, getAuth(call));
         break;
-      case "signInWithFacebook":
-        handleSignInWithFacebook(call, result, getAuth(call));
-        break;
-      case "signInWithTwitter":
-        handleSignInWithTwitter(call, result, getAuth(call));
-        break;
-      case "signInWithGithub":
-        handleSignInWithGithub(call, result, getAuth(call));
-        break;
       case "signOut":
         handleSignOut(call, result, getAuth(call));
         break;
       case "getIdToken":
         handleGetToken(call, result, getAuth(call));
         break;
-      case "reauthenticateWithEmailAndPassword":
-        handleReauthenticateWithEmailAndPassword(call, result, getAuth(call));
-        break;
-      case "reauthenticateWithGoogleCredential":
-        handleReauthenticateWithGoogleCredential(call, result, getAuth(call));
-        break;
-      case "reauthenticateWithFacebookCredential":
-        handleReauthenticateWithFacebookCredential(call, result, getAuth(call));
-        break;
-      case "reauthenticateWithTwitterCredential":
-        handleReauthenticateWithTwitterCredential(call, result, getAuth(call));
-        break;
-      case "reauthenticateWithGithubCredential":
-        handleReauthenticateWithGithubCredential(call, result, getAuth(call));
+      case "reauthenticateWithCredential":
+        handleReauthenticateWithCredential(call, result, getAuth(call));
         break;
-      case "linkWithEmailAndPassword":
+      case "linkWithCredential":
         handleLinkWithEmailAndPassword(call, result, getAuth(call));
         break;
-      case "linkWithGoogleCredential":
-        handleLinkWithGoogleCredential(call, result, getAuth(call));
-        break;
-      case "linkWithFacebookCredential":
-        handleLinkWithFacebookCredential(call, result, getAuth(call));
-        break;
-      case "linkWithTwitterCredential":
-        handleLinkWithTwitterCredential(call, result, getAuth(call));
-        break;
-      case "linkWithGithubCredential":
-        handleLinkWithGithubCredential(call, result, getAuth(call));
-        break;
-      case "unlinkCredential":
-        handleUnlinkCredential(call, result, getAuth(call));
+      case "unlinkFromProvider":
+        handleUnlinkFromProvider(call, result, getAuth(call));
         break;
       case "updateEmail":
         handleUpdateEmail(call, result, getAuth(call));
@@ -381,168 +345,70 @@ private void handleDelete(MethodCall call, Result result, FirebaseAuth firebaseA
         .addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
-  private void handleSignInWithEmailAndPassword(
-      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    Map<String, String> arguments = call.arguments();
-    String email = arguments.get("email");
-    String password = arguments.get("password");
-
-    firebaseAuth
-        .signInWithEmailAndPassword(email, password)
-        .addOnCompleteListener(new SignInCompleteListener(result));
+  private AuthCredential getCredential(Map<String, Object> arguments) {
+    AuthCredential credential;
+    Map<String, String> data = (Map<String, String>) arguments.get("data");
+    switch ((String) arguments.get("provider")) {
+      case EmailAuthProvider.PROVIDER_ID:
+        {
+          String email = data.get("email");
+          String password = data.get("password");
+          credential = EmailAuthProvider.getCredential(email, password);
+          break;
+        }
+      case GoogleAuthProvider.PROVIDER_ID:
+        {
+          String idToken = data.get("idToken");
+          String accessToken = data.get("accessToken");
+          credential = GoogleAuthProvider.getCredential(idToken, accessToken);
+          break;
+        }
+      case FacebookAuthProvider.PROVIDER_ID:
+        {
+          String accessToken = data.get("accessToken");
+          credential = FacebookAuthProvider.getCredential(accessToken);
+          break;
+        }
+      case TwitterAuthProvider.PROVIDER_ID:
+        {
+          String authToken = data.get("authToken");
+          String authTokenSecret = data.get("authTokenSecret");
+          credential = TwitterAuthProvider.getCredential(authToken, authTokenSecret);
+          break;
+        }
+      case GithubAuthProvider.PROVIDER_ID:
+        {
+          String token = data.get("token");
+          credential = GithubAuthProvider.getCredential(token);
+          break;
+        }
+      default:
+        {
+          credential = null;
+          break;
+        }
+    }
+    return credential;
   }
 
-  private void handleSignInWithGoogle(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    Map<String, String> arguments = call.arguments();
-    String idToken = arguments.get("idToken");
-    String accessToken = arguments.get("accessToken");
-
-    AuthCredential credential = GoogleAuthProvider.getCredential(idToken, accessToken);
+  private void handleSignInWithCredential(
+      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    AuthCredential credential = getCredential((Map<String, Object>) call.arguments());
     firebaseAuth
         .signInWithCredential(credential)
         .addOnCompleteListener(new SignInCompleteListener(result));
   }
 
-  private void handleReauthenticateWithEmailAndPassword(
+  private void handleReauthenticateWithCredential(
       MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    Map<String, String> arguments = call.arguments();
-    String email = arguments.get("email");
-    String password = arguments.get("password");
-
-    AuthCredential credential = EmailAuthProvider.getCredential(email, password);
-    firebaseAuth
-        .getCurrentUser()
-        .reauthenticate(credential)
-        .addOnCompleteListener(new TaskVoidCompleteListener(result));
-  }
-
-  private void handleReauthenticateWithGoogleCredential(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    Map<String, String> arguments = call.arguments();
-    String idToken = arguments.get("idToken");
-    String accessToken = arguments.get("accessToken");
-
-    AuthCredential credential = GoogleAuthProvider.getCredential(idToken, accessToken);
-    firebaseAuth
-        .getCurrentUser()
-        .reauthenticate(credential)
-        .addOnCompleteListener(new TaskVoidCompleteListener(result));
-  }
-
-  private void handleReauthenticateWithFacebookCredential(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    Map<String, String> arguments = call.arguments();
-    String accessToken = arguments.get("accessToken");
-
-    AuthCredential credential = FacebookAuthProvider.getCredential(accessToken);
-    firebaseAuth
-        .getCurrentUser()
-        .reauthenticate(credential)
-        .addOnCompleteListener(new TaskVoidCompleteListener(result));
-  }
-
-  private void handleReauthenticateWithTwitterCredential(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    Map<String, String> arguments = call.arguments();
-    String authToken = arguments.get("authToken");
-    String authTokenSecret = arguments.get("authTokenSecret");
-
-    AuthCredential credential = TwitterAuthProvider.getCredential(authToken, authTokenSecret);
+    AuthCredential credential = getCredential((Map<String, Object>) call.arguments());
     firebaseAuth
         .getCurrentUser()
         .reauthenticate(credential)
         .addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
-  private void handleReauthenticateWithGithubCredential(
-      MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
-    String token = call.argument("token");
-
-    AuthCredential credential = GithubAuthProvider.getCredential(token);
-    firebaseAuth
-        .getCurrentUser()
-        .reauthenticate(credential)
-        .addOnCompleteListener(new TaskVoidCompleteListener(result));
-  }
-
-  private void handleLinkWithGoogleCredential(
-      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    Map<String, String> arguments = call.arguments();
-    String idToken = arguments.get("idToken");
-    String accessToken = arguments.get("accessToken");
-
-    AuthCredential credential = GoogleAuthProvider.getCredential(idToken, accessToken);
-    firebaseAuth
-        .getCurrentUser()
-        .linkWithCredential(credential)
-        .addOnCompleteListener(new SignInCompleteListener(result));
-  }
-
-  private void handleLinkWithFacebookCredential(
-      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    Map<String, String> arguments = call.arguments();
-    String accessToken = arguments.get("accessToken");
-
-    AuthCredential credential = FacebookAuthProvider.getCredential(accessToken);
-    firebaseAuth
-        .getCurrentUser()
-        .linkWithCredential(credential)
-        .addOnCompleteListener(new SignInCompleteListener(result));
-  }
-
-  private void handleSignInWithFacebook(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    Map<String, String> arguments = call.arguments();
-    String accessToken = arguments.get("accessToken");
-
-    AuthCredential credential = FacebookAuthProvider.getCredential(accessToken);
-    firebaseAuth
-        .signInWithCredential(credential)
-        .addOnCompleteListener(new SignInCompleteListener(result));
-  }
-
-  private void handleSignInWithTwitter(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    String authToken = call.argument("authToken");
-    String authTokenSecret = call.argument("authTokenSecret");
-
-    AuthCredential credential = TwitterAuthProvider.getCredential(authToken, authTokenSecret);
-    firebaseAuth
-        .signInWithCredential(credential)
-        .addOnCompleteListener(new SignInCompleteListener(result));
-  }
-
-  private void handleLinkWithTwitterCredential(
-      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    String authToken = call.argument("authToken");
-    String authTokenSecret = call.argument("authTokenSecret");
-
-    AuthCredential credential = TwitterAuthProvider.getCredential(authToken, authTokenSecret);
-    firebaseAuth
-        .getCurrentUser()
-        .linkWithCredential(credential)
-        .addOnCompleteListener(new SignInCompleteListener(result));
-  }
-
-  private void handleSignInWithGithub(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    String token = call.argument("token");
-
-    AuthCredential credential = GithubAuthProvider.getCredential(token);
-    firebaseAuth
-        .signInWithCredential(credential)
-        .addOnCompleteListener(new SignInCompleteListener(result));
-  }
-
-  private void handleLinkWithGithubCredential(
-      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    String token = call.argument("token");
-
-    AuthCredential credential = GithubAuthProvider.getCredential(token);
-    firebaseAuth
-        .getCurrentUser()
-        .linkWithCredential(credential)
-        .addOnCompleteListener(new SignInCompleteListener(result));
-  }
-
-  private void handleUnlinkCredential(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+  private void handleUnlinkFromProvider(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
     Map<String, String> arguments = call.arguments();
     final String provider = arguments.get("provider");
 
diff --git a/packages/firebase_auth/example/lib/main.dart b/packages/firebase_auth/example/lib/main.dart
index 2dce1c78b61a..9d4141e1e58d 100755
--- a/packages/firebase_auth/example/lib/main.dart
+++ b/packages/firebase_auth/example/lib/main.dart
@@ -71,10 +71,11 @@ class _MyHomePageState extends State<MyHomePage> {
     final GoogleSignInAccount googleUser = await _googleSignIn.signIn();
     final GoogleSignInAuthentication googleAuth =
         await googleUser.authentication;
-    final FirebaseUser user = await _auth.signInWithGoogle(
+    final AuthCredential credential = GoogleAuthProvider.getCredential(
       accessToken: googleAuth.accessToken,
       idToken: googleAuth.idToken,
     );
+    final FirebaseUser user = await _auth.signInWithCredential(credential);
     assert(user.email != null);
     assert(user.displayName != null);
     assert(!user.isAnonymous);
@@ -125,11 +126,11 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   Future<String> _testSignInWithPhoneNumber(String smsCode) async {
-    final FirebaseUser user = await _auth.signInWithPhoneNumber(
+    final AuthCredential credential = PhoneAuthProvider.getCredential(
       verificationId: verificationId,
       smsCode: smsCode,
     );
-
+    final FirebaseUser user = await _auth.signInWithCredential(credential);
     final FirebaseUser currentUser = await _auth.currentUser();
     assert(user.uid == currentUser.uid);
 
diff --git a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
index 5bbeaf30a77d..5ed02361aca6 100644
--- a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
+++ b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
@@ -78,38 +78,12 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
         signInAnonymouslyWithCompletion:^(FIRAuthDataResult *authResult, NSError *error) {
           [self sendResult:result forUser:authResult.user error:error];
         }];
-  } else if ([@"signInWithGoogle" isEqualToString:call.method]) {
-    NSString *idToken = call.arguments[@"idToken"];
-    NSString *accessToken = call.arguments[@"accessToken"];
-    FIRAuthCredential *credential = [FIRGoogleAuthProvider credentialWithIDToken:idToken
-                                                                     accessToken:accessToken];
-    [[self getAuth:call.arguments] signInWithCredential:credential
-                                             completion:^(FIRUser *user, NSError *error) {
-                                               [self sendResult:result forUser:user error:error];
-                                             }];
-  } else if ([@"signInWithFacebook" isEqualToString:call.method]) {
-    NSString *accessToken = call.arguments[@"accessToken"];
-    FIRAuthCredential *credential = [FIRFacebookAuthProvider credentialWithAccessToken:accessToken];
-    [[self getAuth:call.arguments] signInWithCredential:credential
-                                             completion:^(FIRUser *user, NSError *error) {
-                                               [self sendResult:result forUser:user error:error];
-                                             }];
-  } else if ([@"signInWithTwitter" isEqualToString:call.method]) {
-    NSString *authToken = call.arguments[@"authToken"];
-    NSString *authTokenSecret = call.arguments[@"authTokenSecret"];
-    FIRAuthCredential *credential = [FIRTwitterAuthProvider credentialWithToken:authToken
-                                                                         secret:authTokenSecret];
-    [[self getAuth:call.arguments] signInWithCredential:credential
-                                             completion:^(FIRUser *user, NSError *error) {
-                                               [self sendResult:result forUser:user error:error];
-                                             }];
-  } else if ([@"signInWithGithub" isEqualToString:call.method]) {
-    NSString *token = call.arguments[@"token"];
-    FIRAuthCredential *credential = [FIRGitHubAuthProvider credentialWithToken:token];
-    [[self getAuth:call.arguments] signInWithCredential:credential
-                                             completion:^(FIRUser *user, NSError *error) {
-                                               [self sendResult:result forUser:user error:error];
-                                             }];
+  } else if ([@"signInWithCredential" isEqualToString:call.method]) {
+    [[self getAuth:call.arguments]
+        signInAndRetrieveDataWithCredential:[self getCredential:call.arguments]
+                                 completion:^(FIRAuthDataResult *authResult, NSError *error) {
+                                   [self sendResult:result forUser:authResult.user error:error];
+                                 }];
   } else if ([@"createUserWithEmailAndPassword" isEqualToString:call.method]) {
     NSString *email = call.arguments[@"email"];
     NSString *password = call.arguments[@"password"];
@@ -171,103 +145,19 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
                       completion:^(NSString *_Nullable token, NSError *_Nullable error) {
                         [self sendResult:result forObject:token error:error];
                       }];
-  } else if ([@"reauthenticateWithEmailAndPassword" isEqualToString:call.method]) {
-    NSString *email = call.arguments[@"email"];
-    NSString *password = call.arguments[@"password"];
-    FIRAuthCredential *credential = [FIREmailAuthProvider credentialWithEmail:email
-                                                                     password:password];
-    [[self getAuth:call.arguments].currentUser
-        reauthenticateWithCredential:credential
-                          completion:^(NSError *_Nullable error) {
-                            [self sendResult:result forObject:nil error:error];
-                          }];
-  } else if ([@"reauthenticateWithGoogleCredential" isEqualToString:call.method]) {
-    NSString *idToken = call.arguments[@"idToken"];
-    NSString *accessToken = call.arguments[@"accessToken"];
-    FIRAuthCredential *credential = [FIRGoogleAuthProvider credentialWithIDToken:idToken
-                                                                     accessToken:accessToken];
+  } else if ([@"reauthenticateWithCredential" isEqualToString:call.method]) {
     [[self getAuth:call.arguments].currentUser
-        reauthenticateWithCredential:credential
+        reauthenticateWithCredential:[self getCredential:call.arguments]
                           completion:^(NSError *_Nullable error) {
                             [self sendResult:result forObject:nil error:error];
                           }];
-  } else if ([@"reauthenticateWithFacebookCredential" isEqualToString:call.method]) {
-    NSString *accessToken = call.arguments[@"accessToken"];
-    FIRAuthCredential *credential = [FIRFacebookAuthProvider credentialWithAccessToken:accessToken];
+  } else if ([@"linkWithCredential" isEqualToString:call.method]) {
     [[self getAuth:call.arguments].currentUser
-        reauthenticateWithCredential:credential
-                          completion:^(NSError *_Nullable error) {
-                            [self sendResult:result forObject:nil error:error];
-                          }];
-  } else if ([@"reauthenticateWithTwitterCredential" isEqualToString:call.method]) {
-    NSString *authToken = call.arguments[@"authToken"];
-    NSString *authTokenSecret = call.arguments[@"authTokenSecret"];
-    FIRAuthCredential *credential = [FIRTwitterAuthProvider credentialWithToken:authToken
-                                                                         secret:authTokenSecret];
-    [[self getAuth:call.arguments].currentUser
-        reauthenticateWithCredential:credential
-                          completion:^(NSError *_Nullable error) {
-                            [self sendResult:result forObject:nil error:error];
-                          }];
-  } else if ([@"reauthenticateWithGithubCredential" isEqualToString:call.method]) {
-    NSString *token = call.arguments[@"token"];
-    FIRAuthCredential *credential = [FIRGitHubAuthProvider credentialWithToken:token];
-    [[self getAuth:call.arguments].currentUser
-        reauthenticateWithCredential:credential
-                          completion:^(NSError *_Nullable error) {
-                            [self sendResult:result forObject:nil error:error];
-                          }];
-  } else if ([@"linkWithEmailAndPassword" isEqualToString:call.method]) {
-    NSString *email = call.arguments[@"email"];
-    NSString *password = call.arguments[@"password"];
-    FIRAuthCredential *credential = [FIREmailAuthProvider credentialWithEmail:email
-                                                                     password:password];
-    [[self getAuth:call.arguments].currentUser linkWithCredential:credential
-                                                       completion:^(FIRUser *user, NSError *error) {
-                                                         [self sendResult:result
-                                                                  forUser:user
-                                                                    error:error];
-                                                       }];
-  } else if ([@"linkWithGoogleCredential" isEqualToString:call.method]) {
-    NSString *idToken = call.arguments[@"idToken"];
-    NSString *accessToken = call.arguments[@"accessToken"];
-    FIRAuthCredential *credential = [FIRGoogleAuthProvider credentialWithIDToken:idToken
-                                                                     accessToken:accessToken];
-    [[self getAuth:call.arguments].currentUser linkWithCredential:credential
-                                                       completion:^(FIRUser *user, NSError *error) {
-                                                         [self sendResult:result
-                                                                  forUser:user
-                                                                    error:error];
-                                                       }];
-  } else if ([@"linkWithFacebookCredential" isEqualToString:call.method]) {
-    NSString *accessToken = call.arguments[@"accessToken"];
-    FIRAuthCredential *credential = [FIRFacebookAuthProvider credentialWithAccessToken:accessToken];
-    [[self getAuth:call.arguments].currentUser linkWithCredential:credential
-                                                       completion:^(FIRUser *user, NSError *error) {
-                                                         [self sendResult:result
-                                                                  forUser:user
-                                                                    error:error];
-                                                       }];
-  } else if ([@"linkWithTwitterCredential" isEqualToString:call.method]) {
-    NSString *authToken = call.arguments[@"authToken"];
-    NSString *authTokenSecret = call.arguments[@"authTokenSecret"];
-    FIRAuthCredential *credential = [FIRTwitterAuthProvider credentialWithToken:authToken
-                                                                         secret:authTokenSecret];
-    [[self getAuth:call.arguments].currentUser linkWithCredential:credential
-                                                       completion:^(FIRUser *user, NSError *error) {
-                                                         [self sendResult:result
-                                                                  forUser:user
-                                                                    error:error];
-                                                       }];
-  } else if ([@"linkWithGithubCredential" isEqualToString:call.method]) {
-    NSString *token = call.arguments[@"token"];
-    FIRAuthCredential *credential = [FIRGitHubAuthProvider credentialWithToken:token];
-    [[self getAuth:call.arguments].currentUser
-        linkWithCredential:credential
-                completion:^(FIRUser *_Nullable user, NSError *_Nullable error) {
+        linkWithCredential:[self getCredential:call.arguments]
+                completion:^(FIRUser *user, NSError *error) {
                   [self sendResult:result forUser:user error:error];
                 }];
-  } else if ([@"unlinkCredential" isEqualToString:call.method]) {
+  } else if ([@"unlinkFromProvider" isEqualToString:call.method]) {
     NSString *provider = call.arguments[@"provider"];
     [[self getAuth:call.arguments].currentUser
         unlinkFromProvider:provider
@@ -433,4 +323,38 @@ - (id)mapVerifyPhoneError:(NSError *)error {
   }
   return @{@"code" : errorCode, @"message" : error.localizedDescription};
 }
+
+- (FIRAuthCredential *)getCredential:(NSDictionary *)arguments {
+  NSString *provider = arguments[@"provider"];
+  NSDictionary *data = arguments[@"data"];
+  FIRAuthCredential *credential;
+  if ([FIREmailAuthProviderID isEqualToString:provider]) {
+    NSString *email = data[@"email"];
+    NSString *password = data[@"password"];
+    credential = [FIREmailAuthProvider credentialWithEmail:email password:password];
+  } else if ([FIRGoogleAuthProviderID isEqualToString:provider]) {
+    NSString *idToken = data[@"idToken"];
+    NSString *accessToken = data[@"accessToken"];
+    credential = [FIRGoogleAuthProvider credentialWithIDToken:idToken accessToken:accessToken];
+  } else if ([FIRFacebookAuthProviderID isEqualToString:provider]) {
+    NSString *accessToken = data[@"accessToken"];
+    credential = [FIRFacebookAuthProvider credentialWithAccessToken:accessToken];
+  } else if ([FIRTwitterAuthProviderID isEqualToString:provider]) {
+    NSString *authToken = data[@"authToken"];
+    NSString *authTokenSecret = data[@"authTokenSecret"];
+    credential = [FIRTwitterAuthProvider credentialWithToken:authToken secret:authTokenSecret];
+  } else if ([FIRGitHubAuthProviderID isEqualToString:provider]) {
+    NSString *token = data[@"token"];
+    credential = [FIRGitHubAuthProvider credentialWithToken:token];
+  } else if ([FIRPhoneAuthProviderID isEqualToString:provider]) {
+    NSString *verificationId = data[@"verificationId"];
+    NSString *smsCode = data[@"smsCode"];
+    credential = [[FIRPhoneAuthProvider providerWithAuth:[self getAuth:arguments]]
+        credentialWithVerificationID:verificationId
+                    verificationCode:smsCode];
+  } else {
+    NSLog(@"Support for an auth provider with identifier '%@' is not implemented.", provider);
+  }
+  return credential;
+}
 @end
diff --git a/packages/firebase_auth/lib/firebase_auth.dart b/packages/firebase_auth/lib/firebase_auth.dart
index 1c377e581ab6..1f31ead02dc0 100755
--- a/packages/firebase_auth/lib/firebase_auth.dart
+++ b/packages/firebase_auth/lib/firebase_auth.dart
@@ -1,6 +1,8 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// Copyright 2018, the Flutter project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library firebase_auth;
 
 import 'dart:async';
 
@@ -8,1036 +10,16 @@ import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
 
-/// Represents user data returned from an identity provider.
-
-class FirebaseUserMetadata {
-  FirebaseUserMetadata._(this._data);
-
-  final Map<dynamic, dynamic> _data;
-
-  int get creationTimestamp => _data['creationTimestamp'];
-
-  int get lastSignInTimestamp => _data['lastSignInTimestamp'];
-}
-
-class UserInfo {
-  UserInfo._(this._data, this._app);
-
-  final FirebaseApp _app;
-
-  final Map<dynamic, dynamic> _data;
-
-  /// The provider identifier.
-  String get providerId => _data['providerId'];
-
-  /// The provider’s user ID for the user.
-  String get uid => _data['uid'];
-
-  /// The name of the user.
-  String get displayName => _data['displayName'];
-
-  /// The URL of the user’s profile photo.
-  String get photoUrl => _data['photoUrl'];
-
-  /// The user’s email address.
-  String get email => _data['email'];
-
-  /// The user's phone number.
-  String get phoneNumber => _data['phoneNumber'];
-
-  @override
-  String toString() {
-    return '$runtimeType($_data)';
-  }
-}
-
-/// Represents user profile data that can be updated by [updateProfile]
-///
-/// The purpose of having separate class with a map is to give possibility
-/// to check if value was set to null or not provided
-class UserUpdateInfo {
-  /// Container of data that will be send in update request
-  final Map<String, String> _updateData = <String, String>{};
-
-  set displayName(String displayName) =>
-      _updateData['displayName'] = displayName;
-
-  String get displayName => _updateData['displayName'];
-
-  set photoUrl(String photoUri) => _updateData['photoUrl'] = photoUri;
-
-  String get photoUrl => _updateData['photoUrl'];
-}
-
-/// Represents a user.
-class FirebaseUser extends UserInfo {
-  FirebaseUser._(Map<dynamic, dynamic> data, FirebaseApp app)
-      : providerData = data['providerData']
-            .map<UserInfo>((dynamic item) => UserInfo._(item, app))
-            .toList(),
-        _metadata = FirebaseUserMetadata._(data),
-        super._(data, app);
-
-  final List<UserInfo> providerData;
-  final FirebaseUserMetadata _metadata;
-
-  // Returns true if the user is anonymous; that is, the user account was
-  // created with signInAnonymously() and has not been linked to another
-  // account.
-  FirebaseUserMetadata get metadata => _metadata;
-
-  bool get isAnonymous => _data['isAnonymous'];
-
-  /// Returns true if the user's email is verified.
-  bool get isEmailVerified => _data['isEmailVerified'];
-
-  /// Obtains the id token for the current user, forcing a [refresh] if desired.
-  ///
-  /// Useful when authenticating against your own backend. Use our server
-  /// SDKs or follow the official documentation to securely verify the
-  /// integrity and validity of this token.
-  ///
-  /// Completes with an error if the user is signed out.
-  Future<String> getIdToken({bool refresh = false}) async {
-    return await FirebaseAuth.channel
-        .invokeMethod('getIdToken', <String, dynamic>{
-      'refresh': refresh,
-      'app': _app.name,
-    });
-  }
-
-  /// Initiates email verification for the user.
-  Future<void> sendEmailVerification() async {
-    await FirebaseAuth.channel.invokeMethod(
-        'sendEmailVerification', <String, String>{'app': _app.name});
-  }
-
-  /// Manually refreshes the data of the current user (for example,
-  /// attached providers, display name, and so on).
-  Future<void> reload() async {
-    await FirebaseAuth.channel
-        .invokeMethod('reload', <String, String>{'app': _app.name});
-  }
-
-  /// Deletes the user record from your Firebase project's database.
-  Future<void> delete() async {
-    await FirebaseAuth.channel
-        .invokeMethod('delete', <String, String>{'app': _app.name});
-  }
-
-  /// Updates the email address of the user.
-  ///
-  /// The original email address recipient will receive an email that allows
-  /// them to revoke the email address change, in order to protect them
-  /// from account hijacking.
-  ///
-  /// **Important**: This is a security sensitive operation that requires
-  /// the user to have recently signed in.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the email address is malformed.
-  ///   • `ERROR_EMAIL_ALREADY_IN_USE` - If the email is already in use by a different account.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
-  Future<void> updateEmail(String email) async {
-    assert(email != null);
-    return await FirebaseAuth.channel.invokeMethod(
-      'updateEmail',
-      <String, String>{'email': email, 'app': _app.name},
-    );
-  }
-
-  /// Updates the password of the user.
-  ///
-  /// Anonymous users who update both their email and password will no
-  /// longer be anonymous. They will be able to log in with these credentials.
-  ///
-  /// **Important**: This is a security sensitive operation that requires
-  /// the user to have recently signed in.
-  ///
-  /// Errors:
-  ///   • `ERROR_WEAK_PASSWORD` - If the password is not strong enough.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
-  Future<void> updatePassword(String password) async {
-    assert(password != null);
-    return await FirebaseAuth.channel.invokeMethod(
-      'updatePassword',
-      <String, String>{'password': password, 'app': _app.name},
-    );
-  }
-
-  /// Updates the user profile information.
-  ///
-  /// Errors:
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
-  Future<void> updateProfile(UserUpdateInfo userUpdateInfo) async {
-    assert(userUpdateInfo != null);
-    final Map<String, String> data = userUpdateInfo._updateData;
-    data['app'] = _app.name;
-    return await FirebaseAuth.channel.invokeMethod(
-      'updateProfile',
-      data,
-    );
-  }
-
-  /// Detaches Email & Password from this user.
-  ///
-  /// This detaches the Email & Password from the current user. This will
-  /// prevent the user from signing in to this account with those credentials.
-  ///
-  /// **Important**: This is a security sensitive operation that requires
-  /// the user to have recently signed in.
-  ///
-  /// Errors:
-  ///   • `ERROR_NO_SUCH_PROVIDER` - If the user does not have an Email & Password linked to their account.
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  Future<void> unlinkEmailAndPassword() async {
-    return await FirebaseAuth.channel.invokeMethod(
-      'unlinkCredential',
-      <String, String>{'provider': 'password', 'app': _app.name},
-    );
-  }
-
-  /// Detaches Google from this user.
-  ///
-  /// This detaches the Google Account from the current user. This will
-  /// prevent the user from signing in to this account with those credentials.
-  ///
-  /// **Important**: This is a security sensitive operation that requires
-  /// the user to have recently signed in.
-  ///
-  /// Errors:
-  ///   • `ERROR_NO_SUCH_PROVIDER` - If the user does not have a Google Account linked to their account.
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  Future<void> unlinkGoogleCredential() async {
-    return await FirebaseAuth.channel.invokeMethod(
-      'unlinkCredential',
-      <String, String>{'provider': 'google.com', 'app': _app.name},
-    );
-  }
-
-  /// Detaches Facebook from this user.
-  ///
-  /// This detaches the Facebook Account from the current user. This will
-  /// prevent the user from signing in to this account with those credentials.
-  ///
-  /// **Important**: This is a security sensitive operation that requires
-  /// the user to have recently signed in.
-  ///
-  /// Errors:
-  ///   • `ERROR_NO_SUCH_PROVIDER` - If the user does not have a Facebook Account linked to their account.
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  Future<void> unlinkFacebookCredential() async {
-    return await FirebaseAuth.channel.invokeMethod(
-      'unlinkCredential',
-      <String, String>{'provider': 'facebook.com', 'app': _app.name},
-    );
-  }
-
-  /// Detaches Twitter from this user.
-  ///
-  /// This detaches the Twitter Account from the current user. This will
-  /// prevent the user from signing in to this account with those credentials.
-  ///
-  /// **Important**: This is a security sensitive operation that requires
-  /// the user to have recently signed in.
-  ///
-  /// Errors:
-  ///   • `ERROR_NO_SUCH_PROVIDER` - If the user does not have a Twitter Account linked to their account.
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  Future<void> unlinkTwitterCredential() async {
-    return await FirebaseAuth.channel.invokeMethod(
-      'unlinkCredential',
-      <String, String>{'provider': 'twitter.com', 'app': _app.name},
-    );
-  }
-
-  /// Detaches Github from this user.
-  ///
-  /// This detaches the Github Account from the current user. This will
-  /// prevent the user from signing in to this account with those credentials.
-  ///
-  /// **Important**: This is a security sensitive operation that requires
-  /// the user to have recently signed in.
-  ///
-  /// Errors:
-  ///   • `ERROR_NO_SUCH_PROVIDER` - If the user does not have a Github Account linked to their account.
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  Future<void> unlinkGithubCredential() async {
-    return await FirebaseAuth.channel.invokeMethod(
-      'unlinkCredential',
-      <String, String>{'provider': 'github.com', 'app': _app.name},
-    );
-  }
-
-  @override
-  String toString() {
-    return '$runtimeType($_data)';
-  }
-}
-
-class AuthException implements Exception {
-  const AuthException(this.code, this.message);
-
-  final String code;
-  final String message;
-}
-
-typedef void PhoneVerificationCompleted(FirebaseUser firebaseUser);
-typedef void PhoneVerificationFailed(AuthException error);
-typedef void PhoneCodeSent(String verificationId, [int forceResendingToken]);
-typedef void PhoneCodeAutoRetrievalTimeout(String verificationId);
-
-class FirebaseAuth {
-  FirebaseAuth._(this.app) {
-    channel.setMethodCallHandler(_callHandler);
-  }
-
-  /// Provides an instance of this class corresponding to `app`.
-  factory FirebaseAuth.fromApp(FirebaseApp app) {
-    assert(app != null);
-    return FirebaseAuth._(app);
-  }
-
-  /// Provides an instance of this class corresponding to the default app.
-  static final FirebaseAuth instance = FirebaseAuth._(FirebaseApp.instance);
-
-  @visibleForTesting
-  static const MethodChannel channel = MethodChannel(
-    'plugins.flutter.io/firebase_auth',
-  );
-
-  final Map<int, StreamController<FirebaseUser>> _authStateChangedControllers =
-      <int, StreamController<FirebaseUser>>{};
-
-  static int nextHandle = 0;
-  final Map<int, Map<String, dynamic>> _phoneAuthCallbacks =
-      <int, Map<String, dynamic>>{};
-
-  final FirebaseApp app;
-
-  /// Receive [FirebaseUser] each time the user signIn or signOut
-  Stream<FirebaseUser> get onAuthStateChanged {
-    Future<int> _handle;
-
-    StreamController<FirebaseUser> controller;
-    controller = StreamController<FirebaseUser>.broadcast(onListen: () {
-      _handle = channel.invokeMethod('startListeningAuthState',
-          <String, String>{"app": app.name}).then<int>((dynamic v) => v);
-      _handle.then((int handle) {
-        _authStateChangedControllers[handle] = controller;
-      });
-    }, onCancel: () {
-      _handle.then((int handle) async {
-        await channel.invokeMethod("stopListeningAuthState",
-            <String, dynamic>{"id": handle, "app": app.name});
-        _authStateChangedControllers.remove(handle);
-      });
-    });
-
-    return controller.stream;
-  }
-
-  /// Asynchronously creates and becomes an anonymous user.
-  ///
-  /// If there is already an anonymous user signed in, that user will be
-  /// returned instead. If there is any other existing user signed in, that
-  /// user will be signed out.
-  ///
-  /// **Important**: You must enable Anonymous accounts in the Auth section
-  /// of the Firebase console before being able to use them.
-  ///
-  /// Errors:
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Anonymous accounts are not enabled.
-  Future<FirebaseUser> signInAnonymously() async {
-    final Map<dynamic, dynamic> data = await channel
-        .invokeMethod('signInAnonymously', <String, String>{"app": app.name});
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Tries to create a new user account with the given email address and password.
-  ///
-  /// If successful, it also signs the user in into the app and updates
-  /// the [onAuthStateChanged] stream.
-  ///
-  /// Errors:
-  ///   • `ERROR_WEAK_PASSWORD` - If the password is not strong enough.
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the email address is malformed.
-  ///   • `ERROR_EMAIL_ALREADY_IN_USE` - If the email is already in use by a different account.
-  Future<FirebaseUser> createUserWithEmailAndPassword({
-    @required String email,
-    @required String password,
-  }) async {
-    assert(email != null);
-    assert(password != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-      'createUserWithEmailAndPassword',
-      <String, String>{'email': email, 'password': password, 'app': app.name},
-    );
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Returns a list of sign-in methods that can be used to sign in a given
-  /// user (identified by its main email address).
-  ///
-  /// This method is useful when you support multiple authentication mechanisms
-  /// if you want to implement an email-first authentication flow.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [email] address is malformed.
-  ///   • `ERROR_USER_NOT_FOUND` - If there is no user corresponding to the given [email] address.
-  Future<List<String>> fetchSignInMethodsForEmail({
-    @required String email,
-  }) async {
-    assert(email != null);
-    final List<dynamic> providers = await channel.invokeMethod(
-      'fetchSignInMethodsForEmail',
-      <String, String>{'email': email, 'app': app.name},
-    );
-    return providers?.cast<String>();
-  }
-
-  /// Triggers the Firebase Authentication backend to send a password-reset
-  /// email to the given email address, which must correspond to an existing
-  /// user of your app.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_EMAIL` - If the [email] address is malformed.
-  ///   • `ERROR_USER_NOT_FOUND` - If there is no user corresponding to the given [email] address.
-  Future<void> sendPasswordResetEmail({
-    @required String email,
-  }) async {
-    assert(email != null);
-    return await channel.invokeMethod(
-      'sendPasswordResetEmail',
-      <String, String>{'email': email, 'app': app.name},
-    );
-  }
-
-  /// Tries to sign in a user with the given email address and password.
-  ///
-  /// If successful, it also signs the user in into the app and updates
-  /// the [onAuthStateChanged] stream.
-  ///
-  /// **Important**: You must enable Email & Password accounts in the Auth
-  /// section of the Firebase console before being able to use them.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_EMAIL` - If the [email] address is malformed.
-  ///   • `ERROR_WRONG_PASSWORD` - If the [password] is wrong.
-  ///   • `ERROR_USER_NOT_FOUND` - If there is no user corresponding to the given [email] address, or if the user has been deleted.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_TOO_MANY_REQUESTS` - If there was too many attempts to sign in as this user.
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
-  Future<FirebaseUser> signInWithEmailAndPassword({
-    @required String email,
-    @required String password,
-  }) async {
-    assert(email != null);
-    assert(password != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-      'signInWithEmailAndPassword',
-      <String, String>{'email': email, 'password': password, 'app': app.name},
-    );
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Tries to sign in a user with the given Google [idToken] and [accessToken].
-  ///
-  /// If successful, it also signs the user in into the app and updates
-  /// the [onAuthStateChanged] stream.
-  ///
-  /// If the user doesn't have an account already, one will be created automatically.
-  ///
-  /// **Important**: You must enable Google accounts in the Auth section
-  /// of the Firebase console before being able to use them.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [authToken] or [authTokenSecret] is malformed or has expired.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_ACCOUNT_EXISTS_WITH_DIFFERENT_CREDENTIAL` - If there already exists an account with the email address asserted by Google.
-  ///       Resolve this case by calling [fetchSignInMethodsForEmail] and then asking the user to sign in using one of them.
-  ///       This error will only be thrown if the "One account per email address" setting is enabled in the Firebase console (recommended).
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Google accounts are not enabled.
-  Future<FirebaseUser> signInWithGoogle({
-    @required String idToken,
-    @required String accessToken,
-  }) async {
-    assert(idToken != null);
-    assert(accessToken != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-      'signInWithGoogle',
-      <String, String>{
-        'idToken': idToken,
-        'accessToken': accessToken,
-        'app': app.name,
-      },
-    );
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Tries to sign in a user with the given Facebook [accessToken].
-  ///
-  /// If successful, it also signs the user in into the app and updates
-  /// the [onAuthStateChanged] stream.
-  ///
-  /// If the user doesn't have an account already, one will be created automatically.
-  ///
-  /// **Important**: You must enable Facebook accounts in the Auth section
-  /// of the Firebase console before being able to use them.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [accessToken] is malformed or has expired.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_ACCOUNT_EXISTS_WITH_DIFFERENT_CREDENTIAL` - If there already exists an account with the email address asserted by Facebook.
-  ///       Resolve this case by calling [fetchSignInMethodsForEmail] and then asking the user to sign in using one of them.
-  ///       This error will only be thrown if the "One account per email address" setting is enabled in the Firebase console (recommended).
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Facebook accounts are not enabled.
-  Future<FirebaseUser> signInWithFacebook(
-      {@required String accessToken}) async {
-    assert(accessToken != null);
-    final Map<dynamic, dynamic> data =
-        await channel.invokeMethod('signInWithFacebook', <String, String>{
-      'accessToken': accessToken,
-      'app': app.name,
-    });
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Tries to sign in a user with the given Twitter [authToken] and [authTokenSecret].
-  ///
-  /// If successful, it also signs the user in into the app and updates
-  /// the [onAuthStateChanged] stream.
-  ///
-  /// If the user doesn't have an account already, one will be created automatically.
-  ///
-  /// **Important**: You must enable Twitter accounts in the Auth section
-  /// of the Firebase console before being able to use them.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [authToken] or [authTokenSecret] is malformed or has expired.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_ACCOUNT_EXISTS_WITH_DIFFERENT_CREDENTIAL` - If there already exists an account with the email address asserted by Twitter.
-  ///       Resolve this case by calling [fetchSignInMethodsForEmail] and then asking the user to sign in using one of them.
-  ///       This error will only be thrown if the "One account per email address" setting is enabled in the Firebase console (recommended).
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Twitter accounts are not enabled.
-  Future<FirebaseUser> signInWithTwitter({
-    @required String authToken,
-    @required String authTokenSecret,
-  }) async {
-    assert(authToken != null);
-    assert(authTokenSecret != null);
-    final Map<dynamic, dynamic> data =
-        await channel.invokeMethod('signInWithTwitter', <String, String>{
-      'authToken': authToken,
-      'authTokenSecret': authTokenSecret,
-      'app': app.name,
-    });
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Tries to sign in a user with the given Github [token].
-  ///
-  /// If successful, it also signs the user in into the app and updates
-  /// the [onAuthStateChanged] stream.
-  ///
-  /// If the user doesn't have an account already, one will be created automatically.
-  ///
-  /// **Important**: You must enable Github accounts in the Auth section
-  /// of the Firebase console before being able to use them.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [token] is malformed or has expired.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_ACCOUNT_EXISTS_WITH_DIFFERENT_CREDENTIAL` - If there already exists an account with the email address asserted by Github.
-  ///       Resolve this case by calling [fetchSignInMethodsForEmail] and then asking the user to sign in using one of them.
-  ///       This error will only be thrown if the "One account per email address" setting is enabled in the Firebase console (recommended).
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Github accounts are not enabled.
-  Future<FirebaseUser> signInWithGithub({
-    @required String token,
-  }) async {
-    assert(token != null);
-    final Map<dynamic, dynamic> data =
-        await channel.invokeMethod('signInWithGithub', <String, String>{
-      'token': token,
-      'app': app.name,
-    });
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Tries to sign in a user with the given Phone [verificationId] and [smsCode].
-  ///
-  /// If successful, it also signs the user in into the app and updates
-  /// the [onAuthStateChanged] stream.
-  ///
-  /// If the user doesn't have an account already, one will be created automatically.
-  ///
-  /// **Important**: You must enable Phone accounts in the Auth section
-  /// of the Firebase console before being able to use them.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [verificationId] or [smsCode] is malformed or has expired.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Phone accounts are not enabled.
-  Future<FirebaseUser> signInWithPhoneNumber({
-    @required String verificationId,
-    @required String smsCode,
-  }) async {
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-      'signInWithPhoneNumber',
-      <String, String>{
-        'verificationId': verificationId,
-        'smsCode': smsCode,
-        'app': app.name,
-      },
-    );
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Starts the phone number verification process for the given phone number.
-  ///
-  /// Either sends an SMS with a 6 digit code to the phone number specified,
-  /// or sign's the user in and [verificationCompleted] is called.
-  ///
-  /// No duplicated SMS will be sent out upon re-entry (before timeout).
-  ///
-  /// Make sure to test all scenarios below:
-  ///   • You directly get logged in if Google Play Services verified the phone
-  ///     number instantly or helped you auto-retrieve the verification code.
-  ///   • Auto-retrieve verification code timed out.
-  ///   • Error cases when you receive [verificationFailed] callback.
-  ///
-  /// [phoneNumber] The phone number for the account the user is signing up
-  ///   for or signing into. Make sure to pass in a phone number with country
-  ///   code prefixed with plus sign ('+').
-  ///
-  /// [timeout] The maximum amount of time you are willing to wait for SMS
-  ///   auto-retrieval to be completed by the library. Maximum allowed value
-  ///   is 2 minutes. Use 0 to disable SMS-auto-retrieval. Setting this to 0
-  ///   will also cause [codeAutoRetrievalTimeout] to be called immediately.
-  ///   If you specified a positive value less than 30 seconds, library will
-  ///   default to 30 seconds.
-  ///
-  /// [forceResendingToken] The [forceResendingToken] obtained from [codeSent]
-  ///   callback to force re-sending another verification SMS before the
-  ///   auto-retrieval timeout.
-  ///
-  /// [verificationCompleted] This callback must be implemented.
-  ///   It will trigger when an SMS is auto-retrieved or the phone number has
-  ///   been instantly verified. The callback will provide a [FirebaseUser].
-  ///
-  /// [verificationFailed] This callback must be implemented.
-  ///   Triggered when an error occurred during phone number verification.
-  ///
-  /// [codeSent] Optional callback.
-  ///   It will trigger when an SMS has been sent to the users phone,
-  ///   and will include a [verificationId] and [forceResendingToken].
-  ///
-  /// [codeAutoRetrievalTimeout] Optional callback.
-  ///   It will trigger when SMS auto-retrieval times out and provide a
-  ///   [verificationId].
-  Future<void> verifyPhoneNumber({
-    @required String phoneNumber,
-    @required Duration timeout,
-    int forceResendingToken,
-    @required PhoneVerificationCompleted verificationCompleted,
-    @required PhoneVerificationFailed verificationFailed,
-    @required PhoneCodeSent codeSent,
-    @required PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout,
-  }) async {
-    final Map<String, dynamic> callbacks = <String, dynamic>{
-      'PhoneVerificationCompleted': verificationCompleted,
-      'PhoneVerificationFailed': verificationFailed,
-      'PhoneCodeSent': codeSent,
-      'PhoneCodeAuthRetrievalTimeout': codeAutoRetrievalTimeout,
-    };
-    nextHandle += 1;
-    _phoneAuthCallbacks[nextHandle] = callbacks;
-
-    final Map<String, dynamic> params = <String, dynamic>{
-      'handle': nextHandle,
-      'phoneNumber': phoneNumber,
-      'timeout': timeout.inMilliseconds,
-      'forceResendingToken': forceResendingToken,
-      'app': app.name,
-    };
-
-    await channel.invokeMethod('verifyPhoneNumber', params);
-  }
-
-  /// Tries to sign in a user with a given Custom Token [token].
-  ///
-  /// If successful, it also signs the user in into the app and updates
-  /// the [onAuthStateChanged] stream.
-  ///
-  /// Use this method after you retrieve a Firebase Auth Custom Token from your server.
-  ///
-  /// If the user identified by the [uid] specified in the token doesn't
-  /// have an account already, one will be created automatically.
-  ///
-  /// Read how to use Custom Token authentication and the cases where it is
-  /// useful in [the guides](https://firebase.google.com/docs/auth/android/custom-auth).
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CUSTOM_TOKEN` - The custom token format is incorrect.
-  ///     Please check the documentation.
-  ///   • `ERROR_CUSTOM_TOKEN_MISMATCH` - Invalid configuration.
-  ///     Ensure your app's SHA1 is correct in the Firebase console.
-  Future<FirebaseUser> signInWithCustomToken({@required String token}) async {
-    assert(token != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-      'signInWithCustomToken',
-      <String, String>{'token': token, 'app': app.name},
-    );
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Signs out the current user and clears it from the disk cache.
-  ///
-  /// If successful, it signs the user out of the app and updates
-  /// the [onAuthStateChanged] stream.
-  Future<void> signOut() async {
-    return await channel
-        .invokeMethod("signOut", <String, String>{'app': app.name});
-  }
-
-  /// Returns the currently signed-in [FirebaseUser] or [null] if there is none.
-  Future<FirebaseUser> currentUser() async {
-    final Map<dynamic, dynamic> data = await channel
-        .invokeMethod("currentUser", <String, String>{'app': app.name});
-    final FirebaseUser currentUser =
-        data == null ? null : FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Links the given [email] and [password] to the current user.
-  ///
-  /// This allows the user to sign in to this account in the future with
-  /// the given [email] and [password].
-  ///
-  /// Errors:
-  ///   • `ERROR_WEAK_PASSWORD` - If the password is not strong enough.
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the email address is malformed.
-  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the email is already in use by a different account.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has an Email & Password linked.
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
-  Future<FirebaseUser> linkWithEmailAndPassword({
-    @required String email,
-    @required String password,
-  }) async {
-    assert(email != null);
-    assert(password != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-      'linkWithEmailAndPassword',
-      <String, String>{'email': email, 'password': password, 'app': app.name},
-    );
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Links the Google Account to the current user using [idToken] and [accessToken].
-  ///
-  /// This allows the user to sign in to this account in the future with
-  /// the given Google Account.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [idToken] or [accessToken] is malformed or has expired.
-  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the Google account is already in use by a different account.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has a Google account linked.
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Google accounts are not enabled.
-  Future<FirebaseUser> linkWithGoogleCredential({
-    @required String idToken,
-    @required String accessToken,
-  }) async {
-    assert(idToken != null);
-    assert(accessToken != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-      'linkWithGoogleCredential',
-      <String, String>{
-        'idToken': idToken,
-        'accessToken': accessToken,
-        'app': app.name,
-      },
-    );
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Links the Facebook Account to the current user using [accessToken].
-  ///
-  /// This allows the user to sign in to this account in the future with
-  /// the given Facebook Account.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [accessToken] is malformed or has expired.
-  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the Facebook account is already in use by a different account.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has a Facebook account linked.
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Facebook accounts are not enabled.
-  Future<FirebaseUser> linkWithFacebookCredential({
-    @required String accessToken,
-  }) async {
-    assert(accessToken != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-      'linkWithFacebookCredential',
-      <String, String>{
-        'accessToken': accessToken,
-        'app': app.name,
-      },
-    );
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Links the Twitter Account to the current user using [authToken] and [authTokenSecret].
-  ///
-  /// This allows the user to sign in to this account in the future with
-  /// the given Twitter Account.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [authToken] or [authTokenSecret] is malformed or has expired.
-  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the Twitter account is already in use by a different account.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has a Twitter account linked.
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Twitter accounts are not enabled.
-  Future<FirebaseUser> linkWithTwitterCredential({
-    @required String authToken,
-    @required String authTokenSecret,
-  }) async {
-    assert(authToken != null);
-    assert(authTokenSecret != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-      'linkWithTwitterCredential',
-      <String, String>{
-        'authToken': authToken,
-        'authTokenSecret': authTokenSecret,
-        'app': app.name,
-      },
-    );
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Links the Github Account to the current user using [token].
-  ///
-  /// This allows the user to sign in to this account in the future with
-  /// the given Github Account.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [token] is malformed or has expired.
-  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the Github account is already in use by a different account.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has a Github account linked.
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Github accounts are not enabled.
-  Future<FirebaseUser> linkWithGithubCredential({
-    @required String token,
-  }) async {
-    assert(token != null);
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-      'linkWithGithubCredential',
-      <String, String>{
-        'app': app.name,
-        'token': token,
-      },
-    );
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
-  /// Reauthenticates the current user with given [email] and [password].
-  ///
-  /// This is used to prevent or resolve `ERROR_REQUIRES_RECENT_LOGIN`
-  /// response to operations that require a recent sign-in.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [email] and/or [password] are incorrect.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
-  Future<void> reauthenticateWithEmailAndPassword({
-    @required String email,
-    @required String password,
-  }) {
-    assert(email != null);
-    assert(password != null);
-    return channel.invokeMethod(
-      'reauthenticateWithEmailAndPassword',
-      <String, String>{'email': email, 'password': password, 'app': app.name},
-    );
-  }
-
-  /// Reauthenticates the current user with the Google Account specified by [idToken] and [accessToken].
-  ///
-  /// This is used to prevent or resolve `ERROR_REQUIRES_RECENT_LOGIN`
-  /// response to operations that require a recent sign-in.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [idToken] or [accessToken] is malformed or has expired.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
-  Future<void> reauthenticateWithGoogleCredential({
-    @required String idToken,
-    @required String accessToken,
-  }) {
-    assert(idToken != null);
-    assert(accessToken != null);
-    return channel.invokeMethod(
-      'reauthenticateWithGoogleCredential',
-      <String, String>{
-        'idToken': idToken,
-        'accessToken': accessToken,
-        'app': app.name
-      },
-    );
-  }
-
-  /// Reauthenticates the current user with the Facebook Account specified by [accessToken].
-  ///
-  /// This is used to prevent or resolve `ERROR_REQUIRES_RECENT_LOGIN`
-  /// response to operations that require a recent sign-in.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [accessToken] is malformed or has expired.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
-  Future<void> reauthenticateWithFacebookCredential({
-    @required String accessToken,
-  }) {
-    assert(accessToken != null);
-    return channel.invokeMethod(
-      'reauthenticateWithFacebookCredential',
-      <String, String>{'accessToken': accessToken, 'app': app.name},
-    );
-  }
-
-  /// Reauthenticates the current user with the Twitter Account specified by [authToken] and [authTokenSecret].
-  ///
-  /// This is used to prevent or resolve `ERROR_REQUIRES_RECENT_LOGIN`
-  /// response to operations that require a recent sign-in.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [authToken] or [authTokenSecret] is malformed or has expired.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
-  Future<void> reauthenticateWithTwitterCredential({
-    @required String authToken,
-    @required String authTokenSecret,
-  }) {
-    return channel.invokeMethod(
-      'reauthenticateWithTwitterCredential',
-      <String, String>{
-        'app': app.name,
-        'authToken': authToken,
-        'authTokenSecret': authTokenSecret,
-      },
-    );
-  }
-
-  /// Reauthenticates the current user with the Github Account specified by [token].
-  ///
-  /// This is used to prevent or resolve `ERROR_REQUIRES_RECENT_LOGIN`
-  /// response to operations that require a recent sign-in.
-  ///
-  /// Errors:
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the [token] is malformed or has expired.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
-  Future<void> reauthenticateWithGithubCredential({@required String token}) {
-    assert(token != null);
-    return channel.invokeMethod(
-      'reauthenticateWithGithubCredential',
-      <String, String>{
-        'app': app.name,
-        'token': token,
-      },
-    );
-  }
-
-  /// Sets the user-facing language code for auth operations that can be
-  /// internationalized, such as [sendEmailVerification]. This language
-  /// code should follow the conventions defined by the IETF in BCP47.
-  Future<void> setLanguageCode(String language) async {
-    assert(language != null);
-    await FirebaseAuth.channel.invokeMethod('setLanguageCode', <String, String>{
-      'language': language,
-      'app': app.name,
-    });
-  }
-
-  Future<void> _callHandler(MethodCall call) async {
-    switch (call.method) {
-      case 'onAuthStateChanged':
-        _onAuthStageChangedHandler(call);
-        break;
-      case 'phoneVerificationCompleted':
-        final int handle = call.arguments['handle'];
-        final PhoneVerificationCompleted verificationCompleted =
-            _phoneAuthCallbacks[handle]['PhoneVerificationCompleted'];
-        verificationCompleted(await currentUser());
-        break;
-      case 'phoneVerificationFailed':
-        final int handle = call.arguments['handle'];
-        final PhoneVerificationFailed verificationFailed =
-            _phoneAuthCallbacks[handle]['PhoneVerificationFailed'];
-        final Map<dynamic, dynamic> exception = call.arguments['exception'];
-        verificationFailed(
-            AuthException(exception['code'], exception['message']));
-        break;
-      case 'phoneCodeSent':
-        final int handle = call.arguments['handle'];
-        final String verificationId = call.arguments['verificationId'];
-        final int forceResendingToken = call.arguments['forceResendingToken'];
-
-        final PhoneCodeSent codeSent =
-            _phoneAuthCallbacks[handle]['PhoneCodeSent'];
-        if (forceResendingToken == null) {
-          codeSent(verificationId);
-        } else {
-          codeSent(verificationId, forceResendingToken);
-        }
-        break;
-      case 'phoneCodeAutoRetrievalTimeout':
-        final int handle = call.arguments['handle'];
-        final PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout =
-            _phoneAuthCallbacks[handle]['PhoneCodeAutoRetrievealTimeout'];
-        final String verificationId = call.arguments['verificationId'];
-        codeAutoRetrievalTimeout(verificationId);
-        break;
-    }
-  }
-
-  void _onAuthStageChangedHandler(MethodCall call) {
-    final Map<dynamic, dynamic> data = call.arguments["user"];
-    final int id = call.arguments["id"];
-
-    final FirebaseUser currentUser =
-        data != null ? FirebaseUser._(data, app) : null;
-    _authStateChangedControllers[id].add(currentUser);
-  }
-}
+part 'src/auth_provider/email_auth_provider.dart';
+part 'src/auth_provider/facebook_auth_provider.dart';
+part 'src/auth_provider/github_auth_provider.dart';
+part 'src/auth_provider/google_auth_provider.dart';
+part 'src/auth_provider/phone_auth_provider.dart';
+part 'src/auth_provider/twitter_auth_provider.dart';
+part 'src/auth_credential.dart';
+part 'src/auth_exception.dart';
+part 'src/firebase_auth.dart';
+part 'src/firebase_user.dart';
+part 'src/user_info.dart';
+part 'src/user_metadata.dart';
+part 'src/user_update_info.dart';
diff --git a/packages/firebase_auth/lib/src/auth_credential.dart b/packages/firebase_auth/lib/src/auth_credential.dart
new file mode 100644
index 000000000000..7240b045cd80
--- /dev/null
+++ b/packages/firebase_auth/lib/src/auth_credential.dart
@@ -0,0 +1,13 @@
+// Copyright 2018, the Flutter project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+part of firebase_auth;
+
+/// Represents the credentials returned by calling the `getCredential` method of
+/// an auth provider.
+class AuthCredential {
+  AuthCredential._(this._provider, this._data);
+  final String _provider;
+  final Map<String, String> _data;
+}
diff --git a/packages/firebase_auth/lib/src/auth_exception.dart b/packages/firebase_auth/lib/src/auth_exception.dart
new file mode 100644
index 000000000000..bbdc746fe40c
--- /dev/null
+++ b/packages/firebase_auth/lib/src/auth_exception.dart
@@ -0,0 +1,14 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of firebase_auth;
+
+/// Generic exception related to Firebase Authentication.
+/// Check the error code and message for more details.
+class AuthException implements Exception {
+  const AuthException(this.code, this.message);
+
+  final String code;
+  final String message;
+}
diff --git a/packages/firebase_auth/lib/src/auth_provider/email_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/email_auth_provider.dart
new file mode 100644
index 000000000000..b458c7ae7d93
--- /dev/null
+++ b/packages/firebase_auth/lib/src/auth_provider/email_auth_provider.dart
@@ -0,0 +1,19 @@
+// Copyright 2018, the Flutter project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+part of firebase_auth;
+
+class EmailAuthProvider {
+  static final String providerId = 'password';
+
+  static AuthCredential getCredential({
+    String email,
+    String password,
+  }) {
+    return AuthCredential._(providerId, <String, String>{
+      'email': email,
+      'password': password,
+    });
+  }
+}
diff --git a/packages/firebase_auth/lib/src/auth_provider/facebook_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/facebook_auth_provider.dart
new file mode 100644
index 000000000000..eb23403a13c6
--- /dev/null
+++ b/packages/firebase_auth/lib/src/auth_provider/facebook_auth_provider.dart
@@ -0,0 +1,16 @@
+// Copyright 2018, the Flutter project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+part of firebase_auth;
+
+class FacebookAuthProvider {
+  static final String providerId = 'facebook.com';
+
+  static AuthCredential getCredential({String accessToken}) {
+    return AuthCredential._(
+      providerId,
+      <String, String>{'accessToken': accessToken},
+    );
+  }
+}
diff --git a/packages/firebase_auth/lib/src/auth_provider/github_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/github_auth_provider.dart
new file mode 100644
index 000000000000..73e09d93d57c
--- /dev/null
+++ b/packages/firebase_auth/lib/src/auth_provider/github_auth_provider.dart
@@ -0,0 +1,13 @@
+// Copyright 2018, the Flutter project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+part of firebase_auth;
+
+class GithubAuthProvider {
+  static final String providerId = 'github.com';
+
+  static AuthCredential getCredential({@required String token}) {
+    return AuthCredential._(providerId, <String, String>{'token': token});
+  }
+}
diff --git a/packages/firebase_auth/lib/src/auth_provider/google_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/google_auth_provider.dart
new file mode 100644
index 000000000000..b61e04eb72de
--- /dev/null
+++ b/packages/firebase_auth/lib/src/auth_provider/google_auth_provider.dart
@@ -0,0 +1,19 @@
+// Copyright 2018, the Flutter project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+part of firebase_auth;
+
+class GoogleAuthProvider {
+  static final String providerId = 'google.com';
+
+  static AuthCredential getCredential({
+    @required String idToken,
+    @required String accessToken,
+  }) {
+    return AuthCredential._(providerId, <String, String>{
+      'idToken': idToken,
+      'accessToken': accessToken,
+    });
+  }
+}
diff --git a/packages/firebase_auth/lib/src/auth_provider/phone_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/phone_auth_provider.dart
new file mode 100644
index 000000000000..91e5bd2291a8
--- /dev/null
+++ b/packages/firebase_auth/lib/src/auth_provider/phone_auth_provider.dart
@@ -0,0 +1,19 @@
+// Copyright 2018, the Flutter project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+part of firebase_auth;
+
+class PhoneAuthProvider {
+  static final String providerId = 'phone';
+
+  static AuthCredential getCredential({
+    @required String verificationId,
+    @required String smsCode,
+  }) {
+    return AuthCredential._(providerId, <String, String>{
+      'verificationId': verificationId,
+      'smsCode': smsCode,
+    });
+  }
+}
diff --git a/packages/firebase_auth/lib/src/auth_provider/twitter_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/twitter_auth_provider.dart
new file mode 100644
index 000000000000..a565a1e8bee6
--- /dev/null
+++ b/packages/firebase_auth/lib/src/auth_provider/twitter_auth_provider.dart
@@ -0,0 +1,19 @@
+// Copyright 2018, the Flutter project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+part of firebase_auth;
+
+class TwitterAuthProvider {
+  static final String providerId = 'twitter.com';
+
+  static AuthCredential getCredential({
+    @required String authToken,
+    @required String authTokenSecret,
+  }) {
+    return AuthCredential._(providerId, <String, String>{
+      'authToken': authToken,
+      'authTokenSecret': authTokenSecret,
+    });
+  }
+}
diff --git a/packages/firebase_auth/lib/src/firebase_auth.dart b/packages/firebase_auth/lib/src/firebase_auth.dart
new file mode 100644
index 000000000000..f56dd599c66a
--- /dev/null
+++ b/packages/firebase_auth/lib/src/firebase_auth.dart
@@ -0,0 +1,408 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of firebase_auth;
+
+typedef void PhoneVerificationCompleted(FirebaseUser firebaseUser);
+typedef void PhoneVerificationFailed(AuthException error);
+typedef void PhoneCodeSent(String verificationId, [int forceResendingToken]);
+typedef void PhoneCodeAutoRetrievalTimeout(String verificationId);
+
+/// The entry point of the Firebase Authentication SDK.
+class FirebaseAuth {
+  FirebaseAuth._(this.app) {
+    channel.setMethodCallHandler(_callHandler);
+  }
+
+  /// Provides an instance of this class corresponding to `app`.
+  factory FirebaseAuth.fromApp(FirebaseApp app) {
+    assert(app != null);
+    return FirebaseAuth._(app);
+  }
+
+  /// Provides an instance of this class corresponding to the default app.
+  static final FirebaseAuth instance = FirebaseAuth._(FirebaseApp.instance);
+
+  @visibleForTesting
+  static const MethodChannel channel = MethodChannel(
+    'plugins.flutter.io/firebase_auth',
+  );
+
+  final Map<int, StreamController<FirebaseUser>> _authStateChangedControllers =
+      <int, StreamController<FirebaseUser>>{};
+
+  static int nextHandle = 0;
+  final Map<int, Map<String, dynamic>> _phoneAuthCallbacks =
+      <int, Map<String, dynamic>>{};
+
+  final FirebaseApp app;
+
+  /// Receive [FirebaseUser] each time the user signIn or signOut
+  Stream<FirebaseUser> get onAuthStateChanged {
+    Future<int> _handle;
+
+    StreamController<FirebaseUser> controller;
+    controller = StreamController<FirebaseUser>.broadcast(onListen: () {
+      _handle = channel.invokeMethod('startListeningAuthState',
+          <String, String>{"app": app.name}).then<int>((dynamic v) => v);
+      _handle.then((int handle) {
+        _authStateChangedControllers[handle] = controller;
+      });
+    }, onCancel: () {
+      _handle.then((int handle) async {
+        await channel.invokeMethod("stopListeningAuthState",
+            <String, dynamic>{"id": handle, "app": app.name});
+        _authStateChangedControllers.remove(handle);
+      });
+    });
+
+    return controller.stream;
+  }
+
+  /// Asynchronously creates and becomes an anonymous user.
+  ///
+  /// If there is already an anonymous user signed in, that user will be
+  /// returned instead. If there is any other existing user signed in, that
+  /// user will be signed out.
+  ///
+  /// **Important**: You must enable Anonymous accounts in the Auth section
+  /// of the Firebase console before being able to use them.
+  ///
+  /// Errors:
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Anonymous accounts are not enabled.
+  Future<FirebaseUser> signInAnonymously() async {
+    final Map<dynamic, dynamic> data = await channel
+        .invokeMethod('signInAnonymously', <String, String>{"app": app.name});
+    final FirebaseUser currentUser = FirebaseUser._(data, app);
+    return currentUser;
+  }
+
+  /// Tries to create a new user account with the given email address and password.
+  ///
+  /// If successful, it also signs the user in into the app and updates
+  /// the [onAuthStateChanged] stream.
+  ///
+  /// Errors:
+  ///   • `ERROR_WEAK_PASSWORD` - If the password is not strong enough.
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the email address is malformed.
+  ///   • `ERROR_EMAIL_ALREADY_IN_USE` - If the email is already in use by a different account.
+  Future<FirebaseUser> createUserWithEmailAndPassword({
+    @required String email,
+    @required String password,
+  }) async {
+    assert(email != null);
+    assert(password != null);
+    final Map<dynamic, dynamic> data = await channel.invokeMethod(
+      'createUserWithEmailAndPassword',
+      <String, String>{'email': email, 'password': password, 'app': app.name},
+    );
+    final FirebaseUser currentUser = FirebaseUser._(data, app);
+    return currentUser;
+  }
+
+  /// Returns a list of sign-in methods that can be used to sign in a given
+  /// user (identified by its main email address).
+  ///
+  /// This method is useful when you support multiple authentication mechanisms
+  /// if you want to implement an email-first authentication flow.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [email] address is malformed.
+  ///   • `ERROR_USER_NOT_FOUND` - If there is no user corresponding to the given [email] address.
+  Future<List<String>> fetchSignInMethodsForEmail({
+    @required String email,
+  }) async {
+    assert(email != null);
+    final List<dynamic> providers = await channel.invokeMethod(
+      'fetchSignInMethodsForEmail',
+      <String, String>{'email': email, 'app': app.name},
+    );
+    return providers?.cast<String>();
+  }
+
+  /// Triggers the Firebase Authentication backend to send a password-reset
+  /// email to the given email address, which must correspond to an existing
+  /// user of your app.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_EMAIL` - If the [email] address is malformed.
+  ///   • `ERROR_USER_NOT_FOUND` - If there is no user corresponding to the given [email] address.
+  Future<void> sendPasswordResetEmail({
+    @required String email,
+  }) async {
+    assert(email != null);
+    return await channel.invokeMethod(
+      'sendPasswordResetEmail',
+      <String, String>{'email': email, 'app': app.name},
+    );
+  }
+
+  /// Tries to sign in a user with the given email address and password.
+  ///
+  /// If successful, it also signs the user in into the app and updates
+  /// the [onAuthStateChanged] stream.
+  ///
+  /// **Important**: You must enable Email & Password accounts in the Auth
+  /// section of the Firebase console before being able to use them.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_EMAIL` - If the [email] address is malformed.
+  ///   • `ERROR_WRONG_PASSWORD` - If the [password] is wrong.
+  ///   • `ERROR_USER_NOT_FOUND` - If there is no user corresponding to the given [email] address, or if the user has been deleted.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_TOO_MANY_REQUESTS` - If there was too many attempts to sign in as this user.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
+  Future<FirebaseUser> signInWithEmailAndPassword({
+    @required String email,
+    @required String password,
+  }) {
+    assert(email != null);
+    assert(password != null);
+    final AuthCredential credential = EmailAuthProvider.getCredential(
+      email: email,
+      password: password,
+    );
+    return signInWithCredential(credential);
+  }
+
+  /// Asynchronously signs in to Firebase with the given 3rd-party credentials
+  /// (e.g. a Facebook login Access Token, a Google ID Token/Access Token pair,
+  /// etc.) and returns additional identity provider data.
+  ///
+  /// If successful, it also signs the user in into the app and updates
+  /// the [onAuthStateChanged] stream.
+  ///
+  /// If the user doesn't have an account already, one will be created automatically.
+  ///
+  /// **Important**: You must enable the relevant accounts in the Auth section
+  /// of the Firebase console before being able to use them.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the credential data is malformed or has expired.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_ACCOUNT_EXISTS_WITH_DIFFERENT_CREDENTIAL` - If there already exists an account with the email address asserted by Google.
+  ///       Resolve this case by calling [fetchSignInMethodsForEmail] and then asking the user to sign in using one of them.
+  ///       This error will only be thrown if the "One account per email address" setting is enabled in the Firebase console (recommended).
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Google accounts are not enabled.
+  Future<FirebaseUser> signInWithCredential(AuthCredential credential) async {
+    assert(credential != null);
+    final Map<dynamic, dynamic> data = await channel.invokeMethod(
+      'signInWithCredential',
+      <String, dynamic>{
+        'app': app.name,
+        'provider': credential._provider,
+        'data': credential._data,
+      },
+    );
+    final FirebaseUser currentUser = FirebaseUser._(data, app);
+    return currentUser;
+  }
+
+  /// Starts the phone number verification process for the given phone number.
+  ///
+  /// Either sends an SMS with a 6 digit code to the phone number specified,
+  /// or sign's the user in and [verificationCompleted] is called.
+  ///
+  /// No duplicated SMS will be sent out upon re-entry (before timeout).
+  ///
+  /// Make sure to test all scenarios below:
+  ///   • You directly get logged in if Google Play Services verified the phone
+  ///     number instantly or helped you auto-retrieve the verification code.
+  ///   • Auto-retrieve verification code timed out.
+  ///   • Error cases when you receive [verificationFailed] callback.
+  ///
+  /// [phoneNumber] The phone number for the account the user is signing up
+  ///   for or signing into. Make sure to pass in a phone number with country
+  ///   code prefixed with plus sign ('+').
+  ///
+  /// [timeout] The maximum amount of time you are willing to wait for SMS
+  ///   auto-retrieval to be completed by the library. Maximum allowed value
+  ///   is 2 minutes. Use 0 to disable SMS-auto-retrieval. Setting this to 0
+  ///   will also cause [codeAutoRetrievalTimeout] to be called immediately.
+  ///   If you specified a positive value less than 30 seconds, library will
+  ///   default to 30 seconds.
+  ///
+  /// [forceResendingToken] The [forceResendingToken] obtained from [codeSent]
+  ///   callback to force re-sending another verification SMS before the
+  ///   auto-retrieval timeout.
+  ///
+  /// [verificationCompleted] This callback must be implemented.
+  ///   It will trigger when an SMS is auto-retrieved or the phone number has
+  ///   been instantly verified. The callback will provide a [FirebaseUser].
+  ///
+  /// [verificationFailed] This callback must be implemented.
+  ///   Triggered when an error occurred during phone number verification.
+  ///
+  /// [codeSent] Optional callback.
+  ///   It will trigger when an SMS has been sent to the users phone,
+  ///   and will include a [verificationId] and [forceResendingToken].
+  ///
+  /// [codeAutoRetrievalTimeout] Optional callback.
+  ///   It will trigger when SMS auto-retrieval times out and provide a
+  ///   [verificationId].
+  Future<void> verifyPhoneNumber({
+    @required String phoneNumber,
+    @required Duration timeout,
+    int forceResendingToken,
+    @required PhoneVerificationCompleted verificationCompleted,
+    @required PhoneVerificationFailed verificationFailed,
+    @required PhoneCodeSent codeSent,
+    @required PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout,
+  }) async {
+    final Map<String, dynamic> callbacks = <String, dynamic>{
+      'PhoneVerificationCompleted': verificationCompleted,
+      'PhoneVerificationFailed': verificationFailed,
+      'PhoneCodeSent': codeSent,
+      'PhoneCodeAuthRetrievalTimeout': codeAutoRetrievalTimeout,
+    };
+    nextHandle += 1;
+    _phoneAuthCallbacks[nextHandle] = callbacks;
+
+    final Map<String, dynamic> params = <String, dynamic>{
+      'handle': nextHandle,
+      'phoneNumber': phoneNumber,
+      'timeout': timeout.inMilliseconds,
+      'forceResendingToken': forceResendingToken,
+      'app': app.name,
+    };
+
+    await channel.invokeMethod('verifyPhoneNumber', params);
+  }
+
+  /// Tries to sign in a user with a given Custom Token [token].
+  ///
+  /// If successful, it also signs the user in into the app and updates
+  /// the [onAuthStateChanged] stream.
+  ///
+  /// Use this method after you retrieve a Firebase Auth Custom Token from your server.
+  ///
+  /// If the user identified by the [uid] specified in the token doesn't
+  /// have an account already, one will be created automatically.
+  ///
+  /// Read how to use Custom Token authentication and the cases where it is
+  /// useful in [the guides](https://firebase.google.com/docs/auth/android/custom-auth).
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CUSTOM_TOKEN` - The custom token format is incorrect.
+  ///     Please check the documentation.
+  ///   • `ERROR_CUSTOM_TOKEN_MISMATCH` - Invalid configuration.
+  ///     Ensure your app's SHA1 is correct in the Firebase console.
+  Future<FirebaseUser> signInWithCustomToken({@required String token}) async {
+    assert(token != null);
+    final Map<dynamic, dynamic> data = await channel.invokeMethod(
+      'signInWithCustomToken',
+      <String, String>{'token': token, 'app': app.name},
+    );
+    final FirebaseUser currentUser = FirebaseUser._(data, app);
+    return currentUser;
+  }
+
+  /// Signs out the current user and clears it from the disk cache.
+  ///
+  /// If successful, it signs the user out of the app and updates
+  /// the [onAuthStateChanged] stream.
+  Future<void> signOut() async {
+    return await channel
+        .invokeMethod("signOut", <String, String>{'app': app.name});
+  }
+
+  /// Returns the currently signed-in [FirebaseUser] or [null] if there is none.
+  Future<FirebaseUser> currentUser() async {
+    final Map<dynamic, dynamic> data = await channel
+        .invokeMethod("currentUser", <String, String>{'app': app.name});
+    final FirebaseUser currentUser =
+        data == null ? null : FirebaseUser._(data, app);
+    return currentUser;
+  }
+
+  /// Associates a user account from a third-party identity provider with this
+  /// user and returns additional identity provider data.
+  ///
+  /// This allows the user to sign in to this account in the future with
+  /// the given account.
+  ///
+  /// Errors:
+  ///   • `ERROR_WEAK_PASSWORD` - If the password is not strong enough.
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the credential is malformed or has expired.
+  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the account is already in use by a different account.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has an account of this type linked.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that this type of account is not enabled.
+  Future<FirebaseUser> linkWithCredential(AuthCredential credential) async {
+    assert(credential != null);
+    final Map<dynamic, dynamic> data = await channel.invokeMethod(
+      'linkWithCredential',
+      <String, dynamic>{
+        'app': app.name,
+        'provider': credential._provider,
+        'data': credential._data,
+      },
+    );
+    final FirebaseUser currentUser = FirebaseUser._(data, app);
+    return currentUser;
+  }
+
+  /// Sets the user-facing language code for auth operations that can be
+  /// internationalized, such as [sendEmailVerification]. This language
+  /// code should follow the conventions defined by the IETF in BCP47.
+  Future<void> setLanguageCode(String language) async {
+    assert(language != null);
+    await FirebaseAuth.channel.invokeMethod('setLanguageCode', <String, String>{
+      'language': language,
+      'app': app.name,
+    });
+  }
+
+  Future<void> _callHandler(MethodCall call) async {
+    switch (call.method) {
+      case 'onAuthStateChanged':
+        _onAuthStageChangedHandler(call);
+        break;
+      case 'phoneVerificationCompleted':
+        final int handle = call.arguments['handle'];
+        final PhoneVerificationCompleted verificationCompleted =
+            _phoneAuthCallbacks[handle]['PhoneVerificationCompleted'];
+        verificationCompleted(await currentUser());
+        break;
+      case 'phoneVerificationFailed':
+        final int handle = call.arguments['handle'];
+        final PhoneVerificationFailed verificationFailed =
+            _phoneAuthCallbacks[handle]['PhoneVerificationFailed'];
+        final Map<dynamic, dynamic> exception = call.arguments['exception'];
+        verificationFailed(
+            AuthException(exception['code'], exception['message']));
+        break;
+      case 'phoneCodeSent':
+        final int handle = call.arguments['handle'];
+        final String verificationId = call.arguments['verificationId'];
+        final int forceResendingToken = call.arguments['forceResendingToken'];
+
+        final PhoneCodeSent codeSent =
+            _phoneAuthCallbacks[handle]['PhoneCodeSent'];
+        if (forceResendingToken == null) {
+          codeSent(verificationId);
+        } else {
+          codeSent(verificationId, forceResendingToken);
+        }
+        break;
+      case 'phoneCodeAutoRetrievalTimeout':
+        final int handle = call.arguments['handle'];
+        final PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout =
+            _phoneAuthCallbacks[handle]['PhoneCodeAutoRetrievealTimeout'];
+        final String verificationId = call.arguments['verificationId'];
+        codeAutoRetrievalTimeout(verificationId);
+        break;
+    }
+  }
+
+  void _onAuthStageChangedHandler(MethodCall call) {
+    final Map<dynamic, dynamic> data = call.arguments["user"];
+    final int id = call.arguments["id"];
+
+    final FirebaseUser currentUser =
+        data != null ? FirebaseUser._(data, app) : null;
+    _authStateChangedControllers[id].add(currentUser);
+  }
+}
diff --git a/packages/firebase_auth/lib/src/firebase_user.dart b/packages/firebase_auth/lib/src/firebase_user.dart
new file mode 100644
index 000000000000..5d3a7f93fc2b
--- /dev/null
+++ b/packages/firebase_auth/lib/src/firebase_user.dart
@@ -0,0 +1,179 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of firebase_auth;
+
+/// Represents a user.
+class FirebaseUser extends UserInfo {
+  FirebaseUser._(Map<dynamic, dynamic> data, FirebaseApp app)
+      : providerData = data['providerData']
+            .map<UserInfo>((dynamic item) => UserInfo._(item, app))
+            .toList(),
+        _metadata = FirebaseUserMetadata._(data),
+        super._(data, app);
+
+  final List<UserInfo> providerData;
+  final FirebaseUserMetadata _metadata;
+
+  // Returns true if the user is anonymous; that is, the user account was
+  // created with signInAnonymously() and has not been linked to another
+  // account.
+  FirebaseUserMetadata get metadata => _metadata;
+
+  bool get isAnonymous => _data['isAnonymous'];
+
+  /// Returns true if the user's email is verified.
+  bool get isEmailVerified => _data['isEmailVerified'];
+
+  /// Obtains the id token for the current user, forcing a [refresh] if desired.
+  ///
+  /// Useful when authenticating against your own backend. Use our server
+  /// SDKs or follow the official documentation to securely verify the
+  /// integrity and validity of this token.
+  ///
+  /// Completes with an error if the user is signed out.
+  Future<String> getIdToken({bool refresh = false}) async {
+    return await FirebaseAuth.channel
+        .invokeMethod('getIdToken', <String, dynamic>{
+      'refresh': refresh,
+      'app': _app.name,
+    });
+  }
+
+  /// Initiates email verification for the user.
+  Future<void> sendEmailVerification() async {
+    await FirebaseAuth.channel.invokeMethod(
+        'sendEmailVerification', <String, String>{'app': _app.name});
+  }
+
+  /// Manually refreshes the data of the current user (for example,
+  /// attached providers, display name, and so on).
+  Future<void> reload() async {
+    await FirebaseAuth.channel
+        .invokeMethod('reload', <String, String>{'app': _app.name});
+  }
+
+  /// Deletes the user record from your Firebase project's database.
+  Future<void> delete() async {
+    await FirebaseAuth.channel
+        .invokeMethod('delete', <String, String>{'app': _app.name});
+  }
+
+  /// Updates the email address of the user.
+  ///
+  /// The original email address recipient will receive an email that allows
+  /// them to revoke the email address change, in order to protect them
+  /// from account hijacking.
+  ///
+  /// **Important**: This is a security sensitive operation that requires
+  /// the user to have recently signed in.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the email address is malformed.
+  ///   • `ERROR_EMAIL_ALREADY_IN_USE` - If the email is already in use by a different account.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
+  Future<void> updateEmail(String email) async {
+    assert(email != null);
+    return await FirebaseAuth.channel.invokeMethod(
+      'updateEmail',
+      <String, String>{'email': email, 'app': _app.name},
+    );
+  }
+
+  /// Updates the password of the user.
+  ///
+  /// Anonymous users who update both their email and password will no
+  /// longer be anonymous. They will be able to log in with these credentials.
+  ///
+  /// **Important**: This is a security sensitive operation that requires
+  /// the user to have recently signed in.
+  ///
+  /// Errors:
+  ///   • `ERROR_WEAK_PASSWORD` - If the password is not strong enough.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
+  Future<void> updatePassword(String password) async {
+    assert(password != null);
+    return await FirebaseAuth.channel.invokeMethod(
+      'updatePassword',
+      <String, String>{'password': password, 'app': _app.name},
+    );
+  }
+
+  /// Updates the user profile information.
+  ///
+  /// Errors:
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
+  Future<void> updateProfile(UserUpdateInfo userUpdateInfo) async {
+    assert(userUpdateInfo != null);
+    final Map<String, String> data = userUpdateInfo._updateData;
+    data['app'] = _app.name;
+    return await FirebaseAuth.channel.invokeMethod(
+      'updateProfile',
+      data,
+    );
+  }
+
+  /// Renews the user’s authentication tokens by validating a fresh set of
+  /// [credential]s supplied by the user and returns additional identity provider
+  /// data.
+  ///
+  /// This is used to prevent or resolve `ERROR_REQUIRES_RECENT_LOGIN`
+  /// response to operations that require a recent sign-in.
+  ///
+  /// If the user associated with the supplied credential is different from the
+  /// current user, or if the validation of the supplied credentials fails; an
+  /// error is returned and the current user remains signed in.
+  ///
+  /// Errors:
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the [authToken] or [authTokenSecret] is malformed or has expired.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_USER_NOT_FOUND` - If the user has been deleted (for example, in the Firebase console)
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
+  Future<FirebaseUser> reauthenticateWithCredential(
+      AuthCredential credential) async {
+    assert(credential != null);
+    await FirebaseAuth.channel.invokeMethod(
+      'reauthenticateWithCredential',
+      <String, dynamic>{
+        'app': _app.name,
+        'provider': credential._provider,
+        'data': credential._data,
+      },
+    );
+    return this;
+  }
+
+  /// Detaches the [provider] account from the current user.
+  ///
+  /// This will prevent the user from signing in to this account with those
+  /// credentials.
+  ///
+  /// **Important**: This is a security sensitive operation that requires
+  /// the user to have recently signed in.
+  ///
+  /// Use the `providerId` method of an auth provider for [provider].
+  ///
+  /// Errors:
+  ///   • `ERROR_NO_SUCH_PROVIDER` - If the user does not have a Github Account linked to their account.
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  Future<void> unlinkFromProvider(String provider) async {
+    assert(provider != null);
+    return await FirebaseAuth.channel.invokeMethod(
+      'unlinkFromProvider',
+      <String, String>{'provider': provider, 'app': _app.name},
+    );
+  }
+
+  @override
+  String toString() {
+    return '$runtimeType($_data)';
+  }
+}
diff --git a/packages/firebase_auth/lib/src/user_info.dart b/packages/firebase_auth/lib/src/user_info.dart
new file mode 100644
index 000000000000..d7e440aaeee0
--- /dev/null
+++ b/packages/firebase_auth/lib/src/user_info.dart
@@ -0,0 +1,37 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of firebase_auth;
+
+/// Represents user data returned from an identity provider.
+class UserInfo {
+  UserInfo._(this._data, this._app);
+
+  final FirebaseApp _app;
+
+  final Map<dynamic, dynamic> _data;
+
+  /// The provider identifier.
+  String get providerId => _data['providerId'];
+
+  /// The provider’s user ID for the user.
+  String get uid => _data['uid'];
+
+  /// The name of the user.
+  String get displayName => _data['displayName'];
+
+  /// The URL of the user’s profile photo.
+  String get photoUrl => _data['photoUrl'];
+
+  /// The user’s email address.
+  String get email => _data['email'];
+
+  /// The user's phone number.
+  String get phoneNumber => _data['phoneNumber'];
+
+  @override
+  String toString() {
+    return '$runtimeType($_data)';
+  }
+}
diff --git a/packages/firebase_auth/lib/src/user_metadata.dart b/packages/firebase_auth/lib/src/user_metadata.dart
new file mode 100644
index 000000000000..11f9076bc61b
--- /dev/null
+++ b/packages/firebase_auth/lib/src/user_metadata.dart
@@ -0,0 +1,16 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of firebase_auth;
+
+/// Interface representing a user's metadata.
+class FirebaseUserMetadata {
+  FirebaseUserMetadata._(this._data);
+
+  final Map<dynamic, dynamic> _data;
+
+  int get creationTimestamp => _data['creationTimestamp'];
+
+  int get lastSignInTimestamp => _data['lastSignInTimestamp'];
+}
diff --git a/packages/firebase_auth/lib/src/user_update_info.dart b/packages/firebase_auth/lib/src/user_update_info.dart
new file mode 100644
index 000000000000..0b290b912970
--- /dev/null
+++ b/packages/firebase_auth/lib/src/user_update_info.dart
@@ -0,0 +1,23 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of firebase_auth;
+
+/// Represents user profile data that can be updated by [updateProfile]
+///
+/// The purpose of having separate class with a map is to give possibility
+/// to check if value was set to null or not provided
+class UserUpdateInfo {
+  /// Container of data that will be send in update request
+  final Map<String, String> _updateData = <String, String>{};
+
+  set displayName(String displayName) =>
+      _updateData['displayName'] = displayName;
+
+  String get displayName => _updateData['displayName'];
+
+  set photoUrl(String photoUri) => _updateData['photoUrl'] = photoUri;
+
+  String get photoUrl => _updateData['photoUrl'];
+}
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index b6da2330f184..04ab6acfffac 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: 0.6.6
+version: 0.7.0
 
 flutter:
   plugin:
diff --git a/packages/firebase_auth/test/firebase_auth_test.dart b/packages/firebase_auth/test/firebase_auth_test.dart
index ae83be64e65e..3eb3db28a7a4 100755
--- a/packages/firebase_auth/test/firebase_auth_test.dart
+++ b/packages/firebase_auth/test/firebase_auth_test.dart
@@ -154,136 +154,166 @@ void main() {
       );
     });
 
-    test('linkWithTwitterCredential', () async {
-      final FirebaseUser user = await auth.linkWithTwitterCredential(
+    test('TwitterAuthProvider linkWithCredential', () async {
+      final AuthCredential credential = TwitterAuthProvider.getCredential(
         authToken: kMockIdToken,
         authTokenSecret: kMockAccessToken,
       );
+      final FirebaseUser user = await auth.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'linkWithTwitterCredential',
-            arguments: <String, String>{
-              'authToken': kMockIdToken,
-              'authTokenSecret': kMockAccessToken,
+            'linkWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
+              'provider': 'twitter.com',
+              'data': <String, String>{
+                'authToken': kMockIdToken,
+                'authTokenSecret': kMockAccessToken,
+              },
             },
           ),
         ],
       );
     });
 
-    test('signInWithTwitter', () async {
-      final FirebaseUser user = await auth.signInWithTwitter(
+    test('TwitterAuthProvider signInWithCredential', () async {
+      final AuthCredential credential = TwitterAuthProvider.getCredential(
         authToken: kMockIdToken,
         authTokenSecret: kMockAccessToken,
       );
+      final FirebaseUser user = await auth.signInWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'signInWithTwitter',
-            arguments: <String, String>{
-              'authToken': kMockIdToken,
-              'authTokenSecret': kMockAccessToken,
+            'signInWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
+              'provider': 'twitter.com',
+              'data': <String, String>{
+                'authToken': kMockIdToken,
+                'authTokenSecret': kMockAccessToken,
+              },
             },
           ),
         ],
       );
     });
 
-    test('linkWithGithubCredential', () async {
-      final FirebaseUser user = await auth.linkWithGithubCredential(
+    test('GithubAuthProvider linkWithCredential', () async {
+      final AuthCredential credential = GithubAuthProvider.getCredential(
         token: kMockGithubToken,
       );
+      final FirebaseUser user = await auth.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'linkWithGithubCredential',
-            arguments: <String, String>{
-              'token': kMockGithubToken,
+            'linkWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
+              'provider': 'github.com',
+              'data': <String, String>{
+                'token': kMockGithubToken,
+              }
             },
           ),
         ],
       );
     });
 
-    test('signInWithGithub', () async {
-      final FirebaseUser user = await auth.signInWithGithub(
+    test('GitHubAuthProvider signInWithCredential', () async {
+      final AuthCredential credential = GithubAuthProvider.getCredential(
         token: kMockGithubToken,
       );
+      final FirebaseUser user = await auth.signInWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'signInWithGithub',
-            arguments: <String, String>{
-              'token': kMockGithubToken,
+            'signInWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
+              'provider': 'github.com',
+              'data': <String, String>{
+                'token': kMockGithubToken,
+              },
             },
           ),
         ],
       );
     });
 
-    test('linkWithEmailAndPassword', () async {
-      final FirebaseUser user = await auth.linkWithEmailAndPassword(
+    test('EmailAuthProvider linkWithCredential', () async {
+      final AuthCredential credential = EmailAuthProvider.getCredential(
         email: kMockEmail,
         password: kMockPassword,
       );
+      final FirebaseUser user = await auth.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'linkWithEmailAndPassword',
-            arguments: <String, String>{
-              'email': kMockEmail,
-              'password': kMockPassword,
-              'app': auth.app.name
+            'linkWithCredential',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+              'provider': 'password',
+              'data': <String, String>{
+                'email': kMockEmail,
+                'password': kMockPassword,
+              },
             },
           ),
         ],
       );
     });
 
-    test('signInWithGoogle', () async {
-      final FirebaseUser user = await auth.signInWithGoogle(
+    test('GoogleAuthProvider signInWithCredential', () async {
+      final AuthCredential credential = GoogleAuthProvider.getCredential(
         idToken: kMockIdToken,
         accessToken: kMockAccessToken,
       );
+      final FirebaseUser user = await auth.signInWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'signInWithGoogle',
-            arguments: <String, String>{
-              'idToken': kMockIdToken,
-              'accessToken': kMockAccessToken,
-              'app': auth.app.name
+            'signInWithCredential',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+              'provider': 'google.com',
+              'data': <String, String>{
+                'idToken': kMockIdToken,
+                'accessToken': kMockAccessToken,
+              },
             },
           ),
         ],
       );
     });
 
-    test('signInWithPhoneNumber', () async {
-      await auth.signInWithPhoneNumber(
-          verificationId: kMockVerificationId, smsCode: kMockSmsCode);
+    test('PhoneAuthProvider signInWithCredential', () async {
+      final AuthCredential credential = PhoneAuthProvider.getCredential(
+        verificationId: kMockVerificationId,
+        smsCode: kMockSmsCode,
+      );
+      await auth.signInWithCredential(credential);
       expect(log, <Matcher>[
-        isMethodCall('signInWithPhoneNumber', arguments: <String, dynamic>{
-          'verificationId': kMockVerificationId,
-          'smsCode': kMockSmsCode,
+        isMethodCall('signInWithCredential', arguments: <String, dynamic>{
           'app': auth.app.name,
+          'provider': 'phone',
+          'data': <String, String>{
+            'verificationId': kMockVerificationId,
+            'smsCode': kMockSmsCode,
+          },
         })
       ]);
     });
@@ -307,276 +337,317 @@ void main() {
       ]);
     });
 
-    test('reauthenticateWithEmailAndPassword', () async {
-      await auth.reauthenticateWithEmailAndPassword(
+    test('EmailAuthProvider reauthenticateWithCredential', () async {
+      final FirebaseUser user = await auth.currentUser();
+      log.clear();
+      final AuthCredential credential = EmailAuthProvider.getCredential(
         email: kMockEmail,
         password: kMockPassword,
       );
+      await user.reauthenticateWithCredential(credential);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'reauthenticateWithEmailAndPassword',
-            arguments: <String, String>{
-              'email': kMockEmail,
-              'password': kMockPassword,
+            'reauthenticateWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
+              'provider': 'password',
+              'data': <String, String>{
+                'email': kMockEmail,
+                'password': kMockPassword,
+              }
             },
           ),
         ],
       );
     });
-    test('reauthenticateWithGoogleCredential', () async {
-      await auth.reauthenticateWithGoogleCredential(
+    test('GoogleAuthProvider reauthenticateWithCredential', () async {
+      final FirebaseUser user = await auth.currentUser();
+      log.clear();
+      final AuthCredential credential = GoogleAuthProvider.getCredential(
         idToken: kMockIdToken,
         accessToken: kMockAccessToken,
       );
+      await user.reauthenticateWithCredential(credential);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'reauthenticateWithGoogleCredential',
-            arguments: <String, String>{
-              'idToken': kMockIdToken,
-              'accessToken': kMockAccessToken,
+            'reauthenticateWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
+              'provider': 'google.com',
+              'data': <String, String>{
+                'idToken': kMockIdToken,
+                'accessToken': kMockAccessToken,
+              },
             },
           ),
         ],
       );
     });
 
-    test('reauthenticateWithFacebookCredential', () async {
-      await auth.reauthenticateWithFacebookCredential(
+    test('FacebookAuthProvider reauthenticateWithCredential', () async {
+      final FirebaseUser user = await auth.currentUser();
+      log.clear();
+      final AuthCredential credential = FacebookAuthProvider.getCredential(
         accessToken: kMockAccessToken,
       );
+      await user.reauthenticateWithCredential(credential);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'reauthenticateWithFacebookCredential',
-            arguments: <String, String>{
-              'accessToken': kMockAccessToken,
+            'reauthenticateWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
+              'provider': 'facebook.com',
+              'data': <String, String>{
+                'accessToken': kMockAccessToken,
+              },
             },
           ),
         ],
       );
     });
 
-    test('reauthenticateWithTwitterCredential', () async {
-      await auth.reauthenticateWithTwitterCredential(
+    test('TwitterAuthProvider reauthenticateWithCredential', () async {
+      final FirebaseUser user = await auth.currentUser();
+      log.clear();
+      final AuthCredential credential = TwitterAuthProvider.getCredential(
         authToken: kMockAuthToken,
         authTokenSecret: kMockAuthTokenSecret,
       );
+      await user.reauthenticateWithCredential(credential);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'reauthenticateWithTwitterCredential',
-            arguments: <String, String>{
-              'authToken': kMockAuthToken,
-              'authTokenSecret': kMockAuthTokenSecret,
+            'reauthenticateWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
+              'provider': 'twitter.com',
+              'data': <String, String>{
+                'authToken': kMockAuthToken,
+                'authTokenSecret': kMockAuthTokenSecret,
+              },
             },
           ),
         ],
       );
     });
 
-    test('reauthenticateWithGithubCredential', () async {
-      await auth.reauthenticateWithGithubCredential(
+    test('GithubAuthProvider reauthenticateWithCredential', () async {
+      final FirebaseUser user = await auth.currentUser();
+      log.clear();
+      final AuthCredential credential = GithubAuthProvider.getCredential(
         token: kMockGithubToken,
       );
+      await user.reauthenticateWithCredential(credential);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'reauthenticateWithGithubCredential',
-            arguments: <String, String>{
+            'reauthenticateWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
-              'token': kMockGithubToken,
+              'provider': 'github.com',
+              'data': <String, String>{
+                'token': kMockGithubToken,
+              },
             },
           ),
         ],
       );
     });
 
-    test('linkWithGoogleCredential', () async {
-      final FirebaseUser user = await auth.linkWithGoogleCredential(
+    test('GoogleAuthProvider linkWithCredential', () async {
+      final AuthCredential credential = GoogleAuthProvider.getCredential(
         idToken: kMockIdToken,
         accessToken: kMockAccessToken,
       );
+      final FirebaseUser user = await auth.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'linkWithGoogleCredential',
-            arguments: <String, String>{
-              'idToken': kMockIdToken,
-              'accessToken': kMockAccessToken,
+            'linkWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
+              'provider': 'google.com',
+              'data': <String, String>{
+                'idToken': kMockIdToken,
+                'accessToken': kMockAccessToken,
+              },
             },
           ),
         ],
       );
     });
 
-    test('linkWithFacebookCredential', () async {
-      final FirebaseUser user = await auth.linkWithFacebookCredential(
+    test('FacebookAuthProvider linkWithCredential', () async {
+      final AuthCredential credential = FacebookAuthProvider.getCredential(
         accessToken: kMockAccessToken,
       );
+      final FirebaseUser user = await auth.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'linkWithFacebookCredential',
-            arguments: <String, String>{
-              'accessToken': kMockAccessToken,
-              'app': auth.app.name,
-            },
-          ),
-        ],
-      );
-    });
-
-    test('linkWithTwitterCredential', () async {
-      final FirebaseUser user = await auth.linkWithTwitterCredential(
-        authToken: kMockAuthToken,
-        authTokenSecret: kMockAuthTokenSecret,
-      );
-      verifyUser(user);
-      expect(
-        log,
-        <Matcher>[
-          isMethodCall(
-            'linkWithTwitterCredential',
-            arguments: <String, String>{
-              'authToken': kMockAuthToken,
-              'authTokenSecret': kMockAuthTokenSecret,
+            'linkWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
+              'provider': 'facebook.com',
+              'data': <String, String>{
+                'accessToken': kMockAccessToken,
+              },
             },
           ),
         ],
       );
     });
 
-    test('signInWithFacebook', () async {
-      final FirebaseUser user = await auth.signInWithFacebook(
+    test('FacebookAuthProvider signInWithCredential', () async {
+      final AuthCredential credential = FacebookAuthProvider.getCredential(
         accessToken: kMockAccessToken,
       );
+      final FirebaseUser user = await auth.signInWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'signInWithFacebook',
-            arguments: <String, String>{
-              'accessToken': kMockAccessToken,
+            'signInWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
+              'provider': 'facebook.com',
+              'data': <String, String>{
+                'accessToken': kMockAccessToken,
+              }
             },
           ),
         ],
       );
     });
 
-    test('linkWithTwitterCredential', () async {
-      final FirebaseUser user = await auth.linkWithTwitterCredential(
+    test('TwitterAuthProvider linkWithCredential', () async {
+      final AuthCredential credential = TwitterAuthProvider.getCredential(
         authToken: kMockAuthToken,
         authTokenSecret: kMockAuthTokenSecret,
       );
+      final FirebaseUser user = await auth.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'linkWithTwitterCredential',
-            arguments: <String, String>{
+            'linkWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
-              'authToken': kMockAuthToken,
-              'authTokenSecret': kMockAuthTokenSecret,
+              'provider': 'twitter.com',
+              'data': <String, String>{
+                'authToken': kMockAuthToken,
+                'authTokenSecret': kMockAuthTokenSecret,
+              },
             },
           ),
         ],
       );
     });
 
-    test('signInWithTwitter', () async {
-      final FirebaseUser user = await auth.signInWithTwitter(
+    test('TwitterAuthProvider signInWithCredential', () async {
+      final AuthCredential credential = TwitterAuthProvider.getCredential(
         authToken: kMockAuthToken,
         authTokenSecret: kMockAuthTokenSecret,
       );
+      final FirebaseUser user = await auth.signInWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'signInWithTwitter',
-            arguments: <String, String>{
+            'signInWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
-              'authToken': kMockAuthToken,
-              'authTokenSecret': kMockAuthTokenSecret,
+              'provider': 'twitter.com',
+              'data': <String, String>{
+                'authToken': kMockAuthToken,
+                'authTokenSecret': kMockAuthTokenSecret,
+              },
             },
           ),
         ],
       );
     });
 
-    test('linkWithGithubCredential', () async {
-      final FirebaseUser user = await auth.linkWithGithubCredential(
+    test('GithubAuthProvider linkWithCredential', () async {
+      final AuthCredential credential = GithubAuthProvider.getCredential(
         token: kMockGithubToken,
       );
+      final FirebaseUser user = await auth.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'linkWithGithubCredential',
-            arguments: <String, String>{
+            'linkWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
-              'token': kMockGithubToken,
+              'provider': 'github.com',
+              'data': <String, String>{
+                'token': kMockGithubToken,
+              },
             },
           ),
         ],
       );
     });
 
-    test('signInWithGithub', () async {
-      final FirebaseUser user = await auth.signInWithGithub(
+    test('GithubAuthProvider signInWithCredential', () async {
+      final AuthCredential credential = GithubAuthProvider.getCredential(
         token: kMockGithubToken,
       );
+      final FirebaseUser user = await auth.signInWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'signInWithGithub',
-            arguments: <String, String>{
+            'signInWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
-              'token': kMockGithubToken,
+              'provider': 'github.com',
+              'data': <String, String>{
+                'token': kMockGithubToken,
+              },
             },
           ),
         ],
       );
     });
 
-    test('linkWithEmailAndPassword', () async {
-      final FirebaseUser user = await auth.linkWithEmailAndPassword(
+    test('EmailAuthProvider linkWithCredential', () async {
+      final AuthCredential credential = EmailAuthProvider.getCredential(
         email: kMockEmail,
         password: kMockPassword,
       );
+      final FirebaseUser user = await auth.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
           isMethodCall(
-            'linkWithEmailAndPassword',
-            arguments: <String, String>{
-              'email': kMockEmail,
-              'password': kMockPassword,
+            'linkWithCredential',
+            arguments: <String, dynamic>{
               'app': auth.app.name,
+              'provider': 'password',
+              'data': <String, String>{
+                'email': kMockEmail,
+                'password': kMockPassword,
+              },
             },
           ),
         ],
@@ -717,16 +788,16 @@ void main() {
       ]);
     });
 
-    test('unlinkEmailAndPassword', () async {
+    test('EmailAuthProvider unlinkFromProvider', () async {
       final FirebaseUser user = await auth.currentUser();
-      await user.unlinkEmailAndPassword();
+      await user.unlinkFromProvider(EmailAuthProvider.providerId);
       expect(log, <Matcher>[
         isMethodCall(
           'currentUser',
           arguments: <String, String>{'app': auth.app.name},
         ),
         isMethodCall(
-          'unlinkCredential',
+          'unlinkFromProvider',
           arguments: <String, String>{
             'app': auth.app.name,
             'provider': 'password',
@@ -735,16 +806,16 @@ void main() {
       ]);
     });
 
-    test('unlinkGoogleCredential', () async {
+    test('GoogleAuthProvider unlinkFromProvider', () async {
       final FirebaseUser user = await auth.currentUser();
-      await user.unlinkGoogleCredential();
+      await user.unlinkFromProvider(GoogleAuthProvider.providerId);
       expect(log, <Matcher>[
         isMethodCall(
           'currentUser',
           arguments: <String, String>{'app': auth.app.name},
         ),
         isMethodCall(
-          'unlinkCredential',
+          'unlinkFromProvider',
           arguments: <String, String>{
             'app': auth.app.name,
             'provider': 'google.com',
@@ -753,16 +824,16 @@ void main() {
       ]);
     });
 
-    test('unlinkFacebookCredential', () async {
+    test('FacebookAuthProvider unlinkFromProvider', () async {
       final FirebaseUser user = await auth.currentUser();
-      await user.unlinkFacebookCredential();
+      await user.unlinkFromProvider(FacebookAuthProvider.providerId);
       expect(log, <Matcher>[
         isMethodCall(
           'currentUser',
           arguments: <String, String>{'app': auth.app.name},
         ),
         isMethodCall(
-          'unlinkCredential',
+          'unlinkFromProvider',
           arguments: <String, String>{
             'app': auth.app.name,
             'provider': 'facebook.com',
@@ -771,16 +842,34 @@ void main() {
       ]);
     });
 
-    test('unlinkTwitterCredential', () async {
+    test('PhoneAuthProvider unlinkFromProvider', () async {
+      final FirebaseUser user = await auth.currentUser();
+      await user.unlinkFromProvider(PhoneAuthProvider.providerId);
+      expect(log, <Matcher>[
+        isMethodCall(
+          'currentUser',
+          arguments: <String, String>{'app': auth.app.name},
+        ),
+        isMethodCall(
+          'unlinkFromProvider',
+          arguments: <String, String>{
+            'app': auth.app.name,
+            'provider': 'phone',
+          },
+        ),
+      ]);
+    });
+
+    test('TwitterAuthProvider unlinkFromProvider', () async {
       final FirebaseUser user = await auth.currentUser();
-      await user.unlinkTwitterCredential();
+      await user.unlinkFromProvider(TwitterAuthProvider.providerId);
       expect(log, <Matcher>[
         isMethodCall(
           'currentUser',
           arguments: <String, String>{'app': auth.app.name},
         ),
         isMethodCall(
-          'unlinkCredential',
+          'unlinkFromProvider',
           arguments: <String, String>{
             'app': auth.app.name,
             'provider': 'twitter.com',
@@ -789,16 +878,16 @@ void main() {
       ]);
     });
 
-    test('unlinkGithubCredential', () async {
+    test('GithubAuthProvider unlinkFromProvider', () async {
       final FirebaseUser user = await auth.currentUser();
-      await user.unlinkGithubCredential();
+      await user.unlinkFromProvider(GithubAuthProvider.providerId);
       expect(log, <Matcher>[
         isMethodCall(
           'currentUser',
           arguments: <String, String>{'app': auth.app.name},
         ),
         isMethodCall(
-          'unlinkCredential',
+          'unlinkFromProvider',
           arguments: <String, String>{
             'app': auth.app.name,
             'provider': 'github.com',

From 2f0945a5e31a1b61e078dbd3e1c191f0d3972767 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Tue, 27 Nov 2018 14:06:26 -0800
Subject: [PATCH 011/410] Bump google_maps_flutter version to 0.0.2 (pre
 release). (#932)

Doing this to prevent confusion with the 0.0.1 google_maps_flutter package
which was accidentally published by a third-party.
---
 packages/google_maps_flutter/CHANGELOG.md | 4 ++--
 packages/google_maps_flutter/pubspec.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index d0bd041d0ff6..af0368001bd4 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,3 @@
-## 0.0.1
+## 0.0.2
 
-* Initial release.
+* Initial developers preview release.
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 6d03659c442a..5861ffa9a576 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.0.1
+version: 0.0.2
 
 dependencies:
   flutter:

From 052b71a9422ecf767a43da720512c91c67f16fd6 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Tue, 27 Nov 2018 14:40:57 -0800
Subject: [PATCH 012/410] Update the IAP README (#933)

---
 packages/in_app_purchase/README.md | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/in_app_purchase/README.md b/packages/in_app_purchase/README.md
index a4165d0ead81..826c24146c16 100644
--- a/packages/in_app_purchase/README.md
+++ b/packages/in_app_purchase/README.md
@@ -1,10 +1,5 @@
-# in_app_purchase
+# In App Purchase
 
-A Flutter plugin for in-app purchases.
-
-## Getting Started
-
-For help getting started with Flutter, view our online
-[documentation](https://flutter.io/).
-
-For help on editing plugin code, view the [documentation](https://flutter.io/platform-plugins/#edit-code).
\ No newline at end of file
+This plugin is not ready to be used yet. Follow
+[flutter/flutter#9591](https://github.com/flutter/flutter/issues/9591) for more
+updates.
\ No newline at end of file

From fdccbc7bdb887fb9f655f2411fca723047e22426 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Tue, 27 Nov 2018 15:42:44 -0800
Subject: [PATCH 013/410] Re-hook the Google Map callbacks on iOS. (#934)

The refactoring in #892 left the callbacks defined in `FLTGoogleMapDelegate` unhooked.
Fixes flutter/flutter#24520.

This change also removes the `FLTGoogleMapDelegate` protocol, it was used to
delegate map callbacks from the map controller to `FLTGoogleMapsPlugin`
which was the owner of the only method channel. As we now have a method
channel per map controller there is no need for a delegate.

This also renames `didTapInfoWindow` to `didTapInfoWindowForMarker` in
`FLTGoogleMapController`. This was just a typo when the code was first
introduced, and fixes flutter/flutter#20178.

Additionally this change cleans up the no longer used `addToView` and
`removeFromView` method from `FLTGoogleMapController`. These were
used by the overlay-based implementation, in the `UiKitView`
implementation the view is added and removed by the Flutter Engine.
---
 .../ios/Classes/GoogleMapController.h         | 12 ---------
 .../ios/Classes/GoogleMapController.m         | 25 ++++++-------------
 .../ios/Classes/GoogleMapsPlugin.h            |  2 +-
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
index e8252a743f44..3b67ec61ae88 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
@@ -6,15 +6,6 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import "GoogleMapMarkerController.h"
 
-// Defines events to be sent to Flutter.
-@protocol FLTGoogleMapDelegate
-- (void)onCameraMoveStartedOnMap:(id)mapId gesture:(BOOL)gesture;
-- (void)onCameraMoveOnMap:(id)mapId cameraPosition:(GMSCameraPosition*)cameraPosition;
-- (void)onCameraIdleOnMap:(id)mapId;
-- (void)onMarkerTappedOnMap:(id)mapId marker:(NSString*)markerId;
-- (void)onInfoWindowTappedOnMap:(id)mapId marker:(NSString*)markerId;
-@end
-
 // Defines map UI options writable from Flutter.
 @protocol FLTGoogleMapOptionsSink
 - (void)setCamera:(GMSCameraPosition*)camera;
@@ -33,14 +24,11 @@
 // Defines map overlay controllable from Flutter.
 @interface FLTGoogleMapController
     : NSObject <GMSMapViewDelegate, FLTGoogleMapOptionsSink, FlutterPlatformView>
-@property(atomic) id<FLTGoogleMapDelegate> delegate;
 @property(atomic, readonly) id mapId;
 - (instancetype)initWithFrame:(CGRect)frame
                viewIdentifier:(int64_t)viewId
                     arguments:(id _Nullable)args
                     registrar:(NSObject<FlutterPluginRegistrar>*)registrar;
-- (void)addToView:(UIView*)view;
-- (void)removeFromView;
 - (void)showAtX:(CGFloat)x Y:(CGFloat)y;
 - (void)hide;
 - (void)animateWithCameraUpdate:(GMSCameraUpdate*)cameraUpdate;
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index c1225f14bebf..f9d18ba73fbc 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -75,6 +75,7 @@ - (instancetype)initWithFrame:(CGRect)frame
         [weakSelf onMethodCall:call result:result];
       }
     }];
+    _mapView.delegate = weakSelf;
   }
   return self;
 }
@@ -118,17 +119,6 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   }
 }
 
-- (void)addToView:(UIView*)view {
-  _mapView.hidden = YES;
-  _mapView.delegate = self;
-  [view addSubview:_mapView];
-}
-
-- (void)removeFromView {
-  [_mapView removeFromSuperview];
-  _mapView.delegate = nil;
-}
-
 - (void)showAtX:(CGFloat)x Y:(CGFloat)y {
   _mapView.frame =
       CGRectMake(x, y, CGRectGetWidth(_mapView.frame), CGRectGetHeight(_mapView.frame));
@@ -224,29 +214,30 @@ - (void)setMyLocationEnabled:(BOOL)enabled {
 #pragma mark - GMSMapViewDelegate methods
 
 - (void)mapView:(GMSMapView*)mapView willMove:(BOOL)gesture {
-  [_delegate onCameraMoveStartedOnMap:_mapId gesture:gesture];
+  [_channel invokeMethod:@"camera#onMoveStarted" arguments:@{@"isGesture" : @(gesture)}];
 }
 
 - (void)mapView:(GMSMapView*)mapView didChangeCameraPosition:(GMSCameraPosition*)position {
   if (_trackCameraPosition) {
-    [_delegate onCameraMoveOnMap:_mapId cameraPosition:position];
+    [_channel invokeMethod:@"camera#onMove" arguments:@{@"position" : positionToJson(position)}];
   }
 }
 
 - (void)mapView:(GMSMapView*)mapView idleAtCameraPosition:(GMSCameraPosition*)position {
-  [_delegate onCameraIdleOnMap:_mapId];
+  [_channel invokeMethod:@"camera#onIdle" arguments:@{}];
 }
 
 - (BOOL)mapView:(GMSMapView*)mapView didTapMarker:(GMSMarker*)marker {
   NSString* markerId = marker.userData[0];
-  [_delegate onMarkerTappedOnMap:_mapId marker:markerId];
+  [_channel invokeMethod:@"marker#onTap" arguments:@{@"marker" : markerId}];
   return [marker.userData[1] boolValue];
 }
 
-- (void)mapView:(GMSMapView*)mapView didTapInfoWindow:(GMSMarker*)marker {
+- (void)mapView:(GMSMapView*)mapView didTapInfoWindowOfMarker:(GMSMarker*)marker {
   NSString* markerId = marker.userData[0];
-  [_delegate onInfoWindowTappedOnMap:_mapId marker:markerId];
+  [_channel invokeMethod:@"infoWindow#onTap" arguments:@{@"marker" : markerId}];
 }
+
 @end
 
 #pragma mark - Implementations of JSON conversion functions.
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.h b/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.h
index 603287fc3ce2..817f2d2a857f 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.h
@@ -7,5 +7,5 @@
 #import "GoogleMapController.h"
 #import "GoogleMapMarkerController.h"
 
-@interface FLTGoogleMapsPlugin : NSObject <FlutterPlugin, FLTGoogleMapDelegate>
+@interface FLTGoogleMapsPlugin : NSObject <FlutterPlugin>
 @end

From f210a6fdcfa40176db6ce7303b31be19edcc3dd1 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Tue, 27 Nov 2018 16:16:45 -0800
Subject: [PATCH 014/410] Remove unused map id fields. (#935)

These are remains from the overlay-based implementation.
---
 packages/google_maps_flutter/ios/Classes/GoogleMapController.h | 1 -
 packages/google_maps_flutter/ios/Classes/GoogleMapController.m | 2 --
 2 files changed, 3 deletions(-)

diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
index 3b67ec61ae88..ae3cff07f37a 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
@@ -24,7 +24,6 @@
 // Defines map overlay controllable from Flutter.
 @interface FLTGoogleMapController
     : NSObject <GMSMapViewDelegate, FLTGoogleMapOptionsSink, FlutterPlatformView>
-@property(atomic, readonly) id mapId;
 - (instancetype)initWithFrame:(CGRect)frame
                viewIdentifier:(int64_t)viewId
                     arguments:(id _Nullable)args
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index f9d18ba73fbc..eb18a15cf565 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -4,8 +4,6 @@
 
 #import "GoogleMapController.h"
 
-static uint64_t _nextMapId = 0;
-
 #pragma mark - Conversion of JSON-like values sent via platform channels. Forward declarations.
 
 static id positionToJson(GMSCameraPosition* position);

From 60f6075712b3343452ac9cc03da394af7617eb3b Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Tue, 27 Nov 2018 17:09:51 -0800
Subject: [PATCH 015/410] Don't export dart:async by the Google Maps plugin.
 (#937)

This was done in #463, not sure why, but I don't think we should export
it (and it makes Dartdoc complain).
---
 packages/google_maps_flutter/lib/google_maps_flutter.dart | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/lib/google_maps_flutter.dart
index 085f0ac9041e..3d9e185cf605 100644
--- a/packages/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/lib/google_maps_flutter.dart
@@ -12,8 +12,6 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-export 'dart:async';
-
 part 'src/bitmap.dart';
 part 'src/callbacks.dart';
 part 'src/camera.dart';

From bf2f1ed9250751074d5957df8593996103d4420b Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Tue, 27 Nov 2018 18:49:09 -0800
Subject: [PATCH 016/410] Bring back the google_maps_flutter pub badge. (#938)

This was temporarily removed in #925 while the plugin was accidentally
published by a third party.
---
 packages/google_maps_flutter/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/google_maps_flutter/README.md b/packages/google_maps_flutter/README.md
index f8f6461427bb..190b44921434 100644
--- a/packages/google_maps_flutter/README.md
+++ b/packages/google_maps_flutter/README.md
@@ -1,5 +1,6 @@
 # Google Maps for Flutter (Developers Preview)
 
+[![pub package](https://img.shields.io/pub/v/google_maps_flutter.svg)](https://pub.dartlang.org/packages/google_maps_flutter)
 
 A Flutter plugin that provides a [Google Maps](https://developers.google.com/maps/) widget.
 

From 80452b45eace5f8a95b1d2d4e0c31c060c495c18 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Tue, 27 Nov 2018 18:49:26 -0800
Subject: [PATCH 017/410] Bump google_maps_flutter's version to 0.0.3. (#939)

Also updates the minimal required Flutter SDK to one that has platform
views support.
---
 packages/google_maps_flutter/CHANGELOG.md | 5 +++++
 packages/google_maps_flutter/pubspec.yaml | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index af0368001bd4..42cf034b0f8d 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.0.3
+
+* Don't export `dart:async`.
+* Update the minimal required Flutter SDK version to one that supports embedding platform views.
+
 ## 0.0.2
 
 * Initial developers preview release.
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 5861ffa9a576..a7dee32fb153 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.0.2
+version: 0.0.3
 
 dependencies:
   flutter:
@@ -16,4 +16,4 @@ flutter:
 
 environment:
   sdk: ">=2.0.0-dev.47.0 <3.0.0"
-  flutter: ">=0.3.0 <2.0.0"
+  flutter: ">=0.11.10 <2.0.0"

From c8ae4a734d6f997f9f930332c5a77baf2109c1e6 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Tue, 27 Nov 2018 19:47:32 -0800
Subject: [PATCH 018/410] Set a minimal flutter version for the webview plugin.
 (#940)

We need a version that supports platform views.
---
 packages/webview_flutter/pubspec.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 767204a88902..b4dc0aa325ee 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -6,6 +6,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutte
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"
+  flutter: ">=0.11.9 <2.0.0"
 
 dependencies:
   flutter:

From 805976c7cf5fe33b9b8e87ea2ac0913c266d5639 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Wed, 28 Nov 2018 13:12:27 -0800
Subject: [PATCH 019/410] Keep a reference to the plugin registrar in
 `FLTGoogleMapController`. (#943)

The `_registrar` field was never set in `FLTGoogleMapController`.
This made asset lookup return nil in `interepretMapOptions` resulting in
custom marker images not working.
---
 packages/google_maps_flutter/CHANGELOG.md                    | 5 +++++
 .../google_maps_flutter/ios/Classes/GoogleMapController.m    | 1 +
 packages/google_maps_flutter/pubspec.yaml                    | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 42cf034b0f8d..bdb0d9e92ca9 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.0.3+1
+
+* Bug fix: custom marker images were not working on iOS as we were not keeping
+  a reference to the plugin registrar so couldn't fetch assets.
+
 ## 0.0.3
 
 * Don't export `dart:async`.
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index eb18a15cf565..50786b6cc20c 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -74,6 +74,7 @@ - (instancetype)initWithFrame:(CGRect)frame
       }
     }];
     _mapView.delegate = weakSelf;
+    _registrar = registrar;
   }
   return self;
 }
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index a7dee32fb153..d75510e5b7b4 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.0.3
+version: 0.0.3+1
 
 dependencies:
   flutter:
@@ -14,6 +14,7 @@ flutter:
     iosPrefix: FLT
     pluginClass: GoogleMapsPlugin
 
+
 environment:
   sdk: ">=2.0.0-dev.47.0 <3.0.0"
   flutter: ">=0.11.10 <2.0.0"

From 24761ac082b6bed412d6543ff140540f74662cec Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Wed, 28 Nov 2018 15:46:56 -0800
Subject: [PATCH 020/410] Camera uses the device orientation on Android (#942)

Update the camera to use the physical device's orientation instead of
the UI orientation. Fixes issue where captured media is orientated to
match the screen UI at the time, instead of the actual device rotation.

Fixes flutter/flutter#18391
---
 packages/camera/CHANGELOG.md                  |  5 ++
 .../flutter/plugins/camera/CameraPlugin.java  | 51 +++++++++++--------
 packages/camera/pubspec.yaml                  |  2 +-
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 0b19430041a4..1ea41de34af9 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.6
+
+* Update the camera to use the physical device's orientation instead of the UI
+  orientation on Android.
+
 ## 0.2.5
 
 * Fix preview and video size with satisfying conditions of multiple outputs.
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index 61ea4fff3560..b7f104d95ba1 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -1,5 +1,7 @@
 package io.flutter.plugins.camera;
 
+import static android.view.OrientationEventListener.ORIENTATION_UNKNOWN;
+
 import android.Manifest;
 import android.app.Activity;
 import android.app.Application;
@@ -25,8 +27,8 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Size;
-import android.util.SparseIntArray;
 import android.view.Display;
+import android.view.OrientationEventListener;
 import android.view.Surface;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugin.common.MethodCall;
@@ -52,15 +54,6 @@ public class CameraPlugin implements MethodCallHandler {
 
   private static final int CAMERA_REQUEST_ID = 513469796;
   private static final String TAG = "CameraPlugin";
-  private static final SparseIntArray ORIENTATIONS =
-      new SparseIntArray() {
-        {
-          append(Surface.ROTATION_0, 0);
-          append(Surface.ROTATION_90, 90);
-          append(Surface.ROTATION_180, 180);
-          append(Surface.ROTATION_270, 270);
-        }
-      };
 
   private static CameraManager cameraManager;
   private final FlutterView view;
@@ -71,12 +64,26 @@ public class CameraPlugin implements MethodCallHandler {
   // The code to run after requesting camera permissions.
   private Runnable cameraPermissionContinuation;
   private boolean requestingPermission;
+  private final OrientationEventListener orientationEventListener;
+  private int currentOrientation = ORIENTATION_UNKNOWN;
 
   private CameraPlugin(Registrar registrar, FlutterView view, Activity activity) {
     this.registrar = registrar;
     this.view = view;
     this.activity = activity;
 
+    orientationEventListener =
+        new OrientationEventListener(activity.getApplicationContext()) {
+          @Override
+          public void onOrientationChanged(int i) {
+            if (i == ORIENTATION_UNKNOWN) {
+              return;
+            }
+            // Convert the raw deg angle to the nearest multiple of 90.
+            currentOrientation = (int) Math.round(i / 90.0) * 90;
+          }
+        };
+
     registrar.addRequestPermissionsResultListener(new CameraRequestPermissionsListener());
 
     this.activityLifecycleCallbacks =
@@ -94,6 +101,7 @@ public void onActivityResumed(Activity activity) {
               return;
             }
             if (activity == CameraPlugin.this.activity) {
+              orientationEventListener.enable();
               if (camera != null) {
                 camera.open(null);
               }
@@ -103,6 +111,7 @@ public void onActivityResumed(Activity activity) {
           @Override
           public void onActivityPaused(Activity activity) {
             if (activity == CameraPlugin.this.activity) {
+              orientationEventListener.disable();
               if (camera != null) {
                 camera.close();
               }
@@ -185,6 +194,7 @@ public void onMethodCall(MethodCall call, final Result result) {
           this.activity
               .getApplication()
               .registerActivityLifecycleCallbacks(this.activityLifecycleCallbacks);
+          orientationEventListener.enable();
           break;
         }
       case "takePicture":
@@ -373,8 +383,7 @@ private void computeBestPreviewAndRecordingSize(
       Display display = activity.getWindowManager().getDefaultDisplay();
       display.getRealSize(screenResolution);
 
-      int displayRotation = activity.getWindowManager().getDefaultDisplay().getRotation();
-      boolean swapWH = (displayRotation + sensorOrientation) % 180 == 90;
+      final boolean swapWH = getMediaOrientation() % 180 == 90;
       int screenWidth = swapWH ? screenResolution.y : screenResolution.x;
       int screenHeight = swapWH ? screenResolution.x : screenResolution.y;
 
@@ -439,11 +448,7 @@ private void prepareMediaRecorder(String outputFilePath) throws IOException {
       mediaRecorder.setVideoFrameRate(27);
       mediaRecorder.setVideoSize(videoSize.getWidth(), videoSize.getHeight());
       mediaRecorder.setOutputFile(outputFilePath);
-
-      int displayRotation = activity.getWindowManager().getDefaultDisplay().getRotation();
-      int displayOrientation = ORIENTATIONS.get(displayRotation);
-      if (isFrontFacing) displayOrientation = -displayOrientation;
-      mediaRecorder.setOrientationHint((displayOrientation + sensorOrientation) % 360);
+      mediaRecorder.setOrientationHint(getMediaOrientation());
 
       mediaRecorder.prepare();
     }
@@ -567,11 +572,7 @@ public void onImageAvailable(ImageReader reader) {
         final CaptureRequest.Builder captureBuilder =
             cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
         captureBuilder.addTarget(imageReader.getSurface());
-        int displayRotation = activity.getWindowManager().getDefaultDisplay().getRotation();
-        int displayOrientation = ORIENTATIONS.get(displayRotation);
-        if (isFrontFacing) displayOrientation = -displayOrientation;
-        captureBuilder.set(
-            CaptureRequest.JPEG_ORIENTATION, (-displayOrientation + sensorOrientation) % 360);
+        captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, getMediaOrientation());
 
         cameraCaptureSession.capture(
             captureBuilder.build(),
@@ -764,5 +765,11 @@ private void dispose() {
       close();
       textureEntry.release();
     }
+
+    private int getMediaOrientation() {
+      final int sensorOrientationOffset =
+          (isFrontFacing) ? -currentOrientation : currentOrientation;
+      return (sensorOrientationOffset + sensorOrientation + 360) % 360;
+    }
   }
 }
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 9094517b68d3..9a7e109f2864 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -1,7 +1,7 @@
 name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed and capturing images.
-version: 0.2.5
+version: 0.2.6
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From f54e86cc06ba21e1c59e0786096c5b738bd5df2e Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Wed, 28 Nov 2018 16:57:19 -0800
Subject: [PATCH 021/410] Don't recommend to add maps as a git dependency any
 more. (#944)

(Now that it is on pub).
---
 packages/google_maps_flutter/README.md | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/google_maps_flutter/README.md b/packages/google_maps_flutter/README.md
index 190b44921434..eb2031446349 100644
--- a/packages/google_maps_flutter/README.md
+++ b/packages/google_maps_flutter/README.md
@@ -20,14 +20,7 @@ The API exposed by this plugin is not yet stable, and we expect some breaking ch
 
 ## Usage
 
-To use this plugin, add
-```yaml
- google_maps_flutter:
-   git:
-     url: git://github.com/flutter/plugins
-     path: packages/google_maps_flutter
-```
-as a [dependency in your pubspec.yaml file](https://flutter.io/platform-plugins/).
+To use this plugin, add `google_maps_flutter` as a [dependency in your pubspec.yaml file](https://flutter.io/platform-plugins/).
 
 ## Getting Started
 

From d46def365b21487a1b3332ff099900f25f3e7e19 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Wed, 28 Nov 2018 17:40:52 -0800
Subject: [PATCH 022/410] Bump maps plugin version. (#945)

Just so we can publish the fixed README to pub.
---
 packages/google_maps_flutter/CHANGELOG.md | 4 ++++
 packages/google_maps_flutter/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index bdb0d9e92ca9..534b5c22f13d 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.3+2
+
+* Update README to recommend using the package from pub.
+
 ## 0.0.3+1
 
 * Bug fix: custom marker images were not working on iOS as we were not keeping
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index d75510e5b7b4..8060b075be64 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.0.3+1
+version: 0.0.3+2
 
 dependencies:
   flutter:

From e0afdaa32e8263c3caf581e84da2e8526d21d679 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Thu, 29 Nov 2018 11:37:10 -0800
Subject: [PATCH 023/410] [google_maps_flutter] Relax Flutter version
 requirement to 0.11.9 (#946)

This is the latest version currently available for pub health checks.
We should increase the requirement once pub updates its Flutter version
(to make sure we're running with the recent Skia texture fixes).
---
 packages/google_maps_flutter/CHANGELOG.md | 4 ++++
 packages/google_maps_flutter/pubspec.yaml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 534b5c22f13d..e337e7f88a14 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.3+3
+
+* Relax Flutter version requirement to 0.11.9.
+
 ## 0.0.3+2
 
 * Update README to recommend using the package from pub.
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 8060b075be64..032cc3b8ffa9 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.0.3+2
+version: 0.0.3+3
 
 dependencies:
   flutter:
@@ -17,4 +17,4 @@ flutter:
 
 environment:
   sdk: ">=2.0.0-dev.47.0 <3.0.0"
-  flutter: ">=0.11.10 <2.0.0"
+  flutter: ">=0.11.9 <2.0.0"

From 821f854f1119abfa43e21be9f5fc11ee9359a447 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Fri, 30 Nov 2018 15:24:57 -0800
Subject: [PATCH 024/410] Show https://flutter.io in the webview_flutter
 example. (#950)

It turns out on some devices loading the Youtube site in a webview
results in launching the Youtube app. The Flutter website serves as a
better example.
---
 packages/webview_flutter/example/lib/main.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index 651ead7f306b..8bed253e8019 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -17,7 +17,7 @@ class WebViewExample extends StatelessWidget {
         actions: <Widget>[const SampleMenu()],
       ),
       body: const WebView(
-        initialUrl: 'https://youtube.com',
+        initialUrl: 'https://flutter.io',
         javaScriptMode: JavaScriptMode.unrestricted,
       ),
     );

From f6452cfaa42f3680d43904538f7ecbf95037bdf0 Mon Sep 17 00:00:00 2001
From: Sebastian Engel <sebastian@engel-projects.com>
Date: Mon, 3 Dec 2018 21:52:53 +0100
Subject: [PATCH 025/410] Fixes: 'webview_flutter/WebviewFlutterPlugin.h' file
 not found (#949)

iOS build was failing on case-sensitive filesystems as the plugin name "WebviewFlutter" didn't match the case of "WebViewFlutterPlugin.h".
---
 packages/webview_flutter/CHANGELOG.md                       | 6 +++++-
 ...{WebviewFlutterPlugin.java => WebViewFlutterPlugin.java} | 4 ++--
 packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.h | 2 +-
 packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.m | 2 +-
 packages/webview_flutter/pubspec.yaml                       | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)
 rename packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/{WebviewFlutterPlugin.java => WebViewFlutterPlugin.java} (84%)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 41cc7d8192ec..7d2c8cbe71ce 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.1+1
+
+* Fix case for "FLTWebViewFlutterPlugin" (iOS was failing to buld on case-sensitive file systems).
+
 ## 0.0.1
 
-* TODO: Describe initial release.
+* TODO: Initial release.
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebviewFlutterPlugin.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
similarity index 84%
rename from packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebviewFlutterPlugin.java
rename to packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
index 71049351bac1..43efc4a658a0 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebviewFlutterPlugin.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
@@ -2,8 +2,8 @@
 
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
-/** WebviewFlutterPlugin */
-public class WebviewFlutterPlugin {
+/** WebViewFlutterPlugin */
+public class WebViewFlutterPlugin {
   /** Plugin registration. */
   public static void registerWith(Registrar registrar) {
     registrar
diff --git a/packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.h b/packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.h
index ac25ee4d6856..fffaedbe513b 100644
--- a/packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.h
+++ b/packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.h
@@ -4,5 +4,5 @@
 
 #import <Flutter/Flutter.h>
 
-@interface FLTWebviewFlutterPlugin : NSObject <FlutterPlugin>
+@interface FLTWebViewFlutterPlugin : NSObject <FlutterPlugin>
 @end
diff --git a/packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.m b/packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.m
index 1a1b6154782f..89fd6008d3b1 100644
--- a/packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.m
+++ b/packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.m
@@ -1,7 +1,7 @@
 #import "WebViewFlutterPlugin.h"
 #import "FlutterWebView.h"
 
-@implementation FLTWebviewFlutterPlugin
+@implementation FLTWebViewFlutterPlugin
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
   FLTWebViewFactory* webviewFactory =
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index b4dc0aa325ee..4adebee96387 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A WebView Plugin for Flutter.
-version: 0.0.1
+version: 0.0.1+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 
@@ -20,4 +20,4 @@ flutter:
   plugin:
     androidPackage: io.flutter.plugins.webviewflutter
     iosPrefix: FLT
-    pluginClass: WebviewFlutterPlugin
+    pluginClass: WebViewFlutterPlugin

From a2cd08ad6f3c3e78d366e5df6832bfe8c676570e Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Mon, 3 Dec 2018 13:17:08 -0800
Subject: [PATCH 026/410] Make the description for webview_flutter longer.
 (#956)

Apparently if the description is shorter than 60 characters you lose
maintaenance points on the pub website.
---
 packages/webview_flutter/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 4adebee96387..0060e90ce0a8 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,5 +1,5 @@
 name: webview_flutter
-description: A WebView Plugin for Flutter.
+description: A Flutter plugin that provides a WebView widget on Android and iOS.
 version: 0.0.1+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter

From 8603d2d60eecdac2aa75f07e456d28203fe20292 Mon Sep 17 00:00:00 2001
From: Abdellah Chadidi <chadidi97@gmail.com>
Date: Tue, 4 Dec 2018 00:36:52 +0100
Subject: [PATCH 027/410] add new plugins references to README.md (#954)

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fae41f727d6d..8cb4e83395aa 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,8 @@ These are the available plugins in this repository.
 | [battery](./packages/battery/) | [![pub package](https://img.shields.io/pub/v/battery.svg)](https://pub.dartlang.org/packages/battery) |
 | [camera](./packages/camera/) | [![pub package](https://img.shields.io/pub/v/camera.svg)](https://pub.dartlang.org/packages/camera) |
 | [connectivity](./packages/connectivity/) | [![pub package](https://img.shields.io/pub/v/connectivity.svg)](https://pub.dartlang.org/packages/connectivity) |
-| [device info](./packages/device_info/) | [![pub package](https://img.shields.io/pub/v/device_info.svg)](https://pub.dartlang.org/packages/device_info) |
+| [device_info](./packages/device_info/) | [![pub package](https://img.shields.io/pub/v/device_info.svg)](https://pub.dartlang.org/packages/device_info) |
+| [google_maps_flutter](./packages/google_maps_flutter) | [![pub package](https://img.shields.io/pub/v/google_maps_flutter.svg)](https://pub.dartlang.org/packages/google_maps_flutter) |
 | [google_sign_in](./packages/google_sign_in/) | [![pub package](https://img.shields.io/pub/v/google_sign_in.svg)](https://pub.dartlang.org/packages/google_sign_in) |
 | [image_picker](./packages/image_picker/) | [![pub package](https://img.shields.io/pub/v/image_picker.svg)](https://pub.dartlang.org/packages/image_picker) |
 | [local_auth](./packages/local_auth/) | [![pub package](https://img.shields.io/pub/v/local_auth.svg)](https://pub.dartlang.org/packages/local_auth) |
@@ -55,6 +56,7 @@ These are the available plugins in this repository.
 | [shared_preferences](./packages/shared_preferences/) | [![pub package](https://img.shields.io/pub/v/shared_preferences.svg)](https://pub.dartlang.org/packages/shared_preferences) |
 | [url_launcher](./packages/url_launcher/) | [![pub package](https://img.shields.io/pub/v/url_launcher.svg)](https://pub.dartlang.org/packages/url_launcher) |
 | [video_player](./packages/video_player/) | [![pub package](https://img.shields.io/pub/v/video_player.svg)](https://pub.dartlang.org/packages/video_player) |
+| [webview_flutter](./packages/webview_flutter/) | [![pub package](https://img.shields.io/pub/v/webview_flutter.svg)](https://pub.dartlang.org/packages/webview_flutter) |
 | | |
 | **FlutterFire Plugins** |  |
 | [cloud_firestore](./packages/cloud_firestore/) | [![pub package](https://img.shields.io/pub/v/cloud_firestore.svg)](https://pub.dartlang.org/packages/cloud_firestore)

From d89cae7289ec4f7a51b6e7a17e3f0bb9498d0b19 Mon Sep 17 00:00:00 2001
From: Alan Russian <alanrussian@gmail.com>
Date: Wed, 5 Dec 2018 13:29:01 -0800
Subject: [PATCH 028/410] Fail call when trying to recover auth with
 backgrounded app (#960)

We noticed some Android (native) crashes in our application when we're trying to call the get token method when our app is in the background. This is easy to prevent by returning a failed result.
---
 .../googlesignin/GoogleSignInPlugin.java      | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java b/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
index ef6d4c04eee6..d2fc260c7b1c 100755
--- a/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
+++ b/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
@@ -469,12 +469,19 @@ public void run(Future<String> tokenFuture) {
               } catch (ExecutionException e) {
                 if (e.getCause() instanceof UserRecoverableAuthException) {
                   if (shouldRecoverAuth && pendingOperation == null) {
-                    checkAndSetPendingOperation(METHOD_GET_TOKENS, result, email);
-                    Intent recoveryIntent =
-                        ((UserRecoverableAuthException) e.getCause()).getIntent();
-                    registrar
-                        .activity()
-                        .startActivityForResult(recoveryIntent, REQUEST_CODE_RECOVER_AUTH);
+                    Activity activity = registrar.activity();
+                    if (activity == null) {
+                      result.error(
+                          ERROR_USER_RECOVERABLE_AUTH,
+                          "Cannot recover auth because app is not in foreground. "
+                              + e.getLocalizedMessage(),
+                          null);
+                    } else {
+                      checkAndSetPendingOperation(METHOD_GET_TOKENS, result, email);
+                      Intent recoveryIntent =
+                          ((UserRecoverableAuthException) e.getCause()).getIntent();
+                      activity.startActivityForResult(recoveryIntent, REQUEST_CODE_RECOVER_AUTH);
+                    }
                   } else {
                     result.error(ERROR_USER_RECOVERABLE_AUTH, e.getLocalizedMessage(), null);
                   }

From 5f9affc8edc2685cd34d62950244e5edc81363b9 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Thu, 6 Dec 2018 11:23:30 -0800
Subject: [PATCH 029/410] Control the GoogleMap options with widget parameters.
 (#961)

The current Google Maps API was completely controller based (it was
designed before the platform views support).
Now that the GoogleMap is a widget, we are re-designing the API
around the GoogleMap widget.

This PR removes the public GoogleMapOptions class, and moves the map
options to be widget parameters. When the widget is rebuilt we compute
the options delta and send an update over the method channel.

The `initialCameraPosition` parameter was moved out of the
GoogleMapOptions Android and iOS implementations as we do not update
it when the map options are updated.

Additional API tweaks in this change:
  * Make `initialCameraPosition` a required parameter for the `GoogleMap`
    widget.
  * Don't require an onMapCreated parameter for `GoogleMap`.
---
 packages/google_maps_flutter/CHANGELOG.md     |   4 +
 .../flutter/plugins/googlemaps/Convert.java   |   6 +-
 .../plugins/googlemaps/GoogleMapBuilder.java  |   3 +-
 .../googlemaps/GoogleMapController.java       |   6 -
 .../plugins/googlemaps/GoogleMapFactory.java  |  12 +-
 .../googlemaps/GoogleMapOptionsSink.java      |   3 -
 .../example/lib/animate_camera.dart           |  13 +-
 .../example/lib/map_ui.dart                   | 150 +++---
 .../example/lib/move_camera.dart              |  13 +-
 .../example/lib/place_marker.dart             |   8 +-
 .../example/lib/scrolling_map.dart            |  16 +-
 .../ios/Classes/GoogleMapController.h         |   1 -
 .../ios/Classes/GoogleMapController.m         |   8 +-
 .../google_maps_flutter/lib/src/camera.dart   |  27 +-
 .../lib/src/controller.dart                   |  34 +-
 .../lib/src/google_map.dart                   | 202 ++++++-
 .../google_maps_flutter/lib/src/location.dart |  11 +-
 packages/google_maps_flutter/lib/src/ui.dart  | 188 +------
 packages/google_maps_flutter/pubspec.yaml     |   6 +-
 .../test/google_map_test.dart                 | 499 ++++++++++++++++++
 20 files changed, 878 insertions(+), 332 deletions(-)
 create mode 100644 packages/google_maps_flutter/test/google_map_test.dart

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index e337e7f88a14..c703bc1b4fbb 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0
+
+* Move the map options from the GoogleMapOptions class to GoogleMap widget parameters.
+
 ## 0.0.3+3
 
 * Relax Flutter version requirement to 0.11.9.
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
index b9314eb3c87c..cacb7459161b 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
@@ -46,7 +46,7 @@ private static boolean toBoolean(Object o) {
     return (Boolean) o;
   }
 
-  private static CameraPosition toCameraPosition(Object o) {
+  static CameraPosition toCameraPosition(Object o) {
     final Map<?, ?> data = toMap(o);
     final CameraPosition.Builder builder = CameraPosition.builder();
     builder.bearing(toFloat(data.get("bearing")));
@@ -165,10 +165,6 @@ private static String toString(Object o) {
 
   static void interpretGoogleMapOptions(Object o, GoogleMapOptionsSink sink) {
     final Map<?, ?> data = toMap(o);
-    final Object cameraPosition = data.get("cameraPosition");
-    if (cameraPosition != null) {
-      sink.setCameraPosition(toCameraPosition(cameraPosition));
-    }
     final Object cameraTargetBounds = data.get("cameraTargetBounds");
     if (cameraTargetBounds != null) {
       final List<?> targetData = toList(cameraTargetBounds);
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
index 64d553327dad..ea2b90ad6853 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
@@ -26,8 +26,7 @@ GoogleMapController build(
     return controller;
   }
 
-  @Override
-  public void setCameraPosition(CameraPosition position) {
+  public void setInitialCameraPosition(CameraPosition position) {
     options.camera(position);
   }
 
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index 2eebcb200290..79e34bd9bd3b 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -20,7 +20,6 @@
 import android.util.Log;
 import android.view.View;
 import com.google.android.gms.maps.CameraUpdate;
-import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMapOptions;
 import com.google.android.gms.maps.MapView;
@@ -352,11 +351,6 @@ public void onActivityDestroyed(Activity activity) {
 
   // GoogleMapOptionsSink methods
 
-  @Override
-  public void setCameraPosition(CameraPosition position) {
-    googleMap.moveCamera(CameraUpdateFactory.newCameraPosition(position));
-  }
-
   @Override
   public void setCameraTargetBounds(LatLngBounds bounds) {
     googleMap.setLatLngBoundsForCameraTarget(bounds);
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
index 8e2d18e66e14..5d85ad2731ff 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
@@ -3,9 +3,11 @@
 import static io.flutter.plugin.common.PluginRegistry.Registrar;
 
 import android.content.Context;
+import com.google.android.gms.maps.model.CameraPosition;
 import io.flutter.plugin.common.StandardMessageCodec;
 import io.flutter.plugin.platform.PlatformView;
 import io.flutter.plugin.platform.PlatformViewFactory;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class GoogleMapFactory extends PlatformViewFactory {
@@ -20,9 +22,15 @@ public GoogleMapFactory(AtomicInteger state, Registrar registrar) {
   }
 
   @Override
-  public PlatformView create(Context context, int id, Object params) {
+  public PlatformView create(Context context, int id, Object args) {
+    Map<String, Object> params = (Map<String, Object>) args;
     final GoogleMapBuilder builder = new GoogleMapBuilder();
-    Convert.interpretGoogleMapOptions(params, builder);
+
+    Convert.interpretGoogleMapOptions(params.get("options"), builder);
+    if (params.containsKey("initialCameraPosition")) {
+      CameraPosition position = Convert.toCameraPosition(params.get("initialCameraPosition"));
+      builder.setInitialCameraPosition(position);
+    }
     return builder.build(id, context, mActivityState, mPluginRegistrar);
   }
 }
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
index 03b67aa55ebc..3a166bfae503 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
@@ -4,13 +4,10 @@
 
 package io.flutter.plugins.googlemaps;
 
-import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLngBounds;
 
 /** Receiver of GoogleMap configuration options. */
 interface GoogleMapOptionsSink {
-  void setCameraPosition(CameraPosition position);
-
   void setCameraTargetBounds(LatLngBounds bounds);
 
   void setCompassEnabled(boolean compassEnabled);
diff --git a/packages/google_maps_flutter/example/lib/animate_camera.dart b/packages/google_maps_flutter/example/lib/animate_camera.dart
index c4bc067a5272..fe4283d7bb18 100644
--- a/packages/google_maps_flutter/example/lib/animate_camera.dart
+++ b/packages/google_maps_flutter/example/lib/animate_camera.dart
@@ -38,11 +38,14 @@ class AnimateCameraState extends State<AnimateCamera> {
       children: <Widget>[
         Center(
           child: SizedBox(
-              width: 300.0,
-              height: 200.0,
-              child: GoogleMap(
-                  onMapCreated: _onMapCreated,
-                  options: GoogleMapOptions.defaultOptions)),
+            width: 300.0,
+            height: 200.0,
+            child: GoogleMap(
+              onMapCreated: _onMapCreated,
+              initialCameraPosition:
+                  const CameraPosition(target: LatLng(0.0, 0.0)),
+            ),
+          ),
         ),
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
diff --git a/packages/google_maps_flutter/example/lib/map_ui.dart b/packages/google_maps_flutter/example/lib/map_ui.dart
index 589fa2bbbe55..993bddd99ae9 100644
--- a/packages/google_maps_flutter/example/lib/map_ui.dart
+++ b/packages/google_maps_flutter/example/lib/map_ui.dart
@@ -31,17 +31,23 @@ class MapUiBody extends StatefulWidget {
 class MapUiBodyState extends State<MapUiBody> {
   MapUiBodyState();
 
-  GoogleMapController mapController;
-  CameraPosition _position;
-  GoogleMapOptions _options = GoogleMapOptions(
-    cameraPosition: const CameraPosition(
-      target: LatLng(-33.852, 151.211),
-      zoom: 11.0,
-    ),
-    trackCameraPosition: true,
-    compassEnabled: true,
+  static final CameraPosition _kInitialPosition = const CameraPosition(
+    target: LatLng(-33.852, 151.211),
+    zoom: 11.0,
   );
+
+  GoogleMapController mapController;
+  CameraPosition _position = _kInitialPosition;
   bool _isMoving = false;
+  bool _compassEnabled = true;
+  CameraTargetBounds _cameraTargetBounds = CameraTargetBounds.unbounded;
+  MinMaxZoomPreference _minMaxZoomPreference = MinMaxZoomPreference.unbounded;
+  MapType _mapType = MapType.normal;
+  bool _rotateGesturesEnabled = true;
+  bool _scrollGesturesEnabled = true;
+  bool _tiltGesturesEnabled = true;
+  bool _zoomGesturesEnabled = true;
+  bool _myLocationEnabled = true;
 
   @override
   void initState() {
@@ -55,7 +61,6 @@ class MapUiBodyState extends State<MapUiBody> {
   }
 
   void _extractMapInfo() {
-    _options = mapController.options;
     _position = mapController.cameraPosition;
     _isMoving = mapController.isCameraMoving;
   }
@@ -68,11 +73,11 @@ class MapUiBodyState extends State<MapUiBody> {
 
   Widget _compassToggler() {
     return FlatButton(
-      child: Text('${_options.compassEnabled ? 'disable' : 'enable'} compass'),
+      child: Text('${_compassEnabled ? 'disable' : 'enable'} compass'),
       onPressed: () {
-        mapController.updateMapOptions(
-          GoogleMapOptions(compassEnabled: !_options.compassEnabled),
-        );
+        setState(() {
+          _compassEnabled = !_compassEnabled;
+        });
       },
     );
   }
@@ -80,124 +85,120 @@ class MapUiBodyState extends State<MapUiBody> {
   Widget _latLngBoundsToggler() {
     return FlatButton(
       child: Text(
-        _options.cameraTargetBounds.bounds == null
+        _cameraTargetBounds.bounds == null
             ? 'bound camera target'
             : 'release camera target',
       ),
       onPressed: () {
-        mapController.updateMapOptions(
-          GoogleMapOptions(
-            cameraTargetBounds: _options.cameraTargetBounds.bounds == null
-                ? CameraTargetBounds(sydneyBounds)
-                : CameraTargetBounds.unbounded,
-          ),
-        );
+        setState(() {
+          _cameraTargetBounds = _cameraTargetBounds.bounds == null
+              ? CameraTargetBounds(sydneyBounds)
+              : CameraTargetBounds.unbounded;
+        });
       },
     );
   }
 
   Widget _zoomBoundsToggler() {
     return FlatButton(
-      child: Text(_options.minMaxZoomPreference.minZoom == null
+      child: Text(_minMaxZoomPreference.minZoom == null
           ? 'bound zoom'
           : 'release zoom'),
       onPressed: () {
-        mapController.updateMapOptions(
-          GoogleMapOptions(
-            minMaxZoomPreference: _options.minMaxZoomPreference.minZoom == null
-                ? const MinMaxZoomPreference(12.0, 16.0)
-                : MinMaxZoomPreference.unbounded,
-          ),
-        );
+        setState(() {
+          _minMaxZoomPreference = _minMaxZoomPreference.minZoom == null
+              ? const MinMaxZoomPreference(12.0, 16.0)
+              : MinMaxZoomPreference.unbounded;
+        });
       },
     );
   }
 
   Widget _mapTypeCycler() {
     final MapType nextType =
-        MapType.values[(_options.mapType.index + 1) % MapType.values.length];
+        MapType.values[(_mapType.index + 1) % MapType.values.length];
     return FlatButton(
       child: Text('change map type to $nextType'),
       onPressed: () {
-        mapController.updateMapOptions(
-          GoogleMapOptions(mapType: nextType),
-        );
+        setState(() {
+          _mapType = nextType;
+        });
       },
     );
   }
 
   Widget _rotateToggler() {
     return FlatButton(
-      child: Text(
-          '${_options.rotateGesturesEnabled ? 'disable' : 'enable'} rotate'),
+      child: Text('${_rotateGesturesEnabled ? 'disable' : 'enable'} rotate'),
       onPressed: () {
-        mapController.updateMapOptions(
-          GoogleMapOptions(
-            rotateGesturesEnabled: !_options.rotateGesturesEnabled,
-          ),
-        );
+        setState(() {
+          _rotateGesturesEnabled = !_rotateGesturesEnabled;
+        });
       },
     );
   }
 
   Widget _scrollToggler() {
     return FlatButton(
-      child: Text(
-          '${_options.scrollGesturesEnabled ? 'disable' : 'enable'} scroll'),
+      child: Text('${_scrollGesturesEnabled ? 'disable' : 'enable'} scroll'),
       onPressed: () {
-        mapController.updateMapOptions(
-          GoogleMapOptions(
-            scrollGesturesEnabled: !_options.scrollGesturesEnabled,
-          ),
-        );
+        setState(() {
+          _scrollGesturesEnabled = !_scrollGesturesEnabled;
+        });
       },
     );
   }
 
   Widget _tiltToggler() {
     return FlatButton(
-      child:
-          Text('${_options.tiltGesturesEnabled ? 'disable' : 'enable'} tilt'),
+      child: Text('${_tiltGesturesEnabled ? 'disable' : 'enable'} tilt'),
       onPressed: () {
-        mapController.updateMapOptions(
-          GoogleMapOptions(
-            tiltGesturesEnabled: !_options.tiltGesturesEnabled,
-          ),
-        );
+        setState(() {
+          _tiltGesturesEnabled = !_tiltGesturesEnabled;
+        });
       },
     );
   }
 
   Widget _zoomToggler() {
     return FlatButton(
-      child:
-          Text('${_options.zoomGesturesEnabled ? 'disable' : 'enable'} zoom'),
+      child: Text('${_zoomGesturesEnabled ? 'disable' : 'enable'} zoom'),
       onPressed: () {
-        mapController.updateMapOptions(
-          GoogleMapOptions(
-            zoomGesturesEnabled: !_options.zoomGesturesEnabled,
-          ),
-        );
+        setState(() {
+          _zoomGesturesEnabled = !_zoomGesturesEnabled;
+        });
       },
     );
   }
 
   Widget _myLocationToggler() {
     return FlatButton(
-      child: Text(
-          '${_options.myLocationEnabled ? 'disable' : 'enable'} my location'),
+      child: Text('${_myLocationEnabled ? 'disable' : 'enable'} my location'),
       onPressed: () {
-        mapController.updateMapOptions(
-          GoogleMapOptions(
-            myLocationEnabled: !_options.myLocationEnabled,
-          ),
-        );
+        setState(() {
+          _myLocationEnabled = !_myLocationEnabled;
+        });
       },
     );
   }
 
   @override
   Widget build(BuildContext context) {
+    final GoogleMap googleMap = GoogleMap(
+      onMapCreated: onMapCreated,
+      initialCameraPosition: _kInitialPosition,
+      trackCameraPosition: true,
+      compassEnabled: _compassEnabled,
+      cameraTargetBounds: _cameraTargetBounds,
+      minMaxZoomPreference: _minMaxZoomPreference,
+      mapType: _mapType,
+      rotateGesturesEnabled: _rotateGesturesEnabled,
+      scrollGesturesEnabled: _scrollGesturesEnabled,
+      tiltGesturesEnabled: _tiltGesturesEnabled,
+      zoomGesturesEnabled: _zoomGesturesEnabled,
+      myLocationEnabled: _myLocationEnabled,
+    );
+
     final List<Widget> columnChildren = <Widget>[
       Padding(
         padding: const EdgeInsets.all(10.0),
@@ -205,16 +206,7 @@ class MapUiBodyState extends State<MapUiBody> {
           child: SizedBox(
             width: 300.0,
             height: 200.0,
-            child: GoogleMap(
-              onMapCreated: onMapCreated,
-              options: GoogleMapOptions(
-                cameraPosition: const CameraPosition(
-                  target: LatLng(-33.852, 151.211),
-                  zoom: 11.0,
-                ),
-                trackCameraPosition: true,
-              ),
-            ),
+            child: googleMap,
           ),
         ),
       ),
diff --git a/packages/google_maps_flutter/example/lib/move_camera.dart b/packages/google_maps_flutter/example/lib/move_camera.dart
index 48117fc2a72d..299ac4b7cffc 100644
--- a/packages/google_maps_flutter/example/lib/move_camera.dart
+++ b/packages/google_maps_flutter/example/lib/move_camera.dart
@@ -37,11 +37,14 @@ class MoveCameraState extends State<MoveCamera> {
       children: <Widget>[
         Center(
           child: SizedBox(
-              width: 300.0,
-              height: 200.0,
-              child: GoogleMap(
-                  onMapCreated: _onMapCreated,
-                  options: GoogleMapOptions.defaultOptions)),
+            width: 300.0,
+            height: 200.0,
+            child: GoogleMap(
+              onMapCreated: _onMapCreated,
+              initialCameraPosition:
+                  const CameraPosition(target: LatLng(0.0, 0.0)),
+            ),
+          ),
         ),
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
diff --git a/packages/google_maps_flutter/example/lib/place_marker.dart b/packages/google_maps_flutter/example/lib/place_marker.dart
index 1fb8a84a6f01..58cefb0c0022 100644
--- a/packages/google_maps_flutter/example/lib/place_marker.dart
+++ b/packages/google_maps_flutter/example/lib/place_marker.dart
@@ -175,11 +175,9 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
             height: 200.0,
             child: GoogleMap(
               onMapCreated: _onMapCreated,
-              options: GoogleMapOptions(
-                cameraPosition: const CameraPosition(
-                  target: LatLng(-33.852, 151.211),
-                  zoom: 11.0,
-                ),
+              initialCameraPosition: const CameraPosition(
+                target: LatLng(-33.852, 151.211),
+                zoom: 11.0,
               ),
             ),
           ),
diff --git a/packages/google_maps_flutter/example/lib/scrolling_map.dart b/packages/google_maps_flutter/example/lib/scrolling_map.dart
index 88f75309b9bc..0ec271845aab 100644
--- a/packages/google_maps_flutter/example/lib/scrolling_map.dart
+++ b/packages/google_maps_flutter/example/lib/scrolling_map.dart
@@ -43,11 +43,9 @@ class ScrollingMapBody extends StatelessWidget {
                     height: 300.0,
                     child: GoogleMap(
                       onMapCreated: onMapCreated,
-                      options: GoogleMapOptions(
-                        cameraPosition: CameraPosition(
-                          target: center,
-                          zoom: 11.0,
-                        ),
+                      initialCameraPosition: CameraPosition(
+                        target: center,
+                        zoom: 11.0,
                       ),
                       gestureRecognizers:
                           <Factory<OneSequenceGestureRecognizer>>[
@@ -79,11 +77,9 @@ class ScrollingMapBody extends StatelessWidget {
                     height: 300.0,
                     child: GoogleMap(
                       onMapCreated: onMapCreated,
-                      options: GoogleMapOptions(
-                        cameraPosition: CameraPosition(
-                          target: center,
-                          zoom: 11.0,
-                        ),
+                      initialCameraPosition: CameraPosition(
+                        target: center,
+                        zoom: 11.0,
                       ),
                       gestureRecognizers:
                           <Factory<OneSequenceGestureRecognizer>>[
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
index ae3cff07f37a..572d96ab8439 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
@@ -8,7 +8,6 @@
 
 // Defines map UI options writable from Flutter.
 @protocol FLTGoogleMapOptionsSink
-- (void)setCamera:(GMSCameraPosition*)camera;
 - (void)setCameraTargetBounds:(GMSCoordinateBounds*)bounds;
 - (void)setCompassEnabled:(BOOL)enabled;
 - (void)setMapType:(GMSMapViewType)type;
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index 50786b6cc20c..acd99fad984b 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -58,11 +58,11 @@ - (instancetype)initWithFrame:(CGRect)frame
   if ([super init]) {
     _viewId = viewId;
 
-    GMSCameraPosition* camera = toOptionalCameraPosition(args[@"cameraPosition"]);
+    GMSCameraPosition* camera = toOptionalCameraPosition(args[@"initialCameraPosition"]);
     _mapView = [GMSMapView mapWithFrame:frame camera:camera];
     _markers = [NSMutableDictionary dictionaryWithCapacity:1];
     _trackCameraPosition = NO;
-    interpretMapOptions(args, self);
+    interpretMapOptions(args[@"options"], self);
     NSString* channelName =
         [NSString stringWithFormat:@"plugins.flutter.io/google_maps_%lld", viewId];
     _channel = [FlutterMethodChannel methodChannelWithName:channelName
@@ -346,10 +346,6 @@ static GMSMapViewType toMapViewType(id json) {
 
 static void interpretMapOptions(id json, id<FLTGoogleMapOptionsSink> sink) {
   NSDictionary* data = json;
-  id cameraPosition = data[@"cameraPosition"];
-  if (cameraPosition) {
-    [sink setCamera:toCameraPosition(cameraPosition)];
-  }
   id cameraTargetBounds = data[@"cameraTargetBounds"];
   if (cameraTargetBounds) {
     [sink setCameraTargetBounds:toOptionalBounds(cameraTargetBounds)];
diff --git a/packages/google_maps_flutter/lib/src/camera.dart b/packages/google_maps_flutter/lib/src/camera.dart
index 804d39c9b420..ceb4289ca663 100644
--- a/packages/google_maps_flutter/lib/src/camera.dart
+++ b/packages/google_maps_flutter/lib/src/camera.dart
@@ -51,14 +51,15 @@ class CameraPosition {
   /// will be silently clamped to the supported range.
   final double zoom;
 
-  dynamic _toJson() => <String, dynamic>{
+  dynamic _toMap() => <String, dynamic>{
         'bearing': bearing,
         'target': target._toJson(),
         'tilt': tilt,
         'zoom': zoom,
       };
 
-  static CameraPosition _fromJson(dynamic json) {
+  @visibleForTesting
+  static CameraPosition fromMap(dynamic json) {
     if (json == null) {
       return null;
     }
@@ -69,6 +70,24 @@ class CameraPosition {
       zoom: json['zoom'],
     );
   }
+
+  @override
+  bool operator ==(dynamic other) {
+    if (identical(this, other)) return true;
+    if (runtimeType != other.runtimeType) return false;
+    final CameraPosition typedOther = other;
+    return bearing == typedOther.bearing &&
+        target == typedOther.target &&
+        tilt == typedOther.tilt &&
+        zoom == typedOther.zoom;
+  }
+
+  @override
+  int get hashCode => hashValues(bearing, target, tilt, zoom);
+
+  @override
+  String toString() =>
+      'CameraPosition(bearing: $bearing, target: $target, tilt: $tilt, zoom: $zoom)';
 }
 
 /// Defines a camera move, supporting absolute moves as well as moves relative
@@ -79,7 +98,7 @@ class CameraUpdate {
   /// Returns a camera update that moves the camera to the specified position.
   static CameraUpdate newCameraPosition(CameraPosition cameraPosition) {
     return CameraUpdate._(
-      <dynamic>['newCameraPosition', cameraPosition._toJson()],
+      <dynamic>['newCameraPosition', cameraPosition._toMap()],
     );
   }
 
@@ -96,7 +115,7 @@ class CameraUpdate {
   static CameraUpdate newLatLngBounds(LatLngBounds bounds, double padding) {
     return CameraUpdate._(<dynamic>[
       'newLatLngBounds',
-      bounds._toJson(),
+      bounds._toList(),
       padding,
     ]);
   }
diff --git a/packages/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/lib/src/controller.dart
index 629ab2a348ea..ee25ac2ce5e3 100644
--- a/packages/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/lib/src/controller.dart
@@ -18,28 +18,21 @@ part of google_maps_flutter;
 /// Marker tap events can be received by adding callbacks to [onMarkerTapped].
 class GoogleMapController extends ChangeNotifier {
   GoogleMapController._(
-      this._id, GoogleMapOptions options, MethodChannel channel)
+      this._id, MethodChannel channel, CameraPosition initialCameraPosition)
       : assert(_id != null),
-        assert(options != null),
-        assert(options.cameraPosition != null),
         assert(channel != null),
         _channel = channel {
-    if (options.trackCameraPosition) {
-      _cameraPosition = options.cameraPosition;
-    }
+    _cameraPosition = initialCameraPosition;
     _channel.setMethodCallHandler(_handleMethodCall);
-    _options = GoogleMapOptions.defaultOptions.copyWith(options);
   }
 
   static Future<GoogleMapController> init(
-      int id, GoogleMapOptions options) async {
+      int id, CameraPosition initialCameraPosition) async {
     assert(id != null);
-    assert(options != null);
-    assert(options.cameraPosition != null);
     final MethodChannel channel =
         MethodChannel('plugins.flutter.io/google_maps_$id');
     await channel.invokeMethod('map#waitForMap');
-    return GoogleMapController._(id, options, channel);
+    return GoogleMapController._(id, channel, initialCameraPosition);
   }
 
   final MethodChannel _channel;
@@ -51,11 +44,6 @@ class GoogleMapController extends ChangeNotifier {
   final ArgumentCallbacks<Marker> onInfoWindowTapped =
       ArgumentCallbacks<Marker>();
 
-  /// The configuration options most recently applied via controller
-  /// initialization or [updateMapOptions].
-  GoogleMapOptions get options => _options;
-  GoogleMapOptions _options;
-
   /// The current set of markers on this map.
   ///
   /// The returned set will be a detached snapshot of the markers collection.
@@ -67,8 +55,7 @@ class GoogleMapController extends ChangeNotifier {
   bool _isCameraMoving = false;
 
   /// Returns the most recent camera position reported by the platform side.
-  /// Will be null, if camera position tracking is not enabled via
-  /// [GoogleMapOptions].
+  /// Will be null, if [GoogleMap.trackCameraPosition] is false.
   CameraPosition get cameraPosition => _cameraPosition;
   CameraPosition _cameraPosition;
 
@@ -96,7 +83,7 @@ class GoogleMapController extends ChangeNotifier {
         notifyListeners();
         break;
       case 'camera#onMove':
-        _cameraPosition = CameraPosition._fromJson(call.arguments['position']);
+        _cameraPosition = CameraPosition.fromMap(call.arguments['position']);
         notifyListeners();
         break;
       case 'camera#onIdle':
@@ -114,16 +101,15 @@ class GoogleMapController extends ChangeNotifier {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updateMapOptions(GoogleMapOptions changes) async {
-    assert(changes != null);
+  Future<void> _updateMapOptions(Map<String, dynamic> optionsUpdate) async {
+    assert(optionsUpdate != null);
     final dynamic json = await _channel.invokeMethod(
       'map#update',
       <String, dynamic>{
-        'options': changes._toJson(),
+        'options': optionsUpdate,
       },
     );
-    _options = _options.copyWith(changes);
-    _cameraPosition = CameraPosition._fromJson(json);
+    _cameraPosition = CameraPosition.fromMap(json);
     notifyListeners();
   }
 
diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/lib/src/google_map.dart
index 3f4298eb0339..a1f1ad408804 100644
--- a/packages/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/lib/src/google_map.dart
@@ -7,15 +7,80 @@ part of google_maps_flutter;
 typedef void MapCreatedCallback(GoogleMapController controller);
 
 class GoogleMap extends StatefulWidget {
-  GoogleMap({
-    @required this.onMapCreated,
-    GoogleMapOptions options,
+  const GoogleMap({
+    @required this.initialCameraPosition,
+    this.onMapCreated,
     this.gestureRecognizers,
-  }) : options = GoogleMapOptions.defaultOptions.copyWith(options);
+    this.compassEnabled = true,
+    this.cameraTargetBounds = CameraTargetBounds.unbounded,
+    this.mapType = MapType.normal,
+    this.minMaxZoomPreference = MinMaxZoomPreference.unbounded,
+    this.rotateGesturesEnabled = true,
+    this.scrollGesturesEnabled = true,
+    this.zoomGesturesEnabled = true,
+    this.tiltGesturesEnabled = true,
+    this.trackCameraPosition = false,
+    this.myLocationEnabled = false,
+  }) : assert(initialCameraPosition != null);
 
   final MapCreatedCallback onMapCreated;
 
-  final GoogleMapOptions options;
+  /// The initial position of the map's camera.
+  final CameraPosition initialCameraPosition;
+
+  /// True if the map should show a compass when rotated.
+  final bool compassEnabled;
+
+  /// Geographical bounding box for the camera target.
+  final CameraTargetBounds cameraTargetBounds;
+
+  /// Type of map tiles to be rendered.
+  final MapType mapType;
+
+  /// Preferred bounds for the camera zoom level.
+  ///
+  /// Actual bounds depend on map data and device.
+  final MinMaxZoomPreference minMaxZoomPreference;
+
+  /// True if the map view should respond to rotate gestures.
+  final bool rotateGesturesEnabled;
+
+  /// True if the map view should respond to scroll gestures.
+  final bool scrollGesturesEnabled;
+
+  /// True if the map view should respond to zoom gestures.
+  final bool zoomGesturesEnabled;
+
+  /// True if the map view should respond to tilt gestures.
+  final bool tiltGesturesEnabled;
+
+  /// True if the map view should relay camera move events to Flutter.
+  final bool trackCameraPosition;
+
+  /// True if a "My Location" layer should be shown on the map.
+  ///
+  /// This layer includes a location indicator at the current device location,
+  /// as well as a My Location button.
+  /// * The indicator is a small blue dot if the device is stationary, or a
+  /// chevron if the device is moving.
+  /// * The My Location button animates to focus on the user's current location
+  /// if the user's location is currently known.
+  ///
+  /// Enabling this feature requires adding location permissions to both native
+  /// platforms of your app.
+  /// * On Android add either
+  /// `<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />`
+  /// or `<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />`
+  /// to your `AndroidManifest.xml` file. `ACCESS_COARSE_LOCATION` returns a
+  /// location with an accuracy approximately equivalent to a city block, while
+  /// `ACCESS_FINE_LOCATION` returns as precise a location as possible, although
+  /// it consumes more battery power. You will also need to request these
+  /// permissions during run-time. If they are not granted, the My Location
+  /// feature will fail silently.
+  /// * On iOS add a `NSLocationWhenInUseUsageDescription` key to your
+  /// `Info.plist` file. This will automatically prompt the user for permissions
+  /// when the map tries to turn on the My Location layer.
+  final bool myLocationEnabled;
 
   /// Which gestures should be consumed by the map.
   ///
@@ -33,14 +98,23 @@ class GoogleMap extends StatefulWidget {
 }
 
 class _GoogleMapState extends State<GoogleMap> {
+  final Completer<GoogleMapController> _controller =
+      Completer<GoogleMapController>();
+
+  _GoogleMapOptions _googleMapOptions;
+
   @override
   Widget build(BuildContext context) {
+    final Map<String, dynamic> creationParams = <String, dynamic>{
+      'initialCameraPosition': widget.initialCameraPosition?._toMap(),
+      'options': _GoogleMapOptions.fromWidget(widget).toMap(),
+    };
     if (defaultTargetPlatform == TargetPlatform.android) {
       return AndroidView(
         viewType: 'plugins.flutter.io/google_maps',
         onPlatformViewCreated: onPlatformViewCreated,
         gestureRecognizers: widget.gestureRecognizers,
-        creationParams: widget.options._toJson(),
+        creationParams: creationParams,
         creationParamsCodec: const StandardMessageCodec(),
       );
     } else if (defaultTargetPlatform == TargetPlatform.iOS) {
@@ -48,7 +122,7 @@ class _GoogleMapState extends State<GoogleMap> {
         viewType: 'plugins.flutter.io/google_maps',
         onPlatformViewCreated: onPlatformViewCreated,
         gestureRecognizers: widget.gestureRecognizers,
-        creationParams: widget.options._toJson(),
+        creationParams: creationParams,
         creationParamsCodec: const StandardMessageCodec(),
       );
     }
@@ -57,9 +131,119 @@ class _GoogleMapState extends State<GoogleMap> {
         '$defaultTargetPlatform is not yet supported by the maps plugin');
   }
 
+  @override
+  void initState() {
+    super.initState();
+    _googleMapOptions = _GoogleMapOptions.fromWidget(widget);
+  }
+
+  @override
+  void didUpdateWidget(GoogleMap oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    final _GoogleMapOptions newOptions = _GoogleMapOptions.fromWidget(widget);
+    final Map<String, dynamic> updates =
+        _googleMapOptions.updatesMap(newOptions);
+    _updateOptions(updates);
+    _googleMapOptions = newOptions;
+  }
+
+  void _updateOptions(Map<String, dynamic> updates) async {
+    if (updates.isEmpty) {
+      return;
+    }
+    final GoogleMapController controller = await _controller.future;
+    controller._updateMapOptions(updates);
+  }
+
   Future<void> onPlatformViewCreated(int id) async {
     final GoogleMapController controller =
-        await GoogleMapController.init(id, widget.options);
-    widget.onMapCreated(controller);
+        await GoogleMapController.init(id, widget.initialCameraPosition);
+    _controller.complete(controller);
+    if (widget.onMapCreated != null) {
+      widget.onMapCreated(controller);
+    }
+  }
+}
+
+/// Configuration options for the GoogleMaps user interface.
+///
+/// When used to change configuration, null values will be interpreted as
+/// "do not change this configuration option".
+class _GoogleMapOptions {
+  _GoogleMapOptions({
+    this.compassEnabled,
+    this.cameraTargetBounds,
+    this.mapType,
+    this.minMaxZoomPreference,
+    this.rotateGesturesEnabled,
+    this.scrollGesturesEnabled,
+    this.tiltGesturesEnabled,
+    this.trackCameraPosition,
+    this.zoomGesturesEnabled,
+    this.myLocationEnabled,
+  });
+
+  static _GoogleMapOptions fromWidget(GoogleMap map) {
+    return _GoogleMapOptions(
+      compassEnabled: map.compassEnabled,
+      cameraTargetBounds: map.cameraTargetBounds,
+      mapType: map.mapType,
+      minMaxZoomPreference: map.minMaxZoomPreference,
+      rotateGesturesEnabled: map.rotateGesturesEnabled,
+      scrollGesturesEnabled: map.scrollGesturesEnabled,
+      tiltGesturesEnabled: map.tiltGesturesEnabled,
+      trackCameraPosition: map.trackCameraPosition,
+      zoomGesturesEnabled: map.zoomGesturesEnabled,
+      myLocationEnabled: map.myLocationEnabled,
+    );
+  }
+
+  final bool compassEnabled;
+
+  final CameraTargetBounds cameraTargetBounds;
+
+  final MapType mapType;
+
+  final MinMaxZoomPreference minMaxZoomPreference;
+
+  final bool rotateGesturesEnabled;
+
+  final bool scrollGesturesEnabled;
+
+  final bool tiltGesturesEnabled;
+
+  final bool trackCameraPosition;
+
+  final bool zoomGesturesEnabled;
+
+  final bool myLocationEnabled;
+
+  Map<String, dynamic> toMap() {
+    final Map<String, dynamic> optionsMap = <String, dynamic>{};
+
+    void addIfNonNull(String fieldName, dynamic value) {
+      if (value != null) {
+        optionsMap[fieldName] = value;
+      }
+    }
+
+    addIfNonNull('compassEnabled', compassEnabled);
+    addIfNonNull('cameraTargetBounds', cameraTargetBounds?._toJson());
+    addIfNonNull('mapType', mapType?.index);
+    addIfNonNull('minMaxZoomPreference', minMaxZoomPreference?._toJson());
+    addIfNonNull('rotateGesturesEnabled', rotateGesturesEnabled);
+    addIfNonNull('scrollGesturesEnabled', scrollGesturesEnabled);
+    addIfNonNull('tiltGesturesEnabled', tiltGesturesEnabled);
+    addIfNonNull('zoomGesturesEnabled', zoomGesturesEnabled);
+    addIfNonNull('trackCameraPosition', trackCameraPosition);
+    addIfNonNull('myLocationEnabled', myLocationEnabled);
+    return optionsMap;
+  }
+
+  Map<String, dynamic> updatesMap(_GoogleMapOptions newOptions) {
+    final Map<String, dynamic> prevOptionsMap = toMap();
+    return newOptions.toMap()
+      ..removeWhere(
+          (String key, dynamic value) => prevOptionsMap[key] == value);
   }
 }
diff --git a/packages/google_maps_flutter/lib/src/location.dart b/packages/google_maps_flutter/lib/src/location.dart
index 04aba845bc7b..d59412e2137b 100644
--- a/packages/google_maps_flutter/lib/src/location.dart
+++ b/packages/google_maps_flutter/lib/src/location.dart
@@ -38,9 +38,7 @@ class LatLng {
   }
 
   @override
-  String toString() {
-    return '$runtimeType[$latitude, $longitude]';
-  }
+  String toString() => '$runtimeType($latitude, $longitude)';
 
   @override
   bool operator ==(Object o) {
@@ -75,11 +73,12 @@ class LatLngBounds {
   /// The northeast corner of the rectangle.
   final LatLng northeast;
 
-  dynamic _toJson() {
+  dynamic _toList() {
     return <dynamic>[southwest._toJson(), northeast._toJson()];
   }
 
-  static LatLngBounds _fromJson(dynamic json) {
+  @visibleForTesting
+  static LatLngBounds fromList(dynamic json) {
     if (json == null) {
       return null;
     }
@@ -91,7 +90,7 @@ class LatLngBounds {
 
   @override
   String toString() {
-    return '$runtimeType[$southwest, $northeast]';
+    return '$runtimeType($southwest, $northeast)';
   }
 
   @override
diff --git a/packages/google_maps_flutter/lib/src/ui.dart b/packages/google_maps_flutter/lib/src/ui.dart
index 66cfc60a1c2b..ea96f3579d9d 100644
--- a/packages/google_maps_flutter/lib/src/ui.dart
+++ b/packages/google_maps_flutter/lib/src/ui.dart
@@ -42,7 +42,23 @@ class CameraTargetBounds {
   /// Unbounded camera target.
   static const CameraTargetBounds unbounded = CameraTargetBounds(null);
 
-  dynamic _toJson() => <dynamic>[bounds?._toJson()];
+  dynamic _toJson() => <dynamic>[bounds?._toList()];
+
+  @override
+  bool operator ==(dynamic other) {
+    if (identical(this, other)) return true;
+    if (runtimeType != other.runtimeType) return false;
+    final CameraTargetBounds typedOther = other;
+    return bounds == typedOther.bounds;
+  }
+
+  @override
+  int get hashCode => bounds.hashCode;
+
+  @override
+  String toString() {
+    return 'CameraTargetBounds(bounds: $bounds)';
+  }
 }
 
 /// Preferred bounds for map camera zoom level.
@@ -64,166 +80,20 @@ class MinMaxZoomPreference {
       MinMaxZoomPreference(null, null);
 
   dynamic _toJson() => <dynamic>[minZoom, maxZoom];
-}
-
-/// Configuration options for the GoogleMaps user interface.
-///
-/// When used to change configuration, null values will be interpreted as
-/// "do not change this configuration option".
-class GoogleMapOptions {
-  /// Creates a set of map user interface configuration options.
-  ///
-  /// By default, every non-specified field is null, meaning no desire to change
-  /// user interface defaults or current configuration.
-  GoogleMapOptions({
-    this.cameraPosition,
-    this.compassEnabled,
-    this.cameraTargetBounds,
-    this.mapType,
-    this.minMaxZoomPreference,
-    this.rotateGesturesEnabled,
-    this.scrollGesturesEnabled,
-    this.tiltGesturesEnabled,
-    this.trackCameraPosition,
-    this.zoomGesturesEnabled,
-    this.myLocationEnabled,
-  });
-
-  /// The desired position of the map camera.
-  ///
-  /// This field is used to indicate initial camera position and to update that
-  /// position programmatically along with other changes to the map user
-  /// interface. It does not track the camera position through animations or
-  /// reflect movements caused by user touch events.
-  final CameraPosition cameraPosition;
-
-  /// True if the map should show a compass when rotated.
-  final bool compassEnabled;
 
-  /// Geographical bounding box for the camera target.
-  final CameraTargetBounds cameraTargetBounds;
-
-  /// Type of map tiles to be rendered.
-  final MapType mapType;
-
-  /// Preferred bounds for the camera zoom level.
-  ///
-  /// Actual bounds depend on map data and device.
-  final MinMaxZoomPreference minMaxZoomPreference;
-
-  /// True if the map view should respond to rotate gestures.
-  final bool rotateGesturesEnabled;
-
-  /// True if the map view should respond to scroll gestures.
-  final bool scrollGesturesEnabled;
-
-  /// True if the map view should respond to tilt gestures.
-  final bool tiltGesturesEnabled;
-
-  /// True if the map view should relay camera move events to Flutter.
-  final bool trackCameraPosition;
-
-  /// True if the map view should respond to zoom gestures.
-  final bool zoomGesturesEnabled;
-
-  /// True if a "My Location" layer should be shown on the map.
-  ///
-  /// This layer includes a location indicator at the current device location,
-  /// as well as a My Location button.
-  /// * The indicator is a small blue dot if the device is stationary, or a
-  /// chevron if the device is moving.
-  /// * The My Location button animates to focus on the user's current location
-  /// if the user's location is currently known.
-  ///
-  /// Enabling this feature requires adding location permissions to both native
-  /// platforms of your app.
-  /// * On Android add either
-  /// `<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />`
-  /// or `<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />`
-  /// to your `AndroidManifest.xml` file. `ACCESS_COARSE_LOCATION` returns a
-  /// location with an accuracy approximately equivalent to a city block, while
-  /// `ACCESS_FINE_LOCATION` returns as precise a location as possible, although
-  /// it consumes more battery power. You will also need to request these
-  /// permissions during run-time. If they are not granted, the My Location
-  /// feature will fail silently.
-  /// * On iOS add a `NSLocationWhenInUseUsageDescription` key to your
-  /// `Info.plist` file. This will automatically prompt the user for permissions
-  /// when the map tries to turn on the My Location layer.
-  final bool myLocationEnabled;
-
-  /// Default user interface options.
-  ///
-  /// Specifies a map view that
-  /// * displays a compass when rotated; [compassEnabled] is true
-  /// * positions the camera at 0,0; [cameraPosition] has target `LatLng(0.0, 0.0)`
-  /// * does not bound the camera target; [cameraTargetBounds] is `CameraTargetBounds.unbounded`
-  /// * uses normal map tiles; [mapType] is `MapType.normal`
-  /// * does not bound zooming; [minMaxZoomPreference] is `MinMaxZoomPreference.unbounded`
-  /// * responds to rotate gestures; [rotateGesturesEnabled] is true
-  /// * responds to scroll gestures; [scrollGesturesEnabled] is true
-  /// * responds to tilt gestures; [tiltGesturesEnabled] is true
-  /// * is silent about camera movement; [trackCameraPosition] is false
-  /// * responds to zoom gestures; [zoomGesturesEnabled] is true
-  /// * does not show user location; [myLocationEnabled] is false
-  static final GoogleMapOptions defaultOptions = GoogleMapOptions(
-    compassEnabled: true,
-    cameraPosition: const CameraPosition(target: LatLng(0.0, 0.0)),
-    cameraTargetBounds: CameraTargetBounds.unbounded,
-    mapType: MapType.normal,
-    minMaxZoomPreference: MinMaxZoomPreference.unbounded,
-    rotateGesturesEnabled: true,
-    scrollGesturesEnabled: true,
-    tiltGesturesEnabled: true,
-    trackCameraPosition: false,
-    zoomGesturesEnabled: true,
-    myLocationEnabled: false,
-  );
-
-  /// Creates a new options object whose values are the same as this instance,
-  /// unless overwritten by the specified [changes].
-  ///
-  /// Returns this instance, if [changes] is null.
-  GoogleMapOptions copyWith(GoogleMapOptions change) {
-    if (change == null) {
-      return this;
-    }
-    return GoogleMapOptions(
-      cameraPosition: change.cameraPosition ?? cameraPosition,
-      compassEnabled: change.compassEnabled ?? compassEnabled,
-      cameraTargetBounds: change.cameraTargetBounds ?? cameraTargetBounds,
-      mapType: change.mapType ?? mapType,
-      minMaxZoomPreference: change.minMaxZoomPreference ?? minMaxZoomPreference,
-      rotateGesturesEnabled:
-          change.rotateGesturesEnabled ?? rotateGesturesEnabled,
-      scrollGesturesEnabled:
-          change.scrollGesturesEnabled ?? scrollGesturesEnabled,
-      tiltGesturesEnabled: change.tiltGesturesEnabled ?? tiltGesturesEnabled,
-      trackCameraPosition: change.trackCameraPosition ?? trackCameraPosition,
-      zoomGesturesEnabled: change.zoomGesturesEnabled ?? zoomGesturesEnabled,
-      myLocationEnabled: change.myLocationEnabled ?? myLocationEnabled,
-    );
+  @override
+  bool operator ==(dynamic other) {
+    if (identical(this, other)) return true;
+    if (runtimeType != other.runtimeType) return false;
+    final MinMaxZoomPreference typedOther = other;
+    return minZoom == typedOther.minZoom && maxZoom == typedOther.maxZoom;
   }
 
-  dynamic _toJson() {
-    final Map<String, dynamic> json = <String, dynamic>{};
-
-    void addIfPresent(String fieldName, dynamic value) {
-      if (value != null) {
-        json[fieldName] = value;
-      }
-    }
-
-    addIfPresent('cameraPosition', cameraPosition?._toJson());
-    addIfPresent('compassEnabled', compassEnabled);
-    addIfPresent('cameraTargetBounds', cameraTargetBounds?._toJson());
-    addIfPresent('mapType', mapType?.index);
-    addIfPresent('minMaxZoomPreference', minMaxZoomPreference?._toJson());
-    addIfPresent('rotateGesturesEnabled', rotateGesturesEnabled);
-    addIfPresent('scrollGesturesEnabled', scrollGesturesEnabled);
-    addIfPresent('tiltGesturesEnabled', tiltGesturesEnabled);
-    addIfPresent('trackCameraPosition', trackCameraPosition);
-    addIfPresent('zoomGesturesEnabled', zoomGesturesEnabled);
-    addIfPresent('myLocationEnabled', myLocationEnabled);
-    return json;
+  @override
+  int get hashCode => hashValues(minZoom, maxZoom);
+
+  @override
+  String toString() {
+    return 'MinMaxZoomPreference(minZoom: $minZoom, maxZoom: $maxZoom)';
   }
 }
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 032cc3b8ffa9..b4c73f988050 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,12 +2,16 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.0.3+3
+version: 0.1.0
 
 dependencies:
   flutter:
     sdk: flutter
 
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+
 flutter:
   plugin:
     androidPackage: io.flutter.plugins.googlemaps
diff --git a/packages/google_maps_flutter/test/google_map_test.dart b/packages/google_maps_flutter/test/google_map_test.dart
new file mode 100644
index 000000000000..2f20a37a1610
--- /dev/null
+++ b/packages/google_maps_flutter/test/google_map_test.dart
@@ -0,0 +1,499 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+
+void main() {
+  final _FakePlatformViewsController fakePlatformViewsController =
+      _FakePlatformViewsController();
+
+  setUpAll(() {
+    SystemChannels.platform_views.setMockMethodCallHandler(
+        fakePlatformViewsController.fakePlatformViewsMethodHandler);
+  });
+
+  setUp(() {
+    fakePlatformViewsController.reset();
+  });
+
+  testWidgets('Initial camera position', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.cameraPosition,
+        const CameraPosition(target: LatLng(10.0, 15.0)));
+  });
+
+  testWidgets('Initial camera position change is a no-op',
+      (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+        ),
+      ),
+    );
+
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 16.0)),
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.cameraPosition,
+        const CameraPosition(target: LatLng(10.0, 15.0)));
+  });
+
+  testWidgets('Can update compassEnabled', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          compassEnabled: false,
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.compassEnabled, false);
+
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          compassEnabled: true,
+        ),
+      ),
+    );
+
+    expect(platformGoogleMap.compassEnabled, true);
+  });
+
+  testWidgets('Can update cameraTargetBounds', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition:
+              const CameraPosition(target: LatLng(10.0, 15.0)),
+          cameraTargetBounds: CameraTargetBounds(
+            LatLngBounds(
+              southwest: const LatLng(10.0, 20.0),
+              northeast: const LatLng(30.0, 40.0),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(
+        platformGoogleMap.cameraTargetBounds,
+        CameraTargetBounds(
+          LatLngBounds(
+            southwest: const LatLng(10.0, 20.0),
+            northeast: const LatLng(30.0, 40.0),
+          ),
+        ));
+
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition:
+              const CameraPosition(target: LatLng(10.0, 15.0)),
+          cameraTargetBounds: CameraTargetBounds(
+            LatLngBounds(
+              southwest: const LatLng(16.0, 20.0),
+              northeast: const LatLng(30.0, 40.0),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(
+        platformGoogleMap.cameraTargetBounds,
+        CameraTargetBounds(
+          LatLngBounds(
+            southwest: const LatLng(16.0, 20.0),
+            northeast: const LatLng(30.0, 40.0),
+          ),
+        ));
+  });
+
+  testWidgets('Can update mapType', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          mapType: MapType.hybrid,
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.mapType, MapType.hybrid);
+
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          mapType: MapType.satellite,
+        ),
+      ),
+    );
+
+    expect(platformGoogleMap.mapType, MapType.satellite);
+  });
+
+  testWidgets('Can update minMaxZoom', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          minMaxZoomPreference: MinMaxZoomPreference(1.0, 3.0),
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.minMaxZoomPreference,
+        const MinMaxZoomPreference(1.0, 3.0));
+
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          minMaxZoomPreference: MinMaxZoomPreference.unbounded,
+        ),
+      ),
+    );
+
+    expect(
+        platformGoogleMap.minMaxZoomPreference, MinMaxZoomPreference.unbounded);
+  });
+
+  testWidgets('Can update rotateGesturesEnabled', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          rotateGesturesEnabled: false,
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.rotateGesturesEnabled, false);
+
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          rotateGesturesEnabled: true,
+        ),
+      ),
+    );
+
+    expect(platformGoogleMap.rotateGesturesEnabled, true);
+  });
+
+  testWidgets('Can update scrollGesturesEnabled', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          scrollGesturesEnabled: false,
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.scrollGesturesEnabled, false);
+
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          scrollGesturesEnabled: true,
+        ),
+      ),
+    );
+
+    expect(platformGoogleMap.scrollGesturesEnabled, true);
+  });
+
+  testWidgets('Can update tiltGesturesEnabled', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          tiltGesturesEnabled: false,
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.tiltGesturesEnabled, false);
+
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          tiltGesturesEnabled: true,
+        ),
+      ),
+    );
+
+    expect(platformGoogleMap.tiltGesturesEnabled, true);
+  });
+
+  testWidgets('Can update trackCameraPosition', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          trackCameraPosition: false,
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.trackCameraPosition, false);
+
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          trackCameraPosition: true,
+        ),
+      ),
+    );
+
+    expect(platformGoogleMap.trackCameraPosition, true);
+  });
+
+  testWidgets('Can update zoomGesturesEnabled', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          zoomGesturesEnabled: false,
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.zoomGesturesEnabled, false);
+
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          zoomGesturesEnabled: true,
+        ),
+      ),
+    );
+
+    expect(platformGoogleMap.zoomGesturesEnabled, true);
+  });
+
+  testWidgets('Can update myLocationEnabled', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          myLocationEnabled: false,
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.myLocationEnabled, false);
+
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          myLocationEnabled: true,
+        ),
+      ),
+    );
+
+    expect(platformGoogleMap.myLocationEnabled, true);
+  });
+}
+
+class FakePlatformGoogleMap {
+  FakePlatformGoogleMap(int id, Map<dynamic, dynamic> params) {
+    cameraPosition = CameraPosition.fromMap(params['initialCameraPosition']);
+    channel = MethodChannel(
+        'plugins.flutter.io/google_maps_$id', const StandardMethodCodec());
+    channel.setMockMethodCallHandler(onMethodCall);
+    updateOptions(params['options']);
+  }
+
+  MethodChannel channel;
+
+  CameraPosition cameraPosition;
+
+  bool compassEnabled;
+
+  CameraTargetBounds cameraTargetBounds;
+
+  MapType mapType;
+
+  MinMaxZoomPreference minMaxZoomPreference;
+
+  bool rotateGesturesEnabled;
+
+  bool scrollGesturesEnabled;
+
+  bool tiltGesturesEnabled;
+
+  bool zoomGesturesEnabled;
+
+  bool trackCameraPosition;
+
+  bool myLocationEnabled;
+
+  Future<dynamic> onMethodCall(MethodCall call) {
+    switch (call.method) {
+      case 'map#update':
+        updateOptions(call.arguments['options']);
+        return Future<void>.sync(() {});
+    }
+    return Future<void>.sync(() {});
+  }
+
+  void updateOptions(Map<dynamic, dynamic> options) {
+    if (options.containsKey('compassEnabled')) {
+      compassEnabled = options['compassEnabled'];
+    }
+    if (options.containsKey('cameraTargetBounds')) {
+      final List<dynamic> boundsList = options['cameraTargetBounds'];
+      cameraTargetBounds = boundsList[0] == null
+          ? CameraTargetBounds.unbounded
+          : CameraTargetBounds(LatLngBounds.fromList(boundsList[0]));
+    }
+    if (options.containsKey('mapType')) {
+      mapType = MapType.values[options['mapType']];
+    }
+    if (options.containsKey('minMaxZoomPreference')) {
+      final List<dynamic> minMaxZoomList = options['minMaxZoomPreference'];
+      minMaxZoomPreference =
+          MinMaxZoomPreference(minMaxZoomList[0], minMaxZoomList[1]);
+    }
+    if (options.containsKey('rotateGesturesEnabled')) {
+      rotateGesturesEnabled = options['rotateGesturesEnabled'];
+    }
+    if (options.containsKey('scrollGesturesEnabled')) {
+      scrollGesturesEnabled = options['scrollGesturesEnabled'];
+    }
+    if (options.containsKey('tiltGesturesEnabled')) {
+      tiltGesturesEnabled = options['tiltGesturesEnabled'];
+    }
+    if (options.containsKey('trackCameraPosition')) {
+      trackCameraPosition = options['trackCameraPosition'];
+    }
+    if (options.containsKey('zoomGesturesEnabled')) {
+      zoomGesturesEnabled = options['zoomGesturesEnabled'];
+    }
+    if (options.containsKey('myLocationEnabled')) {
+      myLocationEnabled = options['myLocationEnabled'];
+    }
+  }
+}
+
+class _FakePlatformViewsController {
+  FakePlatformGoogleMap lastCreatedView;
+
+  Future<dynamic> fakePlatformViewsMethodHandler(MethodCall call) {
+    switch (call.method) {
+      case 'create':
+        final Map<dynamic, dynamic> args = call.arguments;
+        final Map<dynamic, dynamic> params = _decodeParams(args['params']);
+        lastCreatedView = FakePlatformGoogleMap(
+          args['id'],
+          params,
+        );
+        return Future<int>.sync(() => 1);
+      default:
+        return Future<void>.sync(() {});
+    }
+  }
+
+  void reset() {
+    lastCreatedView = null;
+  }
+}
+
+Map<dynamic, dynamic> _decodeParams(Uint8List paramsMessage) {
+  final ByteBuffer buffer = paramsMessage.buffer;
+  final ByteData messageBytes = buffer.asByteData(
+    paramsMessage.offsetInBytes,
+    paramsMessage.lengthInBytes,
+  );
+  return const StandardMessageCodec().decodeMessage(messageBytes);
+}

From ab9f213f2bcd32853426268ff0f72c28a13d1937 Mon Sep 17 00:00:00 2001
From: akindone <akindone@163.com>
Date: Sat, 8 Dec 2018 01:22:17 +0800
Subject: [PATCH 030/410] Fix: url_launcher can't launch for Android (#947)

Always require activity instead of using application context
---
 packages/url_launcher/CHANGELOG.md            |  5 ++++
 .../urllauncher/UrlLauncherPlugin.java        | 28 ++++++++++++-------
 packages/url_launcher/example/lib/main.dart   | 22 +++++++++++++++
 packages/url_launcher/pubspec.yaml            |  2 +-
 4 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/packages/url_launcher/CHANGELOG.md b/packages/url_launcher/CHANGELOG.md
index e8f388377ea6..f91c38419de9 100644
--- a/packages/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 4.0.3
+
+* Fixed launch url fail for Android: `launch` now assert activity not null and using activity to startActivity.
+* Fixed `WebViewActivity has leaked IntentReceiver` for Android.
+
 ## 4.0.2
 
 * Added `closeWebView` function to programmatically close the current WebView.
diff --git a/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java b/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
index 7d856d98749d..851b9b59a4bb 100644
--- a/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
+++ b/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
@@ -39,7 +39,6 @@ private UrlLauncherPlugin(Registrar registrar) {
 
   @Override
   public void onMethodCall(MethodCall call, Result result) {
-    Context context = mRegistrar.context();
     String url = call.argument("url");
     if (call.method.equals("canLaunch")) {
       canLaunch(url, result);
@@ -47,22 +46,24 @@ public void onMethodCall(MethodCall call, Result result) {
       Intent launchIntent;
       boolean useWebView = call.argument("useWebView");
       boolean enableJavaScript = call.argument("enableJavaScript");
+      Activity activity = mRegistrar.activity();
+      if (activity == null) {
+        result.error("NO_ACTIVITY", "Launching a URL requires a foreground activity.", null);
+        return;
+      }
       if (useWebView) {
-        launchIntent = new Intent(context, WebViewActivity.class);
+        launchIntent = new Intent(activity, WebViewActivity.class);
         launchIntent.putExtra("url", url);
         launchIntent.putExtra("enableJavaScript", enableJavaScript);
       } else {
         launchIntent = new Intent(Intent.ACTION_VIEW);
         launchIntent.setData(Uri.parse(url));
       }
-      if (mRegistrar.activity() == null) {
-        launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-      }
-      context.startActivity(launchIntent);
+      activity.startActivity(launchIntent);
       result.success(null);
     } else if (call.method.equals("closeWebView")) {
       Intent intent = new Intent("close");
-      context.sendBroadcast(intent);
+      mRegistrar.context().sendBroadcast(intent);
       result.success(null);
     } else {
       result.notImplemented();
@@ -85,6 +86,7 @@ private void canLaunch(String url, Result result) {
   /*  Launches WebView activity */
   public static class WebViewActivity extends Activity {
     private WebView webview;
+    private BroadcastReceiver broadcastReceiver;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -110,17 +112,23 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
           });
 
       // Set broadcast receiver to handle calls to close the web view
-      BroadcastReceiver broadcast_receiver =
+      broadcastReceiver =
           new BroadcastReceiver() {
             @Override
             public void onReceive(Context arg0, Intent intent) {
               String action = intent.getAction();
-              if (action.equals("close")) {
+              if ("close".equals(action)) {
                 finish();
               }
             }
           };
-      registerReceiver(broadcast_receiver, new IntentFilter("close"));
+      registerReceiver(broadcastReceiver, new IntentFilter("close"));
+    }
+
+    @Override
+    protected void onDestroy() {
+      super.onDestroy();
+      unregisterReceiver(broadcastReceiver);
     }
 
     @Override
diff --git a/packages/url_launcher/example/lib/main.dart b/packages/url_launcher/example/lib/main.dart
index 1ebb13e79b33..365c4531ed6e 100644
--- a/packages/url_launcher/example/lib/main.dart
+++ b/packages/url_launcher/example/lib/main.dart
@@ -34,6 +34,7 @@ class MyHomePage extends StatefulWidget {
 
 class _MyHomePageState extends State<MyHomePage> {
   Future<void> _launched;
+  String _phone = '';
 
   Future<void> _launchInBrowser(String url) async {
     if (await canLaunch(url)) {
@@ -72,6 +73,14 @@ class _MyHomePageState extends State<MyHomePage> {
     }
   }
 
+  Future<void> _makePhoneCall(String url) async {
+    if (await canLaunch(url)) {
+      await launch(url);
+    } else {
+      throw 'Could not launch $url';
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     const String toLaunch = 'https://flutter.io';
@@ -83,6 +92,19 @@ class _MyHomePageState extends State<MyHomePage> {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: <Widget>[
+            Padding(
+              padding: const EdgeInsets.all(16.0),
+              child: TextField(
+                  onChanged: (String text) => _phone = text,
+                  decoration: const InputDecoration(
+                      hintText: 'Input the phone number to launch')),
+            ),
+            RaisedButton(
+              onPressed: () => setState(() {
+                    _launched = _makePhoneCall('tel:$_phone');
+                  }),
+              child: const Text('Make phone call'),
+            ),
             const Padding(
               padding: EdgeInsets.all(16.0),
               child: Text(toLaunch),
diff --git a/packages/url_launcher/pubspec.yaml b/packages/url_launcher/pubspec.yaml
index 83ad771b3fc1..e07d3dca9523 100644
--- a/packages/url_launcher/pubspec.yaml
+++ b/packages/url_launcher/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher
-version: 4.0.2
+version: 4.0.3
 
 flutter:
   plugin:

From aa300af3f97e5ef28868d9ca62a41a8fb5d274f1 Mon Sep 17 00:00:00 2001
From: Hiroshi Kikuchi <kikuchy.h@gmail.com>
Date: Sat, 8 Dec 2018 06:12:52 +0900
Subject: [PATCH 031/410] [WebView] Add back/forward controls  (#959)

Adds goBack, goForward, canGoBack, and canGoForward methods to the WebView controller.
---
 packages/webview_flutter/CHANGELOG.md         |   6 +-
 .../webviewflutter/FlutterWebView.java        |  34 +++
 .../webview_flutter/example/lib/main.dart     |  69 +++++-
 .../ios/Classes/FlutterWebView.m              |  28 +++
 .../webview_flutter/lib/webview_flutter.dart  |  32 +++
 packages/webview_flutter/pubspec.yaml         |   2 +-
 .../test/webview_flutter_test.dart            | 208 +++++++++++++++++-
 7 files changed, 367 insertions(+), 12 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 7d2c8cbe71ce..62a36a4c668a 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,7 +1,11 @@
+## 0.1.0
+
+* Add goBack, goForward, canGoBack, and canGoForward methods to the WebView controller.
+
 ## 0.0.1+1
 
 * Fix case for "FLTWebViewFlutterPlugin" (iOS was failing to buld on case-sensitive file systems).
 
 ## 0.0.1
 
-* TODO: Initial release.
+* Initial release.
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index 917533576052..d51254a62a60 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -41,6 +41,18 @@ public void onMethodCall(MethodCall methodCall, Result result) {
       case "updateSettings":
         updateSettings(methodCall, result);
         break;
+      case "canGoBack":
+        canGoBack(methodCall, result);
+        break;
+      case "canGoForward":
+        canGoForward(methodCall, result);
+        break;
+      case "goBack":
+        goBack(methodCall, result);
+        break;
+      case "goForward":
+        goForward(methodCall, result);
+        break;
       default:
         result.notImplemented();
     }
@@ -52,6 +64,28 @@ private void loadUrl(MethodCall methodCall, Result result) {
     result.success(null);
   }
 
+  private void canGoBack(MethodCall methodCall, Result result) {
+    result.success(webView.canGoBack());
+  }
+
+  private void canGoForward(MethodCall methodCall, Result result) {
+    result.success(webView.canGoForward());
+  }
+
+  private void goBack(MethodCall methodCall, Result result) {
+    if (webView.canGoBack()) {
+      webView.goBack();
+    }
+    result.success(null);
+  }
+
+  private void goForward(MethodCall methodCall, Result result) {
+    if (webView.canGoForward()) {
+      webView.goForward();
+    }
+    result.success(null);
+  }
+
   @SuppressWarnings("unchecked")
   private void updateSettings(MethodCall methodCall, Result result) {
     applySettings((Map<String, Object>) methodCall.arguments);
diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index 8bed253e8019..9f40f7e84fd9 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -2,23 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
 void main() => runApp(MaterialApp(home: WebViewExample()));
 
 class WebViewExample extends StatelessWidget {
+  final Completer<WebViewController> _controller =
+      Completer<WebViewController>();
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         title: const Text('Flutter WebView example'),
         // This drop down menu demonstrates that Flutter widgets can be shown over the web view.
-        actions: <Widget>[const SampleMenu()],
+        actions: <Widget>[
+          NavigationControls(_controller.future),
+          const SampleMenu(),
+        ],
       ),
-      body: const WebView(
+      body: WebView(
         initialUrl: 'https://flutter.io',
         javaScriptMode: JavaScriptMode.unrestricted,
+        onWebViewCreated: (WebViewController webViewController) {
+          _controller.complete(webViewController);
+        },
       ),
     );
   }
@@ -47,3 +57,58 @@ class SampleMenu extends StatelessWidget {
     );
   }
 }
+
+class NavigationControls extends StatelessWidget {
+  const NavigationControls(this._webViewControllerFuture)
+      : assert(_webViewControllerFuture != null);
+
+  final Future<WebViewController> _webViewControllerFuture;
+
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder<WebViewController>(
+      future: _webViewControllerFuture,
+      builder:
+          (BuildContext context, AsyncSnapshot<WebViewController> snapshot) {
+        final bool webViewReady =
+            snapshot.connectionState == ConnectionState.done;
+        final WebViewController controller = snapshot.data;
+        return Row(
+          children: <Widget>[
+            IconButton(
+              icon: const Icon(Icons.arrow_back_ios),
+              onPressed: !webViewReady
+                  ? null
+                  : () async {
+                      if (await controller.canGoBack()) {
+                        controller.goBack();
+                      } else {
+                        Scaffold.of(context).showSnackBar(
+                          const SnackBar(content: Text("No back history item")),
+                        );
+                        return;
+                      }
+                    },
+            ),
+            IconButton(
+              icon: const Icon(Icons.arrow_forward_ios),
+              onPressed: !webViewReady
+                  ? null
+                  : () async {
+                      if (await controller.canGoForward()) {
+                        controller.goForward();
+                      } else {
+                        Scaffold.of(context).showSnackBar(
+                          const SnackBar(
+                              content: Text("No forward history item")),
+                        );
+                        return;
+                      }
+                    },
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m
index 83f9cfb3f74a..da1e0271e3af 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.m
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m
@@ -67,6 +67,14 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     [self onUpdateSettings:call result:result];
   } else if ([[call method] isEqualToString:@"loadUrl"]) {
     [self onLoadUrl:call result:result];
+  } else if ([[call method] isEqualToString:@"canGoBack"]) {
+    [self onCanGoBack:call result:result];
+  } else if ([[call method] isEqualToString:@"canGoForward"]) {
+    [self onCanGoForward:call result:result];
+  } else if ([[call method] isEqualToString:@"goBack"]) {
+    [self onGoBack:call result:result];
+  } else if ([[call method] isEqualToString:@"goForward"]) {
+    [self onGoForward:call result:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -88,6 +96,26 @@ - (void)onLoadUrl:(FlutterMethodCall*)call result:(FlutterResult)result {
   }
 }
 
+- (void)onCanGoBack:(FlutterMethodCall*)call result:(FlutterResult)result {
+  BOOL canGoBack = [_webView canGoBack];
+  result([NSNumber numberWithBool:canGoBack]);
+}
+
+- (void)onCanGoForward:(FlutterMethodCall*)call result:(FlutterResult)result {
+  BOOL canGoForward = [_webView canGoForward];
+  result([NSNumber numberWithBool:canGoForward]);
+}
+
+- (void)onGoBack:(FlutterMethodCall*)call result:(FlutterResult)result {
+  [_webView goBack];
+  result(nil);
+}
+
+- (void)onGoForward:(FlutterMethodCall*)call result:(FlutterResult)result {
+  [_webView goForward];
+  result(nil);
+}
+
 - (void)applySettings:(NSDictionary<NSString*, id>*)settings {
   for (NSString* key in settings) {
     if ([key isEqualToString:@"jsMode"]) {
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index 121529b9b032..8da971a03897 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -205,6 +205,38 @@ class WebViewController {
     return _channel.invokeMethod('loadUrl', url);
   }
 
+  /// Checks whether there's a back history item.
+  ///
+  /// Note that this operation is asynchronous, and it is possible that the "canGoBack" state has
+  /// changed by the time the future completed.
+  Future<bool> canGoBack() async {
+    final bool canGoBack = await _channel.invokeMethod("canGoBack");
+    return canGoBack;
+  }
+
+  /// Checks whether there's a forward history item.
+  ///
+  /// Note that this operation is asynchronous, and it is possible that the "canGoForward" state has
+  /// changed by the time the future completed.
+  Future<bool> canGoForward() async {
+    final bool canGoForward = await _channel.invokeMethod("canGoForward");
+    return canGoForward;
+  }
+
+  /// Goes back in the history of this WebView.
+  ///
+  /// If there is no back history item this is a no-op.
+  Future<void> goBack() async {
+    return _channel.invokeMethod("goBack");
+  }
+
+  /// Goes forward in the history of this WebView.
+  ///
+  /// If there is no forward history item this is a no-op.
+  Future<void> goForward() async {
+    return _channel.invokeMethod("goForward");
+  }
+
   Future<void> _updateSettings(Map<String, dynamic> update) async {
     return _channel.invokeMethod('updateSettings', update);
   }
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 0060e90ce0a8..d87b54060e98 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.0.1+1
+version: 0.1.0
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 
diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart
index 7a586b2c5533..1504b2d2d542 100644
--- a/packages/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/test/webview_flutter_test.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:flutter/services.dart';
@@ -33,7 +34,7 @@ void main() {
     final FakePlatformWebView platformWebView =
         fakePlatformViewsController.lastCreatedView;
 
-    expect(platformWebView.lastUrlLoaded, 'https://youtube.com');
+    expect(platformWebView.currentUrl, 'https://youtube.com');
   });
 
   testWidgets('JavaScript mode', (WidgetTester tester) async {
@@ -72,7 +73,7 @@ void main() {
 
     controller.loadUrl('https://flutter.io');
 
-    expect(platformWebView.lastUrlLoaded, 'https://flutter.io');
+    expect(platformWebView.currentUrl, 'https://flutter.io');
   });
 
   testWidgets('Invald urls', (WidgetTester tester) async {
@@ -91,21 +92,192 @@ void main() {
         fakePlatformViewsController.lastCreatedView;
 
     expect(() => controller.loadUrl(null), throwsA(anything));
-    expect(platformWebView.lastUrlLoaded, isNull);
+    expect(platformWebView.currentUrl, isNull);
 
     expect(() => controller.loadUrl(''), throwsA(anything));
-    expect(platformWebView.lastUrlLoaded, isNull);
+    expect(platformWebView.currentUrl, isNull);
 
     // Missing schema.
     expect(() => controller.loadUrl('flutter.io'), throwsA(anything));
-    expect(platformWebView.lastUrlLoaded, isNull);
+    expect(platformWebView.currentUrl, isNull);
+  });
+
+  testWidgets("Can't go back before loading a page",
+      (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+
+    expect(controller, isNotNull);
+
+    final bool canGoBackNoPageLoaded = await controller.canGoBack();
+
+    expect(canGoBackNoPageLoaded, false);
+  });
+
+  testWidgets("Can't go back with no history", (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://flutter.io',
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+
+    expect(controller, isNotNull);
+    final bool canGoBackFirstPageLoaded = await controller.canGoBack();
+
+    expect(canGoBackFirstPageLoaded, false);
+  });
+
+  testWidgets('Can go back', (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://flutter.io',
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+
+    expect(controller, isNotNull);
+
+    await controller.loadUrl('https://www.google.com');
+    final bool canGoBackSecondPageLoaded = await controller.canGoBack();
+
+    expect(canGoBackSecondPageLoaded, true);
+  });
+
+  testWidgets("Can't go forward before loading a page",
+      (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+
+    expect(controller, isNotNull);
+
+    final bool canGoForwardNoPageLoaded = await controller.canGoForward();
+
+    expect(canGoForwardNoPageLoaded, false);
+  });
+
+  testWidgets("Can't go forward with no history", (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://flutter.io',
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+
+    expect(controller, isNotNull);
+    final bool canGoForwardFirstPageLoaded = await controller.canGoForward();
+
+    expect(canGoForwardFirstPageLoaded, false);
+  });
+
+  testWidgets('Can go forward', (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://flutter.io',
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+
+    expect(controller, isNotNull);
+
+    await controller.loadUrl('https://youtube.com');
+    await controller.goBack();
+    final bool canGoForwardFirstPageBacked = await controller.canGoForward();
+
+    expect(canGoForwardFirstPageBacked, true);
+  });
+
+  testWidgets('Go back', (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://youtube.com',
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+
+    expect(controller, isNotNull);
+
+    final FakePlatformWebView platformWebView =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformWebView.currentUrl, 'https://youtube.com');
+
+    controller.loadUrl('https://flutter.io');
+
+    expect(platformWebView.currentUrl, 'https://flutter.io');
+
+    controller.goBack();
+
+    expect(platformWebView.currentUrl, 'https://youtube.com');
+  });
+
+  testWidgets('Go forward', (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://youtube.com',
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+
+    expect(controller, isNotNull);
+
+    final FakePlatformWebView platformWebView =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformWebView.currentUrl, 'https://youtube.com');
+
+    controller.loadUrl('https://flutter.io');
+
+    expect(platformWebView.currentUrl, 'https://flutter.io');
+
+    controller.goBack();
+
+    expect(platformWebView.currentUrl, 'https://youtube.com');
+
+    controller.goForward();
+
+    expect(platformWebView.currentUrl, 'https://flutter.io');
   });
 }
 
 class FakePlatformWebView {
   FakePlatformWebView(int id, Map<dynamic, dynamic> params) {
     if (params.containsKey('initialUrl')) {
-      lastUrlLoaded = params['initialUrl'];
+      final String initialUrl = params['initialUrl'];
+      if (initialUrl != null) {
+        history.add(initialUrl);
+        currentPosition++;
+      }
       javaScriptMode = JavaScriptMode.values[params['settings']['jsMode']];
     }
     channel = MethodChannel(
@@ -115,13 +287,19 @@ class FakePlatformWebView {
 
   MethodChannel channel;
 
-  String lastUrlLoaded;
+  List<String> history = <String>[];
+  int currentPosition = -1;
+
+  String get currentUrl => history.isEmpty ? null : history[currentPosition];
   JavaScriptMode javaScriptMode;
 
   Future<dynamic> onMethodCall(MethodCall call) {
     switch (call.method) {
       case 'loadUrl':
-        lastUrlLoaded = call.arguments;
+        final String url = call.arguments;
+        history = history.sublist(0, currentPosition + 1);
+        history.add(url);
+        currentPosition++;
         return Future<void>.sync(() {});
       case 'updateSettings':
         if (call.arguments['jsMode'] == null) {
@@ -129,6 +307,20 @@ class FakePlatformWebView {
         }
         javaScriptMode = JavaScriptMode.values[call.arguments['jsMode']];
         break;
+      case 'canGoBack':
+        return Future<bool>.sync(() => currentPosition > 0);
+        break;
+      case 'canGoForward':
+        return Future<bool>.sync(() => currentPosition < history.length - 1);
+        break;
+      case 'goBack':
+        currentPosition = max(-1, currentPosition - 1);
+        return Future<void>.sync(() {});
+        break;
+      case 'goForward':
+        currentPosition = min(history.length - 1, currentPosition + 1);
+        return Future<void>.sync(() {});
+        break;
     }
     return Future<void>.sync(() {});
   }

From 3652ccd733bf382a7176c3eaaba65836883a5ce2 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Fri, 7 Dec 2018 18:11:48 -0800
Subject: [PATCH 032/410] Fix typo in WebView's "initWithWithFrame". (#972)

---
 .../ios/Classes/FlutterWebView.h                |  8 ++++----
 .../ios/Classes/FlutterWebView.m                | 17 ++++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.h b/packages/webview_flutter/ios/Classes/FlutterWebView.h
index 665b0a45967c..268e704a5f76 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.h
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.h
@@ -5,10 +5,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FLTWebViewController : NSObject <FlutterPlatformView>
 
-- (instancetype)initWithWithFrame:(CGRect)frame
-                   viewIdentifier:(int64_t)viewId
-                        arguments:(id _Nullable)args
-                  binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger;
+- (instancetype)initWithFrame:(CGRect)frame
+               viewIdentifier:(int64_t)viewId
+                    arguments:(id _Nullable)args
+              binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger;
 
 - (UIView*)view;
 @end
diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m
index da1e0271e3af..4e48774f5598 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.m
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m
@@ -19,11 +19,10 @@ - (instancetype)initWithMessenger:(NSObject<FlutterBinaryMessenger>*)messenger {
 - (NSObject<FlutterPlatformView>*)createWithFrame:(CGRect)frame
                                    viewIdentifier:(int64_t)viewId
                                         arguments:(id _Nullable)args {
-  FLTWebViewController* webviewController =
-      [[FLTWebViewController alloc] initWithWithFrame:frame
-                                       viewIdentifier:viewId
-                                            arguments:args
-                                      binaryMessenger:_messenger];
+  FLTWebViewController* webviewController = [[FLTWebViewController alloc] initWithFrame:frame
+                                                                         viewIdentifier:viewId
+                                                                              arguments:args
+                                                                        binaryMessenger:_messenger];
   return webviewController;
 }
 
@@ -35,10 +34,10 @@ @implementation FLTWebViewController {
   FlutterMethodChannel* _channel;
 }
 
-- (instancetype)initWithWithFrame:(CGRect)frame
-                   viewIdentifier:(int64_t)viewId
-                        arguments:(id _Nullable)args
-                  binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger {
+- (instancetype)initWithFrame:(CGRect)frame
+               viewIdentifier:(int64_t)viewId
+                    arguments:(id _Nullable)args
+              binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger {
   if ([super init]) {
     _viewId = viewId;
     _webView = [[WKWebView alloc] initWithFrame:frame];

From e247091ad8628ded5a89be0bbf9cf325db89a419 Mon Sep 17 00:00:00 2001
From: YukiOya <yuki.oya.1107@gmail.com>
Date: Sun, 9 Dec 2018 03:46:11 +0900
Subject: [PATCH 033/410] Fix null crash when initialUrl is unset on iOS (#967)

---
 packages/webview_flutter/CHANGELOG.md                 | 4 ++++
 packages/webview_flutter/ios/Classes/FlutterWebView.m | 2 +-
 packages/webview_flutter/pubspec.yaml                 | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 62a36a4c668a..d0c61ab34541 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0+1
+
+* Fix null crash when initialUrl is unset on iOS.
+
 ## 0.1.0
 
 * Add goBack, goForward, canGoBack, and canGoForward methods to the WebView controller.
diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m
index 4e48774f5598..9ea2d911bca6 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.m
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m
@@ -50,7 +50,7 @@ - (instancetype)initWithFrame:(CGRect)frame
     NSDictionary<NSString*, id>* settings = args[@"settings"];
     [self applySettings:settings];
     NSString* initialUrl = args[@"initialUrl"];
-    if (initialUrl) {
+    if (initialUrl && initialUrl != [NSNull null]) {
       [self loadUrl:initialUrl];
     }
   }
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index d87b54060e98..f0e335468696 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.1.0
+version: 0.1.0+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From 3897d4305492d658ed5a22570cbe36f3cb2ee73e Mon Sep 17 00:00:00 2001
From: xster <xiao@xster.net>
Date: Mon, 10 Dec 2018 20:45:20 -0800
Subject: [PATCH 034/410] Temporarily add exoplayer repo accidentally deleted
 from jcenter (#977)

---
 packages/camera/example/android/build.gradle       | 3 +++
 packages/image_picker/android/build.gradle         | 5 ++++-
 packages/video_player/example/android/build.gradle | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/camera/example/android/build.gradle b/packages/camera/example/android/build.gradle
index bb8a303898ca..db728801d8ac 100644
--- a/packages/camera/example/android/build.gradle
+++ b/packages/camera/example/android/build.gradle
@@ -13,6 +13,9 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven {
+            url 'https://google.bintray.com/exoplayer/'
+        }
     }
 }
 
diff --git a/packages/image_picker/android/build.gradle b/packages/image_picker/android/build.gradle
index 70ee7989eb1f..b6ac95b63619 100755
--- a/packages/image_picker/android/build.gradle
+++ b/packages/image_picker/android/build.gradle
@@ -16,6 +16,9 @@ rootProject.allprojects {
     repositories {
         google()
         jcenter()
+        maven {
+            url 'https://google.bintray.com/exoplayer/'
+        }
     }
 }
 
@@ -23,7 +26,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 27
-    
+
     defaultConfig {
         minSdkVersion 16
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/packages/video_player/example/android/build.gradle b/packages/video_player/example/android/build.gradle
index bb8a303898ca..db728801d8ac 100644
--- a/packages/video_player/example/android/build.gradle
+++ b/packages/video_player/example/android/build.gradle
@@ -13,6 +13,9 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven {
+            url 'https://google.bintray.com/exoplayer/'
+        }
     }
 }
 

From 0d077f543d2fd5b11956186d00b56a0942d1129e Mon Sep 17 00:00:00 2001
From: Patte <Patte1808@users.noreply.github.com>
Date: Wed, 19 Dec 2018 16:18:58 +0100
Subject: [PATCH 035/410] Remove firebase_auth dependency from
 android_alarm_manager library and add initialize step to readme (#926)

---
 packages/android_alarm_manager/README.md    | 1 +
 packages/android_alarm_manager/pubspec.yaml | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/android_alarm_manager/README.md b/packages/android_alarm_manager/README.md
index 740a1848da97..9797e300ba5d 100644
--- a/packages/android_alarm_manager/README.md
+++ b/packages/android_alarm_manager/README.md
@@ -29,6 +29,7 @@ void printHello() {
 
 main() async {
   final int helloAlarmID = 0;
+  await AndroidAlarmManager.initialize();
   runApp(...);
   await AndroidAlarmManager.periodic(const Duration(minutes: 1), helloAlarmID, printHello);
 }
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index 906a13f6e503..7145af7bc11e 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -6,10 +6,12 @@ author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 
 dependencies:
-  firebase_auth: ^0.6.6
   flutter:
     sdk: flutter
 
+dev_dependencies:
+  firebase_auth: ^0.6.6
+
 flutter:
   plugin:
     androidPackage: io.flutter.plugins.androidalarmmanager

From 94f6577f4c9649acabeaca311028d0430a7bd8b7 Mon Sep 17 00:00:00 2001
From: Emily Fortuna <efortuna@google.com>
Date: Wed, 19 Dec 2018 13:55:53 -0800
Subject: [PATCH 036/410] Add currentUrl accessor to WebView plugin. (#992)

* Add currentUrl accessor to WebView plugin.
---
 packages/webview_flutter/CHANGELOG.md         |  5 ++
 .../webviewflutter/FlutterWebView.java        |  7 ++
 .../example/ios/Flutter/Debug.xcconfig        |  1 +
 .../example/ios/Flutter/Release.xcconfig      |  1 +
 .../webview_flutter/example/lib/main.dart     | 21 +++++
 .../ios/Classes/FlutterWebView.m              |  8 ++
 .../webview_flutter/lib/webview_flutter.dart  | 12 +++
 packages/webview_flutter/pubspec.yaml         |  2 +-
 .../test/webview_flutter_test.dart            | 81 ++++++++++++-------
 9 files changed, 106 insertions(+), 32 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index d0c61ab34541..39ea0b7048f2 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.1
+
+* Added a `currentUrl` accessor for the WebView controller to look up what URL
+  is being displayed.
+
 ## 0.1.0+1
 
 * Fix null crash when initialUrl is unset on iOS.
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index d51254a62a60..1a8019c7dda1 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -53,6 +53,9 @@ public void onMethodCall(MethodCall methodCall, Result result) {
       case "goForward":
         goForward(methodCall, result);
         break;
+      case "currentUrl":
+        currentUrl(methodCall, result);
+        break;
       default:
         result.notImplemented();
     }
@@ -86,6 +89,10 @@ private void goForward(MethodCall methodCall, Result result) {
     result.success(null);
   }
 
+  private void currentUrl(MethodCall methodCall, Result result) {
+    result.success(webView.getUrl());
+  }
+
   @SuppressWarnings("unchecked")
   private void updateSettings(MethodCall methodCall, Result result) {
     applySettings((Map<String, Object>) methodCall.arguments);
diff --git a/packages/webview_flutter/example/ios/Flutter/Debug.xcconfig b/packages/webview_flutter/example/ios/Flutter/Debug.xcconfig
index 592ceee85b89..e8efba114687 100644
--- a/packages/webview_flutter/example/ios/Flutter/Debug.xcconfig
+++ b/packages/webview_flutter/example/ios/Flutter/Debug.xcconfig
@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/packages/webview_flutter/example/ios/Flutter/Release.xcconfig b/packages/webview_flutter/example/ios/Flutter/Release.xcconfig
index 592ceee85b89..399e9340e6f6 100644
--- a/packages/webview_flutter/example/ios/Flutter/Release.xcconfig
+++ b/packages/webview_flutter/example/ios/Flutter/Release.xcconfig
@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index 9f40f7e84fd9..3da5d2db6caf 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -30,8 +30,29 @@ class WebViewExample extends StatelessWidget {
           _controller.complete(webViewController);
         },
       ),
+      floatingActionButton: favoriteButton(),
     );
   }
+
+  Widget favoriteButton() {
+    return FutureBuilder<WebViewController>(
+        future: _controller.future,
+        builder: (BuildContext context,
+            AsyncSnapshot<WebViewController> controller) {
+          if (controller.hasData) {
+            return FloatingActionButton(
+              onPressed: () async {
+                final String url = await controller.data.currentUrl();
+                Scaffold.of(context).showSnackBar(
+                  SnackBar(content: Text("Favorited $url")),
+                );
+              },
+              child: const Icon(Icons.favorite),
+            );
+          }
+          return Container();
+        });
+  }
 }
 
 class SampleMenu extends StatelessWidget {
diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m
index 9ea2d911bca6..71e2ba776bf4 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.m
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m
@@ -32,6 +32,7 @@ @implementation FLTWebViewController {
   WKWebView* _webView;
   int64_t _viewId;
   FlutterMethodChannel* _channel;
+  NSString* _currentUrl;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -74,6 +75,8 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     [self onGoBack:call result:result];
   } else if ([[call method] isEqualToString:@"goForward"]) {
     [self onGoForward:call result:result];
+  } else if ([[call method] isEqualToString:@"currentUrl"]) {
+    [self onCurrentUrl:call result:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -115,6 +118,11 @@ - (void)onGoForward:(FlutterMethodCall*)call result:(FlutterResult)result {
   result(nil);
 }
 
+- (void)onCurrentUrl:(FlutterMethodCall*)call result:(FlutterResult)result {
+  _currentUrl = [[_webView URL] absoluteString];
+  result(_currentUrl);
+}
+
 - (void)applySettings:(NSDictionary<NSString*, id>*)settings {
   for (NSString* key in settings) {
     if ([key isEqualToString:@"jsMode"]) {
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index 8da971a03897..a2ba394eb423 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -205,6 +205,18 @@ class WebViewController {
     return _channel.invokeMethod('loadUrl', url);
   }
 
+  /// Accessor to the current URL that the WebView is displaying.
+  ///
+  /// If [WebView.initialUrl] was never specified, returns `null`.
+  /// Note that this operation is asynchronous, and it is possible that the
+  /// current URL changes again by the time this function returns (in other
+  /// words, by the time this future completes, the WebView may be displaying a
+  /// different URL).
+  Future<String> currentUrl() async {
+    final String url = await _channel.invokeMethod('currentUrl');
+    return url;
+  }
+
   /// Checks whether there's a back history item.
   ///
   /// Note that this operation is asynchronous, and it is possible that the "canGoBack" state has
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index f0e335468696..966e9ebff4e0 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.1.0+1
+version: 0.1.1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 
diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart
index 1504b2d2d542..d3cdc5e398e6 100644
--- a/packages/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/test/webview_flutter_test.dart
@@ -27,14 +27,17 @@ void main() {
   });
 
   testWidgets('Initial url', (WidgetTester tester) async {
-    await tester.pumpWidget(const WebView(
-      initialUrl: 'https://youtube.com',
-    ));
-
-    final FakePlatformWebView platformWebView =
-        fakePlatformViewsController.lastCreatedView;
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://youtube.com',
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
 
-    expect(platformWebView.currentUrl, 'https://youtube.com');
+    expect(await controller.currentUrl(), 'https://youtube.com');
   });
 
   testWidgets('JavaScript mode', (WidgetTester tester) async {
@@ -68,15 +71,12 @@ void main() {
 
     expect(controller, isNotNull);
 
-    final FakePlatformWebView platformWebView =
-        fakePlatformViewsController.lastCreatedView;
-
     controller.loadUrl('https://flutter.io');
 
-    expect(platformWebView.currentUrl, 'https://flutter.io');
+    expect(await controller.currentUrl(), 'https://flutter.io');
   });
 
-  testWidgets('Invald urls', (WidgetTester tester) async {
+  testWidgets('Invalid urls', (WidgetTester tester) async {
     WebViewController controller;
     await tester.pumpWidget(
       WebView(
@@ -88,18 +88,15 @@ void main() {
 
     expect(controller, isNotNull);
 
-    final FakePlatformWebView platformWebView =
-        fakePlatformViewsController.lastCreatedView;
-
     expect(() => controller.loadUrl(null), throwsA(anything));
-    expect(platformWebView.currentUrl, isNull);
+    expect(await controller.currentUrl(), isNull);
 
     expect(() => controller.loadUrl(''), throwsA(anything));
-    expect(platformWebView.currentUrl, isNull);
+    expect(await controller.currentUrl(), isNull);
 
     // Missing schema.
     expect(() => controller.loadUrl('flutter.io'), throwsA(anything));
-    expect(platformWebView.currentUrl, isNull);
+    expect(await controller.currentUrl(), isNull);
   });
 
   testWidgets("Can't go back before loading a page",
@@ -224,18 +221,15 @@ void main() {
 
     expect(controller, isNotNull);
 
-    final FakePlatformWebView platformWebView =
-        fakePlatformViewsController.lastCreatedView;
-
-    expect(platformWebView.currentUrl, 'https://youtube.com');
+    expect(await controller.currentUrl(), 'https://youtube.com');
 
     controller.loadUrl('https://flutter.io');
 
-    expect(platformWebView.currentUrl, 'https://flutter.io');
+    expect(await controller.currentUrl(), 'https://flutter.io');
 
     controller.goBack();
 
-    expect(platformWebView.currentUrl, 'https://youtube.com');
+    expect(await controller.currentUrl(), 'https://youtube.com');
   });
 
   testWidgets('Go forward', (WidgetTester tester) async {
@@ -251,22 +245,44 @@ void main() {
 
     expect(controller, isNotNull);
 
-    final FakePlatformWebView platformWebView =
-        fakePlatformViewsController.lastCreatedView;
-
-    expect(platformWebView.currentUrl, 'https://youtube.com');
+    expect(await controller.currentUrl(), 'https://youtube.com');
 
     controller.loadUrl('https://flutter.io');
 
-    expect(platformWebView.currentUrl, 'https://flutter.io');
+    expect(await controller.currentUrl(), 'https://flutter.io');
 
     controller.goBack();
 
-    expect(platformWebView.currentUrl, 'https://youtube.com');
+    expect(await controller.currentUrl(), 'https://youtube.com');
 
     controller.goForward();
 
-    expect(platformWebView.currentUrl, 'https://flutter.io');
+    expect(await controller.currentUrl(), 'https://flutter.io');
+  });
+
+  testWidgets('Current URL', (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+
+    expect(controller, isNotNull);
+
+    // Test a WebView without an explicitly set first URL.
+    expect(await controller.currentUrl(), isNull);
+
+    controller.loadUrl('https://youtube.com');
+    expect(await controller.currentUrl(), 'https://youtube.com');
+
+    controller.loadUrl('https://flutter.io');
+    expect(await controller.currentUrl(), 'https://flutter.io');
+
+    controller.goBack();
+    expect(await controller.currentUrl(), 'https://youtube.com');
   });
 }
 
@@ -321,6 +337,9 @@ class FakePlatformWebView {
         currentPosition = min(history.length - 1, currentPosition + 1);
         return Future<void>.sync(() {});
         break;
+      case 'currentUrl':
+        return Future<String>.value(currentUrl);
+        break;
     }
     return Future<void>.sync(() {});
   }

From d6bd24cc3371bfbc8064967210d56629bc58b363 Mon Sep 17 00:00:00 2001
From: Wouter Hardeman <wouterhardeman@users.noreply.github.com>
Date: Thu, 20 Dec 2018 05:22:59 +0100
Subject: [PATCH 037/410] Implemented a reload method in webview_flutter (#974)

---
 packages/webview_flutter/CHANGELOG.md         |  4 +++
 .../webviewflutter/FlutterWebView.java        | 10 +++++-
 .../webview_flutter/example/lib/main.dart     |  8 +++++
 .../ios/Classes/FlutterWebView.m              |  7 ++++
 .../webview_flutter/lib/webview_flutter.dart  |  7 +++-
 .../test/webview_flutter_test.dart            | 32 +++++++++++++++++++
 6 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 39ea0b7048f2..0812ce72bf44 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.2
+
+* Added a reload method to the WebView controller.
+
 ## 0.1.1
 
 * Added a `currentUrl` accessor for the WebView controller to look up what URL
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index 1a8019c7dda1..1d49837f3921 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -53,6 +53,9 @@ public void onMethodCall(MethodCall methodCall, Result result) {
       case "goForward":
         goForward(methodCall, result);
         break;
+      case "reload":
+        reload(methodCall, result);
+        break;
       case "currentUrl":
         currentUrl(methodCall, result);
         break;
@@ -89,6 +92,11 @@ private void goForward(MethodCall methodCall, Result result) {
     result.success(null);
   }
 
+  private void reload(MethodCall methodCall, Result result) {
+    webView.reload();
+    result.success(null);
+  }
+
   private void currentUrl(MethodCall methodCall, Result result) {
     result.success(webView.getUrl());
   }
@@ -116,7 +124,7 @@ private void updateJsMode(int mode) {
       case 0: // disabled
         webView.getSettings().setJavaScriptEnabled(false);
         break;
-      case 1: //unrestricted
+      case 1: // unrestricted
         webView.getSettings().setJavaScriptEnabled(true);
         break;
       default:
diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index 3da5d2db6caf..ee03ffda2be2 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -127,6 +127,14 @@ class NavigationControls extends StatelessWidget {
                       }
                     },
             ),
+            IconButton(
+              icon: const Icon(Icons.replay),
+              onPressed: !webViewReady
+                  ? null
+                  : () {
+                      controller.reload();
+                    },
+            ),
           ],
         );
       },
diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m
index 71e2ba776bf4..981b19335e2f 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.m
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m
@@ -75,6 +75,8 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     [self onGoBack:call result:result];
   } else if ([[call method] isEqualToString:@"goForward"]) {
     [self onGoForward:call result:result];
+  } else if ([[call method] isEqualToString:@"reload"]) {
+    [self onReload:call result:result];
   } else if ([[call method] isEqualToString:@"currentUrl"]) {
     [self onCurrentUrl:call result:result];
   } else {
@@ -118,6 +120,11 @@ - (void)onGoForward:(FlutterMethodCall*)call result:(FlutterResult)result {
   result(nil);
 }
 
+- (void)onReload:(FlutterMethodCall*)call result:(FlutterResult)result {
+  [_webView reload];
+  result(nil);
+}
+
 - (void)onCurrentUrl:(FlutterMethodCall*)call result:(FlutterResult)result {
   _currentUrl = [[_webView URL] absoluteString];
   result(_currentUrl);
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index a2ba394eb423..ade85813c0e5 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -249,12 +249,17 @@ class WebViewController {
     return _channel.invokeMethod("goForward");
   }
 
+  /// Reloads the current URL.
+  Future<void> reload() async {
+    return _channel.invokeMethod("reload");
+  }
+
   Future<void> _updateSettings(Map<String, dynamic> update) async {
     return _channel.invokeMethod('updateSettings', update);
   }
 }
 
-// Throws an ArgumentError if url is not a valid url string.
+// Throws an ArgumentError if `url` is not a valid URL string.
 void _validateUrlString(String url) {
   try {
     final Uri uri = Uri.parse(url);
diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart
index d3cdc5e398e6..d83017ab05ad 100644
--- a/packages/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/test/webview_flutter_test.dart
@@ -284,6 +284,33 @@ void main() {
     controller.goBack();
     expect(await controller.currentUrl(), 'https://youtube.com');
   });
+
+  testWidgets('Reload url', (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://flutter.io',
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+
+    final FakePlatformWebView platformWebView =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformWebView.currentUrl, 'https://flutter.io');
+    expect(platformWebView.amountOfReloadsOnCurrentUrl, 0);
+
+    controller.reload();
+
+    expect(platformWebView.currentUrl, 'https://flutter.io');
+    expect(platformWebView.amountOfReloadsOnCurrentUrl, 1);
+
+    controller.loadUrl('https://youtube.com');
+
+    expect(platformWebView.amountOfReloadsOnCurrentUrl, 0);
+  });
 }
 
 class FakePlatformWebView {
@@ -305,6 +332,7 @@ class FakePlatformWebView {
 
   List<String> history = <String>[];
   int currentPosition = -1;
+  int amountOfReloadsOnCurrentUrl = 0;
 
   String get currentUrl => history.isEmpty ? null : history[currentPosition];
   JavaScriptMode javaScriptMode;
@@ -316,6 +344,7 @@ class FakePlatformWebView {
         history = history.sublist(0, currentPosition + 1);
         history.add(url);
         currentPosition++;
+        amountOfReloadsOnCurrentUrl = 0;
         return Future<void>.sync(() {});
       case 'updateSettings':
         if (call.arguments['jsMode'] == null) {
@@ -336,6 +365,9 @@ class FakePlatformWebView {
       case 'goForward':
         currentPosition = min(history.length - 1, currentPosition + 1);
         return Future<void>.sync(() {});
+      case 'reload':
+        amountOfReloadsOnCurrentUrl++;
+        return Future<void>.sync(() {});
         break;
       case 'currentUrl':
         return Future<String>.value(currentUrl);

From e8b331608614fb2d7734c39fd50a182495e44299 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Thu, 20 Dec 2018 10:21:19 -0800
Subject: [PATCH 038/410] Bump webview_flutter's version. (#995)

I failed to do so when merging master with #974
---
 packages/webview_flutter/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 966e9ebff4e0..45418b4f0332 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.1.1
+version: 0.1.2
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From 04102962e53c6e8e545403317d807c9890a98ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Vel=C3=A1squez=20L=C3=B3pez?=
 <diego.velasquez.lopez@gmail.com>
Date: Mon, 24 Dec 2018 21:50:24 -0500
Subject: [PATCH 039/410] Fixed local_auth crash with API < 24 #24339 (#1002)

---
 .../plugins/localauth/LocalAuthPlugin.java    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java b/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java
index 2a65c863fd97..4d986d39e9f4 100644
--- a/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java
+++ b/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java
@@ -5,7 +5,7 @@
 package io.flutter.plugins.localauth;
 
 import android.app.Activity;
-import android.hardware.fingerprint.FingerprintManager;
+import android.support.v4.hardware.fingerprint.FingerprintManagerCompat;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -75,17 +75,22 @@ public void onError(String code, String error) {
               });
       authenticationHelper.authenticate();
     } else if (call.method.equals("getAvailableBiometrics")) {
-      FingerprintManager fingerprintMgr =
-          registrar.activity().getSystemService(FingerprintManager.class);
-      ArrayList<String> biometrics = new ArrayList<String>();
-      if (fingerprintMgr.isHardwareDetected()) {
-        if (fingerprintMgr.hasEnrolledFingerprints()) {
-          biometrics.add("fingerprint");
-        } else {
-          biometrics.add("undefined");
+      try {
+        ArrayList<String> biometrics = new ArrayList<String>();
+        FingerprintManagerCompat fingerprintMgr =
+            FingerprintManagerCompat.from(registrar.activity());
+        if (fingerprintMgr.isHardwareDetected()) {
+          if (fingerprintMgr.hasEnrolledFingerprints()) {
+            biometrics.add("fingerprint");
+          } else {
+            biometrics.add("undefined");
+          }
         }
+        result.success(biometrics);
+      } catch (Exception e) {
+        result.error("no_biometrics_available", e.getMessage(), null);
       }
-      result.success(biometrics);
+
     } else {
       result.notImplemented();
     }

From 860ebfe984d4b1c6cd83f6c03b84278ca8db7d62 Mon Sep 17 00:00:00 2001
From: Ben Konyi <bkonyi@google.com>
Date: Wed, 26 Dec 2018 09:24:38 -0800
Subject: [PATCH 040/410] Bump android_alarm_manager version to 0.2.3 (#1006)

---
 packages/android_alarm_manager/CHANGELOG.md | 7 +++++--
 packages/android_alarm_manager/pubspec.yaml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index 180c105bd69e..3bde2c74055e 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,10 +1,13 @@
+## 0.2.3
+* Move firebase_auth from a dependency to a dev_dependency.
+
 ## 0.2.2
-* Update dependencies for example to point to published versions of firebase_auth
+* Update dependencies for example to point to published versions of firebase_auth.
 
 ## 0.2.1
 * Update dependencies for example to point to published versions of firebase_auth
   and google_sign_in.
-* Add missing dependency on firebase_auth.1
+* Add missing dependency on firebase_auth.
 
 ## 0.2.0
 
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index 7145af7bc11e..75bb76b3ba4c 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -1,7 +1,7 @@
 name: android_alarm_manager
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.2.2
+version: 0.2.3
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 

From ed8c4ab52d275b96339e719840683f3b55e06a91 Mon Sep 17 00:00:00 2001
From: Wouter Hardeman <wouterhardeman@users.noreply.github.com>
Date: Thu, 3 Jan 2019 01:35:34 +0100
Subject: [PATCH 041/410] [camera] Fix issue with crash when the physical
 device's orientation is unknown on Android. (#976)

This fixes https://github.com/flutter/flutter/issues/25105.

The error was caused by the following:

> In the plugin the currentOrientation property is set to the constant ORIENTATION_UNKNOWN by default, which results in -1. When your orientation updates, it is set to the actual value. The setOrientationHint function only accepts 0, 90, 180 and 270 as argument. When calculating the orientation it adds the 1 or -1 (depending on whether you are using the back or front camera). That resulted in 271, which isn't accepted and caused your error.

Fixed it by checking the value in ``getMediaOrientation()``.  If the orientation is unknown, it will be set to 0.
---
 packages/camera/CHANGELOG.md                                  | 4 ++++
 .../src/main/java/io/flutter/plugins/camera/CameraPlugin.java | 4 +++-
 packages/camera/pubspec.yaml                                  | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 1ea41de34af9..68b0afd261e9 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.7
+
+* Fix issue with crash when the physical device's orientation is unknown.
+
 ## 0.2.6
 
 * Update the camera to use the physical device's orientation instead of the UI
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index b7f104d95ba1..fd2bf44699d5 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -768,7 +768,9 @@ private void dispose() {
 
     private int getMediaOrientation() {
       final int sensorOrientationOffset =
-          (isFrontFacing) ? -currentOrientation : currentOrientation;
+          (currentOrientation == ORIENTATION_UNKNOWN)
+              ? 0
+              : (isFrontFacing) ? -currentOrientation : currentOrientation;
       return (sensorOrientationOffset + sensorOrientation + 360) % 360;
     }
   }
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 9a7e109f2864..62e0f7212346 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -1,7 +1,7 @@
 name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed and capturing images.
-version: 0.2.6
+version: 0.2.7
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From 3f8559687aca94e4d69d2aefae4470c36f56e3ec Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Wed, 2 Jan 2019 22:02:40 -0800
Subject: [PATCH 042/410] Fix CI analyzer errors. (#1025)

---
 packages/firebase_ml_vision/test/firebase_ml_vision_test.dart | 3 +++
 packages/video_player/test/video_player_test.dart             | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index 492abac41466..a6afccc6091c 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -415,6 +415,9 @@ void main() {
 
       group('$BarcodeDetectorOptions', () {
         test('barcodeFormats', () async {
+          // The constructor for `BarcodeDetectorOptions` can't be `const`
+          // without triggering a `CONST_EVAL_TYPE_BOOL_INT` error.
+          // ignore: prefer_const_constructors
           final BarcodeDetectorOptions options = BarcodeDetectorOptions(
             barcodeFormats: BarcodeFormat.code128 |
                 BarcodeFormat.dataMatrix |
diff --git a/packages/video_player/test/video_player_test.dart b/packages/video_player/test/video_player_test.dart
index 22dd9a2e3e67..94bebbd331d8 100644
--- a/packages/video_player/test/video_player_test.dart
+++ b/packages/video_player/test/video_player_test.dart
@@ -47,7 +47,7 @@ void main() {
 
     controller.textureId = 123;
     controller.value = controller.value.copyWith(
-      duration: Duration(milliseconds: 100),
+      duration: const Duration(milliseconds: 100),
     );
 
     await tester.pump();

From bcfbd466642d60439e2f4240bb94346d4f3dd3ca Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Thu, 3 Jan 2019 12:25:55 -0800
Subject: [PATCH 043/410] Allow user to handle PlatformExceptions caught by
 FirebaseAnalyticsObserver._sendScreenView(). (#993)

---
 packages/firebase_analytics/CHANGELOG.md      |  4 +
 packages/firebase_analytics/lib/observer.dart | 30 +++++++-
 packages/firebase_analytics/pubspec.yaml      |  2 +-
 .../test/observer_test.dart                   | 76 +++++++++++++++++++
 4 files changed, 107 insertions(+), 5 deletions(-)

diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index 62180dc6223a..3c9df4b7f4c2 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.0
+
+* Allow user to handle `PlatformException`s caught by `FirebaseAnalyticsObserver._sendScreenView()`.
+
 ## 1.0.6
 
 * Allow user ID to be set to null.
diff --git a/packages/firebase_analytics/lib/observer.dart b/packages/firebase_analytics/lib/observer.dart
index e3ed99fce031..f55c6cb3e8d5 100644
--- a/packages/firebase_analytics/lib/observer.dart
+++ b/packages/firebase_analytics/lib/observer.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
 import 'package:flutter/widgets.dart';
 
@@ -19,8 +20,8 @@ String defaultNameExtractor(RouteSettings settings) => settings.name;
 /// A [NavigatorObserver] that sends events to Firebase Analytics when the
 /// currently active [PageRoute] changes.
 ///
-/// When a route is pushed or poped, [nameExtractor] is used to extract a name
-/// from [RouteSettings] of the now active route and that name is send to
+/// When a route is pushed or popped, [nameExtractor] is used to extract a name
+/// from [RouteSettings] of the now active route and that name is sent to
 /// Firebase.
 ///
 /// The following operations will result in sending a screen view event:
@@ -49,18 +50,39 @@ String defaultNameExtractor(RouteSettings settings) => settings.name;
 /// [PageRouteAware] and subscribing it to [FirebaseAnalyticsObserver]. See the
 /// [PageRouteObserver] docs for an example.
 class FirebaseAnalyticsObserver extends RouteObserver<PageRoute<dynamic>> {
+  /// Creates a [NavigatorObserver] that sends events to [FirebaseAnalytics].
+  ///
+  /// When a route is pushed or popped, [nameExtractor] is used to extract a
+  /// name from [RouteSettings] of the now active route and that name is sent to
+  /// Firebase. Defaults to `defaultNameExtractor`.
+  ///
+  /// If a [PlatformException] is thrown while the observer attempts to send the
+  /// active route to [analytics], `onError` will be called with the
+  /// exception. If `onError` is omitted, the exception will be printed using
+  /// `debugPrint()`.
   FirebaseAnalyticsObserver({
     @required this.analytics,
     this.nameExtractor = defaultNameExtractor,
-  });
+    Function(PlatformException error) onError,
+  }) : _onError = onError;
 
   final FirebaseAnalytics analytics;
   final ScreenNameExtractor nameExtractor;
+  final void Function(PlatformException error) _onError;
 
   void _sendScreenView(PageRoute<dynamic> route) {
     final String screenName = nameExtractor(route.settings);
     if (screenName != null) {
-      analytics.setCurrentScreen(screenName: screenName);
+      analytics.setCurrentScreen(screenName: screenName).catchError(
+        (Object error) {
+          if (_onError == null) {
+            debugPrint('$FirebaseAnalyticsObserver: $error');
+          } else {
+            _onError(error);
+          }
+        },
+        test: (Object error) => error is PlatformException,
+      );
     }
   }
 
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index fb826acc7708..e5bff3148c6b 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 1.0.6
+version: 1.1.0
 
 flutter:
   plugin:
diff --git a/packages/firebase_analytics/test/observer_test.dart b/packages/firebase_analytics/test/observer_test.dart
index 355950c3e09e..e91d0786c7c6 100644
--- a/packages/firebase_analytics/test/observer_test.dart
+++ b/packages/firebase_analytics/test/observer_test.dart
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
+
+import 'package:flutter/services.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 
@@ -14,10 +17,23 @@ void main() {
   group('FirebaseAnalyticsObserver', () {
     FirebaseAnalytics analytics;
     FirebaseAnalyticsObserver observer;
+    final List<String> printLog = <String>[];
+
+    void overridePrint(void Function() func) {
+      final ZoneSpecification spec =
+          ZoneSpecification(print: (_, __, ___, String msg) {
+        // Add to log instead of printing to stdout
+        printLog.add(msg);
+      });
+      return Zone.current.fork(specification: spec).run(func);
+    }
 
     setUp(() {
+      printLog.clear();
       analytics = MockFirebaseAnalytics();
       observer = FirebaseAnalyticsObserver(analytics: analytics);
+      when(analytics.setCurrentScreen(screenName: anyNamed('screenName')))
+          .thenAnswer((Invocation invocation) => Future<void>.value());
     });
 
     test('setCurrentScreen on route pop', () {
@@ -53,6 +69,66 @@ void main() {
 
       verify(analytics.setCurrentScreen(screenName: 'foo')).called(1);
     });
+
+    test('handles only ${PlatformException}s', () async {
+      observer = FirebaseAnalyticsObserver(
+        analytics: analytics,
+        nameExtractor: (RouteSettings settings) => 'foo',
+      );
+
+      final PageRoute<dynamic> route = MockPageRoute();
+      final PageRoute<dynamic> previousRoute = MockPageRoute();
+
+      // Throws non-PlatformExceptions
+      when(analytics.setCurrentScreen(screenName: anyNamed('screenName')))
+          .thenThrow(ArgumentError());
+
+      expect(() => observer.didPush(route, previousRoute), throwsArgumentError);
+
+      // Print PlatformExceptions
+      Future<void> throwPlatformException() async =>
+          throw PlatformException(code: 'a');
+
+      when(analytics.setCurrentScreen(screenName: anyNamed('screenName')))
+          .thenAnswer((Invocation invocation) => throwPlatformException());
+
+      overridePrint(() => observer.didPush(route, previousRoute));
+
+      await pumpEventQueue();
+      expect(
+        printLog,
+        <String>['$FirebaseAnalyticsObserver: ${PlatformException(code: 'a')}'],
+      );
+    });
+
+    test('runs onError', () async {
+      PlatformException passedException;
+
+      final void Function(PlatformException error) handleError =
+          (PlatformException error) {
+        passedException = error;
+      };
+
+      observer = FirebaseAnalyticsObserver(
+        analytics: analytics,
+        nameExtractor: (RouteSettings settings) => 'foo',
+        onError: handleError,
+      );
+
+      final PageRoute<dynamic> route = MockPageRoute();
+      final PageRoute<dynamic> previousRoute = MockPageRoute();
+
+      final PlatformException thrownException = PlatformException(code: 'b');
+      Future<void> throwPlatformException() async => throw thrownException;
+
+      when(analytics.setCurrentScreen(screenName: anyNamed('screenName')))
+          .thenAnswer((Invocation invocation) => throwPlatformException());
+
+      observer.didPush(route, previousRoute);
+
+      await pumpEventQueue();
+      expect(passedException, thrownException);
+    });
   });
 }
 

From efe4c1b413181b51b49173ffb2b7f78b87ddf971 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Thu, 3 Jan 2019 12:55:33 -0800
Subject: [PATCH 044/410] Add byte streaming capability for the camera  (#965)

---
 packages/camera/CHANGELOG.md                  |   5 +
 packages/camera/README.md                     |   2 +
 .../flutter/plugins/camera/CameraPlugin.java  | 148 ++++++++++++++-
 packages/camera/ios/Classes/CameraPlugin.m    | 175 +++++++++++++++++-
 packages/camera/lib/camera.dart               | 113 ++++++++++-
 packages/camera/lib/camera_image.dart         | 124 +++++++++++++
 packages/camera/pubspec.yaml                  |   2 +-
 7 files changed, 550 insertions(+), 19 deletions(-)
 create mode 100644 packages/camera/lib/camera_image.dart

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 68b0afd261e9..314ed79ee969 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.8
+
+* Add access to the image stream from Dart.
+* Use `cameraController.startImageStream(listener)` to process the images.
+
 ## 0.2.7
 
 * Fix issue with crash when the physical device's orientation is unknown.
diff --git a/packages/camera/README.md b/packages/camera/README.md
index 58d30bdfb894..e0d66ef4cb34 100644
--- a/packages/camera/README.md
+++ b/packages/camera/README.md
@@ -8,6 +8,8 @@ A Flutter plugin for iOS and Android allowing access to the device cameras.
 
 * Display live camera preview in a widget.
 * Snapshots can be captured and saved to a file.
+* Record video.
+* Add access to the image stream from Dart.
 
 ## Installation
 
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index fd2bf44699d5..709c2f379bb0 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -213,6 +213,26 @@ public void onMethodCall(MethodCall call, final Result result) {
           camera.stopVideoRecording(result);
           break;
         }
+      case "startImageStream":
+        {
+          try {
+            camera.startPreviewWithImageStream();
+            result.success(null);
+          } catch (CameraAccessException e) {
+            result.error("CameraAccess", e.getMessage(), null);
+          }
+          break;
+        }
+      case "stopImageStream":
+        {
+          try {
+            camera.startPreview();
+            result.success(null);
+          } catch (CameraAccessException e) {
+            result.error("CameraAccess", e.getMessage(), null);
+          }
+          break;
+        }
       case "dispose":
         {
           if (camera != null) {
@@ -258,7 +278,8 @@ private class Camera {
     private CameraDevice cameraDevice;
     private CameraCaptureSession cameraCaptureSession;
     private EventChannel.EventSink eventSink;
-    private ImageReader imageReader;
+    private ImageReader pictureImageReader;
+    private ImageReader imageStreamReader;
     private int sensorOrientation;
     private boolean isFrontFacing;
     private String cameraName;
@@ -458,9 +479,15 @@ private void open(@Nullable final Result result) {
         if (result != null) result.error("cameraPermission", "Camera permission not granted", null);
       } else {
         try {
-          imageReader =
+          pictureImageReader =
               ImageReader.newInstance(
                   captureSize.getWidth(), captureSize.getHeight(), ImageFormat.JPEG, 2);
+
+          // Used to steam image byte data to dart side.
+          imageStreamReader =
+              ImageReader.newInstance(
+                  previewSize.getWidth(), previewSize.getHeight(), ImageFormat.YUV_420_888, 2);
+
           cameraManager.openCamera(
               cameraName,
               new CameraDevice.StateCallback() {
@@ -553,7 +580,7 @@ private void takePicture(String filePath, @NonNull final Result result) {
         return;
       }
 
-      imageReader.setOnImageAvailableListener(
+      pictureImageReader.setOnImageAvailableListener(
           new ImageReader.OnImageAvailableListener() {
             @Override
             public void onImageAvailable(ImageReader reader) {
@@ -571,7 +598,7 @@ public void onImageAvailable(ImageReader reader) {
       try {
         final CaptureRequest.Builder captureBuilder =
             cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
-        captureBuilder.addTarget(imageReader.getSurface());
+        captureBuilder.addTarget(pictureImageReader.getSurface());
         captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, getMediaOrientation());
 
         cameraCaptureSession.capture(
@@ -697,7 +724,7 @@ private void startPreview() throws CameraAccessException {
       surfaces.add(previewSurface);
       captureRequestBuilder.addTarget(previewSurface);
 
-      surfaces.add(imageReader.getSurface());
+      surfaces.add(pictureImageReader.getSurface());
 
       cameraDevice.createCaptureSession(
           surfaces,
@@ -727,6 +754,107 @@ public void onConfigureFailed(@NonNull CameraCaptureSession cameraCaptureSession
           null);
     }
 
+    private void startPreviewWithImageStream() throws CameraAccessException {
+      closeCaptureSession();
+
+      SurfaceTexture surfaceTexture = textureEntry.surfaceTexture();
+      surfaceTexture.setDefaultBufferSize(previewSize.getWidth(), previewSize.getHeight());
+
+      captureRequestBuilder =
+          cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+
+      List<Surface> surfaces = new ArrayList<>();
+
+      Surface previewSurface = new Surface(surfaceTexture);
+      surfaces.add(previewSurface);
+      captureRequestBuilder.addTarget(previewSurface);
+
+      surfaces.add(imageStreamReader.getSurface());
+      captureRequestBuilder.addTarget(imageStreamReader.getSurface());
+
+      cameraDevice.createCaptureSession(
+          surfaces,
+          new CameraCaptureSession.StateCallback() {
+            @Override
+            public void onConfigured(@NonNull CameraCaptureSession session) {
+              if (cameraDevice == null) {
+                sendErrorEvent("The camera was closed during configuration.");
+                return;
+              }
+              try {
+                cameraCaptureSession = session;
+                captureRequestBuilder.set(
+                    CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO);
+                cameraCaptureSession.setRepeatingRequest(captureRequestBuilder.build(), null, null);
+              } catch (CameraAccessException e) {
+                sendErrorEvent(e.getMessage());
+              }
+            }
+
+            @Override
+            public void onConfigureFailed(@NonNull CameraCaptureSession cameraCaptureSession) {
+              sendErrorEvent("Failed to configure the camera for streaming images.");
+            }
+          },
+          null);
+
+      registerImageStreamEventChannel();
+    }
+
+    private void registerImageStreamEventChannel() {
+      final EventChannel imageStreamChannel =
+          new EventChannel(registrar.messenger(), "plugins.flutter.io/camera/imageStream");
+
+      imageStreamChannel.setStreamHandler(
+          new EventChannel.StreamHandler() {
+            @Override
+            public void onListen(Object o, EventChannel.EventSink eventSink) {
+              setImageStreamImageAvailableListener(eventSink);
+            }
+
+            @Override
+            public void onCancel(Object o) {
+              imageStreamReader.setOnImageAvailableListener(null, null);
+            }
+          });
+    }
+
+    private void setImageStreamImageAvailableListener(final EventChannel.EventSink eventSink) {
+      imageStreamReader.setOnImageAvailableListener(
+          new ImageReader.OnImageAvailableListener() {
+            @Override
+            public void onImageAvailable(final ImageReader reader) {
+              Image img = reader.acquireLatestImage();
+              if (img == null) return;
+
+              List<Map<String, Object>> planes = new ArrayList<>();
+              for (Image.Plane plane : img.getPlanes()) {
+                ByteBuffer buffer = plane.getBuffer();
+
+                byte[] bytes = new byte[buffer.remaining()];
+                buffer.get(bytes, 0, bytes.length);
+
+                Map<String, Object> planeBuffer = new HashMap<>();
+                planeBuffer.put("bytesPerRow", plane.getRowStride());
+                planeBuffer.put("bytesPerPixel", plane.getPixelStride());
+                planeBuffer.put("bytes", bytes);
+
+                planes.add(planeBuffer);
+              }
+
+              Map<String, Object> imageBuffer = new HashMap<>();
+              imageBuffer.put("width", img.getWidth());
+              imageBuffer.put("height", img.getHeight());
+              imageBuffer.put("format", img.getFormat());
+              imageBuffer.put("planes", planes);
+
+              eventSink.success(imageBuffer);
+              img.close();
+            }
+          },
+          null);
+    }
+
     private void sendErrorEvent(String errorDescription) {
       if (eventSink != null) {
         Map<String, String> event = new HashMap<>();
@@ -750,9 +878,13 @@ private void close() {
         cameraDevice.close();
         cameraDevice = null;
       }
-      if (imageReader != null) {
-        imageReader.close();
-        imageReader = null;
+      if (pictureImageReader != null) {
+        pictureImageReader.close();
+        pictureImageReader = null;
+      }
+      if (imageStreamReader != null) {
+        imageStreamReader.close();
+        imageStreamReader = null;
       }
       if (mediaRecorder != null) {
         mediaRecorder.reset();
diff --git a/packages/camera/ios/Classes/CameraPlugin.m b/packages/camera/ios/Classes/CameraPlugin.m
index 42cc2e42894c..79e6e343ed91 100644
--- a/packages/camera/ios/Classes/CameraPlugin.m
+++ b/packages/camera/ios/Classes/CameraPlugin.m
@@ -1,5 +1,6 @@
 #import "CameraPlugin.h"
 #import <AVFoundation/AVFoundation.h>
+#import <Accelerate/Accelerate.h>
 #import <libkern/OSAtomic.h>
 
 @interface NSError (FlutterError)
@@ -21,6 +22,24 @@ @interface FLTSavePhotoDelegate : NSObject <AVCapturePhotoCaptureDelegate>
 - initWithPath:(NSString *)filename result:(FlutterResult)result;
 @end
 
+@interface FLTImageStreamHandler : NSObject <FlutterStreamHandler>
+@property FlutterEventSink eventSink;
+@end
+
+@implementation FLTImageStreamHandler
+
+- (FlutterError *_Nullable)onCancelWithArguments:(id _Nullable)arguments {
+  _eventSink = nil;
+  return nil;
+}
+
+- (FlutterError *_Nullable)onListenWithArguments:(id _Nullable)arguments
+                                       eventSink:(nonnull FlutterEventSink)events {
+  _eventSink = events;
+  return nil;
+}
+@end
+
 @implementation FLTSavePhotoDelegate {
   /// Used to keep the delegate alive until didFinishProcessingPhotoSampleBuffer.
   FLTSavePhotoDelegate *selfReference;
@@ -66,6 +85,7 @@ @interface FLTCam : NSObject <FlutterTexture,
 @property(readonly, nonatomic) int64_t textureId;
 @property(nonatomic, copy) void (^onFrameAvailable)();
 @property(nonatomic) FlutterEventChannel *eventChannel;
+@property(nonatomic) FLTImageStreamHandler *imageStreamHandler;
 @property(nonatomic) FlutterEventSink eventSink;
 @property(readonly, nonatomic) AVCaptureSession *captureSession;
 @property(readonly, nonatomic) AVCaptureDevice *captureDevice;
@@ -83,17 +103,27 @@ @interface FLTCam : NSObject <FlutterTexture,
 @property(strong, nonatomic) AVCaptureAudioDataOutput *audioOutput;
 @property(assign, nonatomic) BOOL isRecording;
 @property(assign, nonatomic) BOOL isAudioSetup;
+@property(assign, nonatomic) BOOL isStreamingImages;
+@property(nonatomic) vImage_Buffer destinationBuffer;
+@property(nonatomic) vImage_Buffer conversionBuffer;
 - (instancetype)initWithCameraName:(NSString *)cameraName
                   resolutionPreset:(NSString *)resolutionPreset
                              error:(NSError **)error;
+
 - (void)start;
 - (void)stop;
 - (void)startVideoRecordingAtPath:(NSString *)path result:(FlutterResult)result;
 - (void)stopVideoRecordingWithResult:(FlutterResult)result;
+- (void)startImageStreamWithMessenger:(NSObject<FlutterBinaryMessenger> *)messenger;
+- (void)stopImageStream;
 - (void)captureToFile:(NSString *)filename result:(FlutterResult)result;
 @end
 
 @implementation FLTCam
+// Yuv420 format used for iOS 10+, which is minimum requirement for this plugin.
+// Format is used to stream image byte data to dart.
+FourCharCode const videoFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
+
 - (instancetype)initWithCameraName:(NSString *)cameraName
                   resolutionPreset:(NSString *)resolutionPreset
                              error:(NSError **)error {
@@ -102,13 +132,16 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
   _captureSession = [[AVCaptureSession alloc] init];
   AVCaptureSessionPreset preset;
   if ([resolutionPreset isEqualToString:@"high"]) {
-    preset = AVCaptureSessionPresetHigh;
+    preset = AVCaptureSessionPreset1280x720;
+    _previewSize = CGSizeMake(1280, 720);
   } else if ([resolutionPreset isEqualToString:@"medium"]) {
-    preset = AVCaptureSessionPresetMedium;
+    preset = AVCaptureSessionPreset640x480;
+    _previewSize = CGSizeMake(640, 480);
   } else {
     NSAssert([resolutionPreset isEqualToString:@"low"], @"Unknown resolution preset %@",
              resolutionPreset);
-    preset = AVCaptureSessionPresetLow;
+    preset = AVCaptureSessionPreset352x288;
+    _previewSize = CGSizeMake(352, 288);
   }
   _captureSession.sessionPreset = preset;
   _captureDevice = [AVCaptureDevice deviceWithUniqueID:cameraName];
@@ -119,13 +152,15 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
     *error = localError;
     return nil;
   }
-  CMVideoDimensions dimensions =
-      CMVideoFormatDescriptionGetDimensions([[_captureDevice activeFormat] formatDescription]);
-  _previewSize = CGSizeMake(dimensions.width, dimensions.height);
+
+  vImageBuffer_Init(&_destinationBuffer, _previewSize.width, _previewSize.height, 32,
+                    kvImageNoFlags);
+  vImageBuffer_Init(&_conversionBuffer, _previewSize.width, _previewSize.height, 32,
+                    kvImageNoFlags);
 
   _captureVideoOutput = [AVCaptureVideoDataOutput new];
   _captureVideoOutput.videoSettings =
-      @{(NSString *)kCVPixelBufferPixelFormatTypeKey : @(kCVPixelFormatType_32BGRA)};
+      @{(NSString *)kCVPixelBufferPixelFormatTypeKey : @(videoFormat)};
   [_captureVideoOutput setAlwaysDiscardsLateVideoFrames:YES];
   [_captureVideoOutput setSampleBufferDelegate:self queue:dispatch_get_main_queue()];
 
@@ -185,6 +220,46 @@ - (void)captureOutput:(AVCaptureOutput *)output
     });
     return;
   }
+  if (_isStreamingImages) {
+    if (_imageStreamHandler.eventSink) {
+      CVPixelBufferRef pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
+      CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
+
+      size_t imageWidth = CVPixelBufferGetWidth(pixelBuffer);
+      size_t imageHeight = CVPixelBufferGetHeight(pixelBuffer);
+
+      NSMutableArray *planes = [NSMutableArray array];
+
+      size_t planeCount = CVPixelBufferGetPlaneCount(pixelBuffer);
+      for (int i = 0; i < planeCount; i++) {
+        void *planeAddress = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, i);
+        size_t bytesPerRow = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, i);
+        size_t height = CVPixelBufferGetHeightOfPlane(pixelBuffer, i);
+        size_t width = CVPixelBufferGetWidthOfPlane(pixelBuffer, i);
+
+        NSNumber *length = @(bytesPerRow * height);
+        NSData *bytes = [NSData dataWithBytes:planeAddress length:length.unsignedIntegerValue];
+
+        NSMutableDictionary *planeBuffer = [NSMutableDictionary dictionary];
+        planeBuffer[@"bytesPerRow"] = @(bytesPerRow);
+        planeBuffer[@"width"] = @(width);
+        planeBuffer[@"height"] = @(height);
+        planeBuffer[@"bytes"] = [FlutterStandardTypedData typedDataWithBytes:bytes];
+
+        [planes addObject:planeBuffer];
+      }
+
+      NSMutableDictionary *imageBuffer = [NSMutableDictionary dictionary];
+      imageBuffer[@"width"] = [NSNumber numberWithUnsignedLong:imageWidth];
+      imageBuffer[@"height"] = [NSNumber numberWithUnsignedLong:imageHeight];
+      imageBuffer[@"format"] = @(videoFormat);
+      imageBuffer[@"planes"] = planes;
+
+      _imageStreamHandler.eventSink(imageBuffer);
+
+      CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
+    }
+  }
   if (_isRecording) {
     if (_videoWriter.status == AVAssetWriterStatusFailed) {
       _eventSink(@{
@@ -269,7 +344,58 @@ - (CVPixelBufferRef)copyPixelBuffer {
   while (!OSAtomicCompareAndSwapPtrBarrier(pixelBuffer, nil, (void **)&_latestPixelBuffer)) {
     pixelBuffer = _latestPixelBuffer;
   }
-  return pixelBuffer;
+
+  return [self convertYUVImageToBGRA:pixelBuffer];
+}
+
+// Since video format was changed to kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange we have to
+// convert image to a usable format for flutter textures. Which is kCVPixelFormatType_32BGRA.
+- (CVPixelBufferRef)convertYUVImageToBGRA:(CVPixelBufferRef)pixelBuffer {
+  CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
+
+  vImage_YpCbCrToARGB infoYpCbCrToARGB;
+  vImage_YpCbCrPixelRange pixelRange;
+  pixelRange.Yp_bias = 16;
+  pixelRange.CbCr_bias = 128;
+  pixelRange.YpRangeMax = 235;
+  pixelRange.CbCrRangeMax = 240;
+  pixelRange.YpMax = 235;
+  pixelRange.YpMin = 16;
+  pixelRange.CbCrMax = 240;
+  pixelRange.CbCrMin = 16;
+
+  vImageConvert_YpCbCrToARGB_GenerateConversion(kvImage_YpCbCrToARGBMatrix_ITU_R_601_4, &pixelRange,
+                                                &infoYpCbCrToARGB, kvImage420Yp8_CbCr8,
+                                                kvImageARGB8888, kvImageNoFlags);
+
+  vImage_Buffer sourceLumaBuffer;
+  sourceLumaBuffer.data = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 0);
+  sourceLumaBuffer.height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 0);
+  sourceLumaBuffer.width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 0);
+  sourceLumaBuffer.rowBytes = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);
+
+  vImage_Buffer sourceChromaBuffer;
+  sourceChromaBuffer.data = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 1);
+  sourceChromaBuffer.height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 1);
+  sourceChromaBuffer.width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 1);
+  sourceChromaBuffer.rowBytes = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 1);
+
+  vImageConvert_420Yp8_CbCr8ToARGB8888(&sourceLumaBuffer, &sourceChromaBuffer, &_destinationBuffer,
+                                       &infoYpCbCrToARGB, NULL, 255,
+                                       kvImagePrintDiagnosticsToConsole);
+
+  CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
+  CVPixelBufferRelease(pixelBuffer);
+
+  const uint8_t map[4] = {3, 2, 1, 0};
+  vImagePermuteChannels_ARGB8888(&_destinationBuffer, &_conversionBuffer, map, kvImageNoFlags);
+
+  CVPixelBufferRef newPixelBuffer = NULL;
+  CVPixelBufferCreateWithBytes(NULL, _conversionBuffer.width, _conversionBuffer.height,
+                               kCVPixelFormatType_32BGRA, _conversionBuffer.data,
+                               _conversionBuffer.rowBytes, NULL, NULL, NULL, &newPixelBuffer);
+
+  return newPixelBuffer;
 }
 
 - (FlutterError *_Nullable)onCancelWithArguments:(id _Nullable)arguments {
@@ -282,6 +408,7 @@ - (FlutterError *_Nullable)onListenWithArguments:(id _Nullable)arguments
   _eventSink = events;
   return nil;
 }
+
 - (void)startVideoRecordingAtPath:(NSString *)path result:(FlutterResult)result {
   if (!_isRecording) {
     if (![self setupWriterForPath:path]) {
@@ -321,6 +448,32 @@ - (void)stopVideoRecordingWithResult:(FlutterResult)result {
   }
 }
 
+- (void)startImageStreamWithMessenger:(NSObject<FlutterBinaryMessenger> *)messenger {
+  if (!_isStreamingImages) {
+    FlutterEventChannel *eventChannel =
+        [FlutterEventChannel eventChannelWithName:@"plugins.flutter.io/camera/imageStream"
+                                  binaryMessenger:messenger];
+
+    _imageStreamHandler = [[FLTImageStreamHandler alloc] init];
+    [eventChannel setStreamHandler:_imageStreamHandler];
+
+    _isStreamingImages = YES;
+  } else {
+    _eventSink(
+        @{@"event" : @"error", @"errorDescription" : @"Images from camera are already streaming!"});
+  }
+}
+
+- (void)stopImageStream {
+  if (_isStreamingImages) {
+    _isStreamingImages = NO;
+    _imageStreamHandler = nil;
+  } else {
+    _eventSink(
+        @{@"event" : @"error", @"errorDescription" : @"Images from camera are not streaming!"});
+  }
+}
+
 - (BOOL)setupWriterForPath:(NSString *)path {
   NSError *error = nil;
   NSURL *outputURL;
@@ -495,6 +648,12 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
       });
       [cam start];
     }
+  } else if ([@"startImageStream" isEqualToString:call.method]) {
+    [_camera startImageStreamWithMessenger:_messenger];
+    result(nil);
+  } else if ([@"stopImageStream" isEqualToString:call.method]) {
+    [_camera stopImageStream];
+    result(nil);
   } else {
     NSDictionary *argsMap = call.arguments;
     NSUInteger textureId = ((NSNumber *)argsMap[@"textureId"]).unsignedIntegerValue;
diff --git a/packages/camera/lib/camera.dart b/packages/camera/lib/camera.dart
index 153bbeb69b98..19028891ad84 100644
--- a/packages/camera/lib/camera.dart
+++ b/packages/camera/lib/camera.dart
@@ -1,8 +1,15 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'dart:async';
+import 'dart:typed_data';
 
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 
+part 'camera_image.dart';
+
 final MethodChannel _channel = const MethodChannel('plugins.flutter.io/camera')
   ..invokeMethod('init');
 
@@ -10,6 +17,8 @@ enum CameraLensDirection { front, back, external }
 
 enum ResolutionPreset { low, medium, high }
 
+typedef onLatestImageAvailable = Function(CameraImage image);
+
 /// Returns the resolution preset as a String.
 String serializeResolutionPreset(ResolutionPreset resolutionPreset) {
   switch (resolutionPreset) {
@@ -110,13 +119,15 @@ class CameraValue {
     this.previewSize,
     this.isRecordingVideo,
     this.isTakingPicture,
+    this.isStreamingImages,
   });
 
   const CameraValue.uninitialized()
       : this(
             isInitialized: false,
             isRecordingVideo: false,
-            isTakingPicture: false);
+            isTakingPicture: false,
+            isStreamingImages: false);
 
   /// True after [CameraController.initialize] has completed successfully.
   final bool isInitialized;
@@ -127,6 +138,9 @@ class CameraValue {
   /// True when the camera is recording (not the same as previewing).
   final bool isRecordingVideo;
 
+  /// True when images from the camera are being streamed.
+  final bool isStreamingImages;
+
   final String errorDescription;
 
   /// The size of the preview in pixels.
@@ -145,6 +159,7 @@ class CameraValue {
     bool isInitialized,
     bool isRecordingVideo,
     bool isTakingPicture,
+    bool isStreamingImages,
     String errorDescription,
     Size previewSize,
   }) {
@@ -154,6 +169,7 @@ class CameraValue {
       previewSize: previewSize ?? this.previewSize,
       isRecordingVideo: isRecordingVideo ?? this.isRecordingVideo,
       isTakingPicture: isTakingPicture ?? this.isTakingPicture,
+      isStreamingImages: isStreamingImages ?? this.isStreamingImages,
     );
   }
 
@@ -164,7 +180,8 @@ class CameraValue {
         'isRecordingVideo: $isRecordingVideo, '
         'isInitialized: $isInitialized, '
         'errorDescription: $errorDescription, '
-        'previewSize: $previewSize)';
+        'previewSize: $previewSize, '
+        'isStreamingImages: $isStreamingImages)';
   }
 }
 
@@ -185,6 +202,7 @@ class CameraController extends ValueNotifier<CameraValue> {
   int _textureId;
   bool _isDisposed = false;
   StreamSubscription<dynamic> _eventSubscription;
+  StreamSubscription<dynamic> _imageStreamSubscription;
   Completer<void> _creatingCompleter;
 
   /// Initializes the camera on the device.
@@ -276,6 +294,90 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
   }
 
+  /// Start streaming images from platform camera.
+  ///
+  /// Settings for capturing images on iOS and Android is set to always use the
+  /// latest image available from the camera and will drop all other images.
+  ///
+  /// When running continuously with [CameraPreview] widget, this function runs
+  /// best with [ResolutionPreset.low]. Running on [ResolutionPreset.high] can
+  /// have significant frame rate drops for [CameraPreview] on lower end
+  /// devices.
+  ///
+  /// Throws a [CameraException] if image streaming or video recording has
+  /// already started.
+  // TODO(bmparr): Add settings for resolution and fps.
+  Future<void> startImageStream(onLatestImageAvailable onAvailable) async {
+    if (!value.isInitialized || _isDisposed) {
+      throw CameraException(
+        'Uninitialized CameraController',
+        'startImageStream was called on uninitialized CameraController.',
+      );
+    }
+    if (value.isRecordingVideo) {
+      throw CameraException(
+        'A video recording is already started.',
+        'startImageStream was called while a video is being recorded.',
+      );
+    }
+    if (value.isStreamingImages) {
+      throw CameraException(
+        'A camera has started streaming images.',
+        'startImageStream was called while a camera was streaming images.',
+      );
+    }
+
+    try {
+      await _channel.invokeMethod('startImageStream');
+      value = value.copyWith(isStreamingImages: true);
+    } on PlatformException catch (e) {
+      throw CameraException(e.code, e.message);
+    }
+    const EventChannel cameraEventChannel =
+        EventChannel('plugins.flutter.io/camera/imageStream');
+    _imageStreamSubscription =
+        cameraEventChannel.receiveBroadcastStream().listen(
+      (dynamic imageData) {
+        onAvailable(CameraImage._fromPlatformData(imageData));
+      },
+    );
+  }
+
+  /// Stop streaming images from platform camera.
+  ///
+  /// Throws a [CameraException] if image streaming was not started or video
+  /// recording was started.
+  Future<void> stopImageStream() async {
+    if (!value.isInitialized || _isDisposed) {
+      throw CameraException(
+        'Uninitialized CameraController',
+        'stopImageStream was called on uninitialized CameraController.',
+      );
+    }
+    if (value.isRecordingVideo) {
+      throw CameraException(
+        'A video recording is already started.',
+        'stopImageStream was called while a video is being recorded.',
+      );
+    }
+    if (!value.isStreamingImages) {
+      throw CameraException(
+        'No camera is streaming images',
+        'stopImageStream was called when no camera is streaming images.',
+      );
+    }
+
+    try {
+      value = value.copyWith(isStreamingImages: false);
+      await _channel.invokeMethod('stopImageStream');
+    } on PlatformException catch (e) {
+      throw CameraException(e.code, e.message);
+    }
+
+    _imageStreamSubscription.cancel();
+    _imageStreamSubscription = null;
+  }
+
   /// Start a video recording and save the file to [path].
   ///
   /// A path can for example be obtained using
@@ -299,6 +401,13 @@ class CameraController extends ValueNotifier<CameraValue> {
         'startVideoRecording was called when a recording is already started.',
       );
     }
+    if (value.isStreamingImages) {
+      throw CameraException(
+        'A camera has started streaming images.',
+        'startVideoRecording was called while a camera was streaming images.',
+      );
+    }
+
     try {
       await _channel.invokeMethod(
         'startVideoRecording',
diff --git a/packages/camera/lib/camera_image.dart b/packages/camera/lib/camera_image.dart
new file mode 100644
index 000000000000..2dd665ddb400
--- /dev/null
+++ b/packages/camera/lib/camera_image.dart
@@ -0,0 +1,124 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of 'camera.dart';
+
+/// A single color plane of image data.
+///
+/// The number and meaning of the planes in an image are determined by the
+/// format of the Image.
+class Plane {
+  Plane._fromPlatformData(Map<dynamic, dynamic> data)
+      : bytes = data['bytes'],
+        bytesPerPixel = data['bytesPerPixel'],
+        bytesPerRow = data['bytesPerRow'],
+        height = data['height'],
+        width = data['width'];
+
+  /// Bytes representing this plane.
+  final Uint8List bytes;
+
+  /// The distance between adjacent pixel samples on Android, in bytes.
+  ///
+  /// Will be `null` on iOS.
+  final int bytesPerPixel;
+
+  /// The row stride for this color plane, in bytes.
+  final int bytesPerRow;
+
+  /// Height of the pixel buffer on iOS.
+  ///
+  /// Will be `null` on Android
+  final int height;
+
+  /// Width of the pixel buffer on iOS.
+  ///
+  /// Will be `null` on Android.
+  final int width;
+}
+
+/// Group of image formats that are comparable across Android and iOS platforms.
+enum ImageFormatGroup {
+  /// The image format does not fit into any specific group.
+  unknown,
+
+  /// Multi-plane YUV 420 format.
+  ///
+  /// This format is a generic YCbCr format, capable of describing any 4:2:0
+  /// chroma-subsampled planar or semiplanar buffer (but not fully interleaved),
+  /// with 8 bits per color sample.
+  ///
+  /// On Android, this is `android.graphics.ImageFormat.YUV_420_888`. See
+  /// https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888
+  ///
+  /// On iOS, this is `kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange`. See
+  /// https://developer.apple.com/documentation/corevideo/1563591-pixel_format_identifiers/kcvpixelformattype_420ypcbcr8biplanarvideorange?language=objc
+  yuv420,
+}
+
+/// Describes how pixels are represented in an image.
+class ImageFormat {
+  ImageFormat._fromPlatformData(this.raw) : group = _asImageFormatGroup(raw);
+
+  /// Describes the format group the raw image format falls into.
+  final ImageFormatGroup group;
+
+  /// Raw version of the format from the Android or iOS platform.
+  ///
+  /// On Android, this is an `int` from class `android.graphics.ImageFormat`. See
+  /// https://developer.android.com/reference/android/graphics/ImageFormat
+  ///
+  /// On iOS, this is a `FourCharCode` constant from Pixel Format Identifiers.
+  /// See https://developer.apple.com/documentation/corevideo/1563591-pixel_format_identifiers?language=objc
+  final dynamic raw;
+}
+
+ImageFormatGroup _asImageFormatGroup(dynamic rawFormat) {
+  if (rawFormat == 35 || rawFormat == 875704438) {
+    return ImageFormatGroup.yuv420;
+  } else {
+    return ImageFormatGroup.unknown;
+  }
+}
+
+/// A single complete image buffer from the platform camera.
+///
+/// This class allows for direct application access to the pixel data of an
+/// Image through one or more [Uint8List]. Each buffer is encapsulated in a
+/// [Plane] that describes the layout of the pixel data in that plane. The
+/// [CameraImage] is not directly usable as a UI resource.
+///
+/// Although not all image formats are planar on iOS, we treat 1-dimensional
+/// images as single planar images.
+class CameraImage {
+  CameraImage._fromPlatformData(Map<dynamic, dynamic> data)
+      : format = ImageFormat._fromPlatformData(data['format']),
+        height = data['height'],
+        width = data['width'],
+        planes = List<Plane>.unmodifiable(data['planes']
+            .map((dynamic planeData) => Plane._fromPlatformData(planeData)));
+
+  /// Format of the image provided.
+  ///
+  /// Determines the number of planes needed to represent the image, and
+  /// the general layout of the pixel data in each [Uint8List].
+  final ImageFormat format;
+
+  /// Height of the image in pixels.
+  ///
+  /// For formats where some color channels are subsampled, this is the height
+  /// of the largest-resolution plane.
+  final int height;
+
+  /// Width of the image in pixels.
+  ///
+  /// For formats where some color channels are subsampled, this is the width
+  /// of the largest-resolution plane.
+  final int width;
+
+  /// The pixels planes for this image.
+  ///
+  /// The number of planes is determined by the format of the image.
+  final List<Plane> planes;
+}
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 62e0f7212346..bd029dd59b47 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -1,7 +1,7 @@
 name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed and capturing images.
-version: 0.2.7
+version: 0.2.8
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From 98317e3cf618175fbeb05c169474cd5aa49aab3b Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Thu, 3 Jan 2019 12:56:01 -0800
Subject: [PATCH 045/410] Add the ability for ML Kit to create image from bytes
 (#971)

---
 packages/firebase_ml_vision/CHANGELOG.md      |   4 +
 .../FirebaseMlVisionPlugin.java               |  86 +++++----
 .../ios/Classes/FirebaseMlVisionPlugin.m      |  74 +++++++-
 .../lib/firebase_ml_vision.dart               |   2 +
 .../lib/src/barcode_detector.dart             |   3 +-
 .../lib/src/cloud_detector_options.dart       |   2 +-
 .../lib/src/face_detector.dart                |   3 +-
 .../lib/src/firebase_vision.dart              | 165 +++++++++++++++++-
 .../lib/src/label_detector.dart               |   8 +-
 .../lib/src/text_recognizer.dart              |   3 +-
 packages/firebase_ml_vision/pubspec.yaml      |   2 +-
 .../test/firebase_ml_vision_test.dart         |  78 +++++++++
 12 files changed, 375 insertions(+), 55 deletions(-)

diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index f898f817ccd6..6632c33013d0 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.1
+
+* Add capability to create image from bytes.
+
 ## 0.2.0+2
 
 * Fix bug with empty text object.
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
index 45cb19fea3c2..3ca61ee4890a 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
@@ -2,6 +2,7 @@
 
 import android.net.Uri;
 import com.google.firebase.ml.vision.common.FirebaseVisionImage;
+import com.google.firebase.ml.vision.common.FirebaseVisionImageMetadata;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -29,55 +30,74 @@ public static void registerWith(Registrar registrar) {
   @Override
   public void onMethodCall(MethodCall call, Result result) {
     Map<String, Object> options = call.argument("options");
+
     FirebaseVisionImage image;
+    Map<String, Object> imageData = call.arguments();
+    try {
+      image = dataToVisionImage(imageData);
+    } catch (IOException exception) {
+      result.error("MLVisionDetectorIOError", exception.getLocalizedMessage(), null);
+      return;
+    }
+
     switch (call.method) {
       case "BarcodeDetector#detectInImage":
-        try {
-          image = filePathToVisionImage((String) call.argument("path"));
-          BarcodeDetector.instance.handleDetection(image, options, result);
-        } catch (IOException e) {
-          result.error("barcodeDetectorIOError", e.getLocalizedMessage(), null);
-        }
+        BarcodeDetector.instance.handleDetection(image, options, result);
         break;
       case "FaceDetector#detectInImage":
-        try {
-          image = filePathToVisionImage((String) call.argument("path"));
-          FaceDetector.instance.handleDetection(image, options, result);
-        } catch (IOException e) {
-          result.error("faceDetectorIOError", e.getLocalizedMessage(), null);
-        }
+        FaceDetector.instance.handleDetection(image, options, result);
         break;
       case "LabelDetector#detectInImage":
-        try {
-          image = filePathToVisionImage((String) call.argument("path"));
-          LabelDetector.instance.handleDetection(image, options, result);
-        } catch (IOException e) {
-          result.error("labelDetectorIOError", e.getLocalizedMessage(), null);
-        }
+        LabelDetector.instance.handleDetection(image, options, result);
         break;
       case "CloudLabelDetector#detectInImage":
-        try {
-          image = filePathToVisionImage((String) call.argument("path"));
-          CloudLabelDetector.instance.handleDetection(image, options, result);
-        } catch (IOException e) {
-          result.error("cloudLabelDetectorIOError", e.getLocalizedMessage(), null);
-        }
+        CloudLabelDetector.instance.handleDetection(image, options, result);
         break;
       case "TextRecognizer#processImage":
-        try {
-          image = filePathToVisionImage((String) call.argument("path"));
-          TextRecognizer.instance.handleDetection(image, options, result);
-        } catch (IOException e) {
-          result.error("textRecognizerIOError", e.getLocalizedMessage(), null);
-        }
+        TextRecognizer.instance.handleDetection(image, options, result);
         break;
       default:
         result.notImplemented();
     }
   }
 
-  private FirebaseVisionImage filePathToVisionImage(String path) throws IOException {
-    File file = new File(path);
-    return FirebaseVisionImage.fromFilePath(registrar.context(), Uri.fromFile(file));
+  private FirebaseVisionImage dataToVisionImage(Map<String, Object> imageData) throws IOException {
+    String imageType = (String) imageData.get("type");
+
+    switch (imageType) {
+      case "file":
+        File file = new File((String) imageData.get("path"));
+        return FirebaseVisionImage.fromFilePath(registrar.context(), Uri.fromFile(file));
+      case "bytes":
+        @SuppressWarnings("unchecked")
+        Map<String, Object> metadataData = (Map<String, Object>) imageData.get("metadata");
+
+        FirebaseVisionImageMetadata metadata =
+            new FirebaseVisionImageMetadata.Builder()
+                .setWidth((int) (double) metadataData.get("width"))
+                .setHeight((int) (double) metadataData.get("height"))
+                .setFormat(FirebaseVisionImageMetadata.IMAGE_FORMAT_NV21)
+                .setRotation(getRotation((int) metadataData.get("rotation")))
+                .build();
+
+        return FirebaseVisionImage.fromByteArray((byte[]) imageData.get("bytes"), metadata);
+      default:
+        throw new IllegalArgumentException(String.format("No image type for: %s", imageType));
+    }
+  }
+
+  private int getRotation(int rotation) {
+    switch (rotation) {
+      case 0:
+        return FirebaseVisionImageMetadata.ROTATION_0;
+      case 90:
+        return FirebaseVisionImageMetadata.ROTATION_90;
+      case 180:
+        return FirebaseVisionImageMetadata.ROTATION_180;
+      case 270:
+        return FirebaseVisionImageMetadata.ROTATION_270;
+      default:
+        throw new IllegalArgumentException(String.format("No rotation for: %d", rotation));
+    }
   }
 }
diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index 2b51f3d6a0ff..567d2b0b1d70 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -36,7 +36,7 @@ - (instancetype)init {
 }
 
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
-  FIRVisionImage *image = [self filePathToVisionImage:call.arguments[@"path"]];
+  FIRVisionImage *image = [self dataToVisionImage:call.arguments];
   NSDictionary *options = call.arguments[@"options"];
   if ([@"BarcodeDetector#detectInImage" isEqualToString:call.method]) {
     [BarcodeDetector handleDetection:image options:options result:result];
@@ -53,8 +53,74 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
   }
 }
 
-- (FIRVisionImage *)filePathToVisionImage:(NSString *)path {
-  UIImage *image = [UIImage imageWithContentsOfFile:path];
-  return [[FIRVisionImage alloc] initWithImage:image];
+- (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
+  NSString *imageType = imageData[@"type"];
+
+  if ([@"file" isEqualToString:imageType]) {
+    UIImage *image = [UIImage imageWithContentsOfFile:imageData[@"path"]];
+    return [[FIRVisionImage alloc] initWithImage:image];
+  } else if ([@"bytes" isEqualToString:imageType]) {
+    FlutterStandardTypedData *byteData = imageData[@"bytes"];
+    NSData *imageBytes = byteData.data;
+
+    NSDictionary *metadata = imageData[@"metadata"];
+    NSArray *planeData = metadata[@"planeData"];
+    size_t planeCount = planeData.count;
+
+    size_t widths[planeCount];
+    size_t heights[planeCount];
+    size_t bytesPerRows[planeCount];
+
+    void *baseAddresses[planeCount];
+    baseAddresses[0] = (void *)imageBytes.bytes;
+
+    size_t lastAddressIndex = 0;  // Used to get base address for each plane
+    for (int i = 0; i < planeCount; i++) {
+      NSDictionary *plane = planeData[i];
+
+      NSNumber *width = plane[@"width"];
+      NSNumber *height = plane[@"height"];
+      NSNumber *bytesPerRow = plane[@"bytesPerRow"];
+
+      widths[i] = width.unsignedLongValue;
+      heights[i] = height.unsignedLongValue;
+      bytesPerRows[i] = bytesPerRow.unsignedLongValue;
+
+      if (i > 0) {
+        size_t addressIndex = lastAddressIndex + heights[i - 1] * bytesPerRows[i - 1];
+        baseAddresses[i] = (void *)imageBytes.bytes + addressIndex;
+        lastAddressIndex = addressIndex;
+      }
+    }
+
+    NSNumber *width = metadata[@"width"];
+    NSNumber *height = metadata[@"height"];
+
+    NSNumber *rawFormat = metadata[@"rawFormat"];
+    FourCharCode format = FOUR_CHAR_CODE(rawFormat.unsignedIntValue);
+
+    CVPixelBufferRef pxbuffer = NULL;
+    CVPixelBufferCreateWithPlanarBytes(kCFAllocatorDefault, width.unsignedLongValue,
+                                       height.unsignedLongValue, format, NULL, imageBytes.length, 2,
+                                       baseAddresses, widths, heights, bytesPerRows, NULL, NULL,
+                                       NULL, &pxbuffer);
+
+    CIImage *ciImage = [CIImage imageWithCVPixelBuffer:pxbuffer];
+
+    CIContext *temporaryContext = [CIContext contextWithOptions:nil];
+    CGImageRef videoImage =
+        [temporaryContext createCGImage:ciImage
+                               fromRect:CGRectMake(0, 0, CVPixelBufferGetWidth(pxbuffer),
+                                                   CVPixelBufferGetHeight(pxbuffer))];
+
+    UIImage *uiImage = [UIImage imageWithCGImage:videoImage];
+    CGImageRelease(videoImage);
+    return [[FIRVisionImage alloc] initWithImage:uiImage];
+  } else {
+    NSString *errorReason = [NSString stringWithFormat:@"No image type for: %@", imageType];
+    @throw [NSException exceptionWithName:NSInvalidArgumentException
+                                   reason:errorReason
+                                 userInfo:nil];
+  }
 }
 @end
diff --git a/packages/firebase_ml_vision/lib/firebase_ml_vision.dart b/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
index 8e228bb65229..00f85da5bfe7 100644
--- a/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
+++ b/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
@@ -7,6 +7,8 @@ library firebase_ml_vision;
 import 'dart:async';
 import 'dart:io';
 import 'dart:math';
+import 'dart:typed_data';
+import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
diff --git a/packages/firebase_ml_vision/lib/src/barcode_detector.dart b/packages/firebase_ml_vision/lib/src/barcode_detector.dart
index 8ceedbbe475a..d8705aaeaad6 100644
--- a/packages/firebase_ml_vision/lib/src/barcode_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/barcode_detector.dart
@@ -189,11 +189,10 @@ class BarcodeDetector extends FirebaseVisionDetector {
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'BarcodeDetector#detectInImage',
       <String, dynamic>{
-        'path': visionImage.imageFile.path,
         'options': <String, dynamic>{
           'barcodeFormats': options.barcodeFormats.value,
         },
-      },
+      }..addAll(visionImage._serialize()),
     );
 
     final List<Barcode> barcodes = <Barcode>[];
diff --git a/packages/firebase_ml_vision/lib/src/cloud_detector_options.dart b/packages/firebase_ml_vision/lib/src/cloud_detector_options.dart
index 4a4144ecd014..58c7c8885fe5 100644
--- a/packages/firebase_ml_vision/lib/src/cloud_detector_options.dart
+++ b/packages/firebase_ml_vision/lib/src/cloud_detector_options.dart
@@ -29,7 +29,7 @@ class CloudDetectorOptions {
   /// The type of model to use for the detection.
   final CloudModelType modelType;
 
-  Map<String, dynamic> _toMap() => <String, dynamic>{
+  Map<String, dynamic> _serialize() => <String, dynamic>{
         'maxResults': maxResults,
         'modelType': _enumToString(modelType),
       };
diff --git a/packages/firebase_ml_vision/lib/src/face_detector.dart b/packages/firebase_ml_vision/lib/src/face_detector.dart
index 560f2a7448cf..7d87377d840f 100644
--- a/packages/firebase_ml_vision/lib/src/face_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/face_detector.dart
@@ -44,7 +44,6 @@ class FaceDetector extends FirebaseVisionDetector {
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'FaceDetector#detectInImage',
       <String, dynamic>{
-        'path': visionImage.imageFile.path,
         'options': <String, dynamic>{
           'enableClassification': options.enableClassification,
           'enableLandmarks': options.enableLandmarks,
@@ -52,7 +51,7 @@ class FaceDetector extends FirebaseVisionDetector {
           'minFaceSize': options.minFaceSize,
           'mode': _enumToString(options.mode),
         },
-      },
+      }..addAll(visionImage._serialize()),
     );
 
     final List<Face> faces = <Face>[];
diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 31bd400494b4..9525db5f4a3a 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -4,6 +4,13 @@
 
 part of firebase_ml_vision;
 
+enum _ImageType { file, bytes }
+
+/// Indicates the image rotation.
+///
+/// Rotation is counter-clockwise.
+enum ImageRotation { rotation0, rotation90, rotation180, rotation270 }
+
 /// The Firebase machine learning vision API.
 ///
 /// You can get an instance by calling [FirebaseVision.instance] and then get
@@ -56,22 +63,170 @@ class FirebaseVision {
 ///
 /// Create an instance by calling one of the factory constructors.
 class FirebaseVisionImage {
-  FirebaseVisionImage._(this.imageFile);
+  FirebaseVisionImage._({
+    @required _ImageType type,
+    FirebaseVisionImageMetadata metadata,
+    File imageFile,
+    Uint8List bytes,
+  })  : _imageFile = imageFile,
+        _metadata = metadata,
+        _bytes = bytes,
+        _type = type;
 
   /// Construct a [FirebaseVisionImage] from a file.
   factory FirebaseVisionImage.fromFile(File imageFile) {
     assert(imageFile != null);
-    return FirebaseVisionImage._(imageFile);
+    return FirebaseVisionImage._(
+      type: _ImageType.file,
+      imageFile: imageFile,
+    );
   }
 
   /// Construct a [FirebaseVisionImage] from a file path.
   factory FirebaseVisionImage.fromFilePath(String imagePath) {
     assert(imagePath != null);
-    return FirebaseVisionImage._(File(imagePath));
+    return FirebaseVisionImage._(
+      type: _ImageType.file,
+      imageFile: File(imagePath),
+    );
+  }
+
+  /// Construct a [FirebaseVisionImage] from a list of bytes.
+  ///
+  /// Expects `android.graphics.ImageFormat.NV21` format on Android. Note:
+  /// Concatenating the planes of `android.graphics.ImageFormat.YUV_420_888`
+  /// into a single plane, converts it to `android.graphics.ImageFormat.NV21`.
+  ///
+  /// Expects `kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange` or any other
+  /// planar format on iOS.
+  factory FirebaseVisionImage.fromBytes(
+    Uint8List bytes,
+    FirebaseVisionImageMetadata metadata,
+  ) {
+    assert(bytes != null);
+    assert(metadata != null);
+    return FirebaseVisionImage._(
+      type: _ImageType.bytes,
+      bytes: bytes,
+      metadata: metadata,
+    );
+  }
+
+  final Uint8List _bytes;
+  final File _imageFile;
+  final FirebaseVisionImageMetadata _metadata;
+  final _ImageType _type;
+
+  Map<String, dynamic> _serialize() => <String, dynamic>{
+        'type': _enumToString(_type),
+        'bytes': _bytes,
+        'path': _imageFile?.path,
+        'metadata': _type == _ImageType.bytes ? _metadata._serialize() : null,
+      };
+}
+
+/// Plane attributes to create the image buffer on iOS.
+///
+/// When using iOS, [bytesPerRow], [height], and [width] throw [AssertionError]
+/// if `null`.
+class FirebaseVisionImagePlaneMetadata {
+  FirebaseVisionImagePlaneMetadata({
+    @required this.bytesPerRow,
+    @required this.height,
+    @required this.width,
+  })  : assert(defaultTargetPlatform == TargetPlatform.iOS
+            ? bytesPerRow != null
+            : true),
+        assert(defaultTargetPlatform == TargetPlatform.iOS
+            ? height != null
+            : true),
+        assert(
+            defaultTargetPlatform == TargetPlatform.iOS ? width != null : true);
+
+  /// The row stride for this color plane, in bytes.
+  final int bytesPerRow;
+
+  /// Height of the pixel buffer on iOS.
+  final int height;
+
+  /// Width of the pixel buffer on iOS.
+  final int width;
+
+  Map<String, dynamic> _serialize() => <String, dynamic>{
+        'bytesPerRow': bytesPerRow,
+        'height': height,
+        'width': width,
+      };
+}
+
+/// Image metadata used by [FirebaseVision] detectors.
+///
+/// [rotation] defaults to [ImageRotation.rotation0]. Currently only rotates on
+/// Android.
+///
+/// When using iOS, [rawFormat] and [planeData] throw [AssertionError] if
+/// `null`.
+class FirebaseVisionImageMetadata {
+  FirebaseVisionImageMetadata({
+    @required this.size,
+    @required this.rawFormat,
+    @required this.planeData,
+    this.rotation = ImageRotation.rotation0,
+  })  : assert(size != null),
+        assert(defaultTargetPlatform == TargetPlatform.iOS
+            ? rawFormat != null
+            : true),
+        assert(defaultTargetPlatform == TargetPlatform.iOS
+            ? planeData != null
+            : true);
+
+  /// Size of the image in pixels.
+  final Size size;
+
+  /// Rotation of the image for Android.
+  ///
+  /// Not currently used on iOS.
+  final ImageRotation rotation;
+
+  /// Raw version of the format from the iOS platform.
+  ///
+  /// Since iOS can use any planar format, this format will be used to create
+  /// the image buffer on iOS.
+  ///
+  /// On iOS, this is a `FourCharCode` constant from Pixel Format Identifiers.
+  /// See https://developer.apple.com/documentation/corevideo/1563591-pixel_format_identifiers?language=objc
+  ///
+  /// Not used on Android.
+  final dynamic rawFormat;
+
+  /// The plane attributes to create the image buffer on iOS.
+  ///
+  /// Not used on Android.
+  final List<FirebaseVisionImagePlaneMetadata> planeData;
+
+  int _imageRotationToInt(ImageRotation rotation) {
+    switch (rotation) {
+      case ImageRotation.rotation90:
+        return 90;
+      case ImageRotation.rotation180:
+        return 180;
+      case ImageRotation.rotation270:
+        return 270;
+      default:
+        assert(rotation == ImageRotation.rotation0);
+        return 0;
+    }
   }
 
-  /// The file location of the image.
-  final File imageFile;
+  Map<String, dynamic> _serialize() => <String, dynamic>{
+        'width': size.width,
+        'height': size.height,
+        'rotation': _imageRotationToInt(rotation),
+        'rawFormat': rawFormat,
+        'planeData': planeData
+            .map((FirebaseVisionImagePlaneMetadata plane) => plane._serialize())
+            .toList(),
+      };
 }
 
 /// Abstract class for detectors in [FirebaseVision] API.
diff --git a/packages/firebase_ml_vision/lib/src/label_detector.dart b/packages/firebase_ml_vision/lib/src/label_detector.dart
index 8511724406d0..9adaaae80b43 100644
--- a/packages/firebase_ml_vision/lib/src/label_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/label_detector.dart
@@ -34,11 +34,10 @@ class LabelDetector extends FirebaseVisionDetector {
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'LabelDetector#detectInImage',
       <String, dynamic>{
-        'path': visionImage.imageFile.path,
         'options': <String, dynamic>{
           'confidenceThreshold': options.confidenceThreshold,
         },
-      },
+      }..addAll(visionImage._serialize()),
     );
 
     final List<Label> labels = <Label>[];
@@ -80,9 +79,8 @@ class CloudLabelDetector extends FirebaseVisionDetector {
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'CloudLabelDetector#detectInImage',
       <String, dynamic>{
-        'path': visionImage.imageFile.path,
-        'options': options._toMap(),
-      },
+        'options': options._serialize(),
+      }..addAll(visionImage._serialize()),
     );
 
     final List<Label> labels = <Label>[];
diff --git a/packages/firebase_ml_vision/lib/src/text_recognizer.dart b/packages/firebase_ml_vision/lib/src/text_recognizer.dart
index b65aa95fec09..3caeefa11ec3 100644
--- a/packages/firebase_ml_vision/lib/src/text_recognizer.dart
+++ b/packages/firebase_ml_vision/lib/src/text_recognizer.dart
@@ -22,9 +22,8 @@ class TextRecognizer implements FirebaseVisionDetector {
         await FirebaseVision.channel.invokeMethod(
       'TextRecognizer#processImage',
       <String, dynamic>{
-        'path': visionImage.imageFile.path,
         'options': <String, dynamic>{},
-      },
+      }..addAll(visionImage._serialize()),
     );
 
     return VisionText._(reply);
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index 602163ac3092..750eb254b2e4 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google ML Vision for Firebase, an SDK that bring
   learning expertise to Android and iOS apps in a powerful yet easy-to-use package.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.2.0+2
+version: 0.2.1
 
 dependencies:
   flutter:
diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index a6afccc6091c..8136c5839ec8 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:math';
+import 'dart:typed_data';
+import 'dart:ui';
 
 import 'package:firebase_ml_vision/firebase_ml_vision.dart';
 import 'package:flutter/services.dart';
@@ -36,6 +38,61 @@ void main() {
       log.clear();
     });
 
+    group('$FirebaseVisionImageMetadata', () {
+      final TextRecognizer recognizer =
+          FirebaseVision.instance.textRecognizer();
+
+      setUp(() {
+        returnValue = <dynamic, dynamic>{
+          'text': '',
+          'blocks': <dynamic>[],
+        };
+      });
+
+      test('default serialization', () async {
+        final FirebaseVisionImageMetadata metadata =
+            FirebaseVisionImageMetadata(
+          rawFormat: 35,
+          size: const Size(1.0, 1.0),
+          planeData: <FirebaseVisionImagePlaneMetadata>[
+            FirebaseVisionImagePlaneMetadata(
+              bytesPerRow: 1000,
+              height: 480,
+              width: 480,
+            ),
+          ],
+        );
+        final FirebaseVisionImage image =
+            FirebaseVisionImage.fromBytes(Uint8List(0), metadata);
+        await recognizer.processImage(image);
+
+        expect(log, <Matcher>[
+          isMethodCall(
+            'TextRecognizer#processImage',
+            arguments: <String, dynamic>{
+              'type': 'bytes',
+              'path': null,
+              'bytes': Uint8List(0),
+              'metadata': <String, dynamic>{
+                'width': 1.0,
+                'height': 1.0,
+                'rotation': 0,
+                'rawFormat': 35,
+                'planeData': <dynamic>[
+                  <String, dynamic>{
+                    'bytesPerRow': 1000,
+                    'height': 480,
+                    'width': 480,
+                  },
+                ],
+              },
+              'options': <String, dynamic>{},
+            },
+          ),
+        ]);
+      });
+    });
+
     group('$BarcodeDetector', () {
       BarcodeDetector detector;
       FirebaseVisionImage image;
@@ -71,7 +128,10 @@ void main() {
           isMethodCall(
             'BarcodeDetector#detectInImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{
                 'barcodeFormats': 0xFFFF,
               },
@@ -491,7 +551,10 @@ void main() {
           isMethodCall(
             'FaceDetector#detectInImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{
                 'enableClassification': true,
                 'enableLandmarks': true,
@@ -594,7 +657,10 @@ void main() {
           isMethodCall(
             'LabelDetector#detectInImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{
                 'confidenceThreshold': 0.2,
               },
@@ -626,7 +692,10 @@ void main() {
           isMethodCall(
             'LabelDetector#detectInImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{
                 'confidenceThreshold': 0.5,
               },
@@ -673,7 +742,10 @@ void main() {
           isMethodCall(
             'CloudLabelDetector#detectInImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{
                 'maxResults': 5,
                 'modelType': 'latest',
@@ -707,7 +779,10 @@ void main() {
           isMethodCall(
             'CloudLabelDetector#detectInImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{
                 'maxResults': 10,
                 'modelType': 'stable',
@@ -939,7 +1014,10 @@ void main() {
           isMethodCall(
             'TextRecognizer#processImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{},
             },
           ),

From ab0a96090b736e547700d2305beb19116bc0617b Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Thu, 3 Jan 2019 23:42:13 -0800
Subject: [PATCH 046/410] Workaround the Gradle crash due to non ASCII chars.
 (#1031)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cirrus puts the PR description and commit message in environment
variables.
These messages tend to have non ASCII characters sometimes (like
emojis), which triggers a Gradle bug (gradle/gradle#3117) resulting
in Gradle crashing without a helpful error message.

The real solution to this problem should be fixing the Gradle bug.
The better workaround on the Flutter side would be to set a UTF8 locale
on the Cirrus machine, but I have yet figured out how to do it.
For now to avoid more people from hitting this I'm working around by
temporarily unsetting the Cirrus environment variables with the PR
description and commit message.

A non ASCII character to make sure it works: 😄
---
 .cirrus.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 00beb3c37cf6..bc5cd4f1125f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -27,8 +27,20 @@ task:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
       script:
+        # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
+        # might include non-ASCII characters which makes Gradle crash.
+        # See: https://github.com/flutter/flutter/issues/24935
+        # This is a temporary workaround until we figure how to properly configure
+        # a UTF8 locale on Cirrus (or until the Gradle bug is fixed).
+        # TODO(amirh): Set the locale to UTF8.
+        - echo "$CIRRUS_CHANGE_MESSAGE" > /tmp/cirrus_change_message.txt
+        - echo "$CIRRUS_COMMIT_MESSAGE" > /tmp/cirrus_commit_message.txt
+        - export CIRRUS_CHANGE_MESSAGE=""
+        - export CIRRUS_COMMIT_MESSAGE=""
         - ./script/incremental_build.sh build-examples --apk
         - ./script/incremental_build.sh java-test  # must come after apk build
+        - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
+        - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
 
 task:
   name: build-ipas

From c989956d1cd15bd2a894a42aa1a8e212f29eb8ab Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Fri, 4 Jan 2019 15:55:40 -0800
Subject: [PATCH 047/410] javascript evaluation ios/android (#1021)

Create evaluateJavascript method in the WebView plugin.

As a result of updating the enum name from JavaScriptMode to JavascriptMode, which is a breaking change, the version number has been updated to 0.2.0.
Android and IOS return different types for javascript evaluation result, we unified them to make the result type to be string.
In some ObjectiveC code, change == [NSNull null] to isKindOfClass:[NSNull class] to avoid type warning.
---
 packages/webview_flutter/CHANGELOG.md         |  5 ++
 .../webviewflutter/FlutterWebView.java        | 20 ++++-
 .../webview_flutter/example/lib/main.dart     | 68 ++++++++++----
 .../ios/Classes/FlutterWebView.m              | 28 +++++-
 .../webview_flutter/lib/webview_flutter.dart  | 88 ++++++++++++-------
 packages/webview_flutter/pubspec.yaml         |  2 +-
 .../test/webview_flutter_test.dart            | 60 +++++++++++--
 7 files changed, 209 insertions(+), 62 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 0812ce72bf44..76506a0d9065 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.0
+
+* Added a evaluateJavascript method to WebView controller. 
+* (BREAKING CHANGE) Renamed the `JavaScriptMode` enum to `JavascriptMode`, and the WebView `javasScriptMode` parameter to `javascriptMode`.
+
 ## 0.1.2
 
 * Added a reload method to the WebView controller.
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index 1d49837f3921..58f249a3cbe7 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -59,6 +59,9 @@ public void onMethodCall(MethodCall methodCall, Result result) {
       case "currentUrl":
         currentUrl(methodCall, result);
         break;
+      case "evaluateJavascript":
+        evaluateJavaScript(methodCall, result);
+        break;
       default:
         result.notImplemented();
     }
@@ -107,6 +110,21 @@ private void updateSettings(MethodCall methodCall, Result result) {
     result.success(null);
   }
 
+  private void evaluateJavaScript(MethodCall methodCall, final Result result) {
+    String jsString = (String) methodCall.arguments;
+    if (jsString == null) {
+      throw new UnsupportedOperationException("JavaScript string cannot be null");
+    }
+    webView.evaluateJavascript(
+        jsString,
+        new android.webkit.ValueCallback<String>() {
+          @Override
+          public void onReceiveValue(String value) {
+            result.success(value);
+          }
+        });
+  }
+
   private void applySettings(Map<String, Object> settings) {
     for (String key : settings.keySet()) {
       switch (key) {
@@ -128,7 +146,7 @@ private void updateJsMode(int mode) {
         webView.getSettings().setJavaScriptEnabled(true);
         break;
       default:
-        throw new IllegalArgumentException("Trying to set unknown Javascript mode: " + mode);
+        throw new IllegalArgumentException("Trying to set unknown JavaScript mode: " + mode);
     }
   }
 
diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index ee03ffda2be2..9befe4b67f41 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -20,12 +20,12 @@ class WebViewExample extends StatelessWidget {
         // This drop down menu demonstrates that Flutter widgets can be shown over the web view.
         actions: <Widget>[
           NavigationControls(_controller.future),
-          const SampleMenu(),
+          SampleMenu(_controller.future),
         ],
       ),
       body: WebView(
         initialUrl: 'https://flutter.io',
-        javaScriptMode: JavaScriptMode.unrestricted,
+        javascriptMode: JavascriptMode.unrestricted,
         onWebViewCreated: (WebViewController webViewController) {
           _controller.complete(webViewController);
         },
@@ -55,26 +55,60 @@ class WebViewExample extends StatelessWidget {
   }
 }
 
+enum MenuOptions {
+  evaluateJavascript,
+  toast,
+}
+
 class SampleMenu extends StatelessWidget {
-  const SampleMenu();
+  SampleMenu(this.controller);
+  final Future<WebViewController> controller;
 
   @override
   Widget build(BuildContext context) {
-    return PopupMenuButton<String>(
-      onSelected: (String value) {
-        Scaffold.of(context)
-            .showSnackBar(SnackBar(content: Text('You selected: $value')));
+    return FutureBuilder<WebViewController>(
+      future: controller,
+      builder:
+          (BuildContext context, AsyncSnapshot<WebViewController> controller) {
+        return PopupMenuButton<MenuOptions>(
+          onSelected: (MenuOptions value) {
+            switch (value) {
+              case MenuOptions.evaluateJavascript:
+                _onEvaluateJavascript(controller.data, context);
+                break;
+              case MenuOptions.toast:
+                Scaffold.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text('You selected: $value'),
+                  ),
+                );
+                break;
+            }
+          },
+          itemBuilder: (BuildContext context) => <PopupMenuItem<MenuOptions>>[
+                PopupMenuItem<MenuOptions>(
+                  value: MenuOptions.evaluateJavascript,
+                  child: const Text('Evaluate JavaScript'),
+                  enabled: controller.hasData,
+                ),
+                const PopupMenuItem<MenuOptions>(
+                  value: MenuOptions.toast,
+                  child: Text('Make a toast'),
+                ),
+              ],
+        );
       },
-      itemBuilder: (BuildContext context) => <PopupMenuItem<String>>[
-            const PopupMenuItem<String>(
-              value: 'Item 1',
-              child: Text('Item 1'),
-            ),
-            const PopupMenuItem<String>(
-              value: 'Item 2',
-              child: Text('Item 2'),
-            ),
-          ],
+    );
+  }
+
+  void _onEvaluateJavascript(
+      WebViewController controller, BuildContext context) async {
+    final String result = await controller
+        .evaluateJavascript("document.body.style.backgroundColor = 'red'");
+    Scaffold.of(context).showSnackBar(
+      SnackBar(
+        content: Text('JavaScript evaluated, the result is: $result'),
+      ),
     );
   }
 }
diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m
index 981b19335e2f..7f30ad31bdec 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.m
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m
@@ -51,7 +51,7 @@ - (instancetype)initWithFrame:(CGRect)frame
     NSDictionary<NSString*, id>* settings = args[@"settings"];
     [self applySettings:settings];
     NSString* initialUrl = args[@"initialUrl"];
-    if (initialUrl && initialUrl != [NSNull null]) {
+    if (initialUrl && ![initialUrl isKindOfClass:[NSNull class]]) {
       [self loadUrl:initialUrl];
     }
   }
@@ -79,6 +79,8 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     [self onReload:call result:result];
   } else if ([[call method] isEqualToString:@"currentUrl"]) {
     [self onCurrentUrl:call result:result];
+  } else if ([[call method] isEqualToString:@"evaluateJavascript"]) {
+    [self onEvaluateJavaScript:call result:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -130,6 +132,28 @@ - (void)onCurrentUrl:(FlutterMethodCall*)call result:(FlutterResult)result {
   result(_currentUrl);
 }
 
+- (void)onEvaluateJavaScript:(FlutterMethodCall*)call result:(FlutterResult)result {
+  NSString* jsString = [call arguments];
+  if (!jsString) {
+    result([FlutterError errorWithCode:@"evaluateJavaScript_failed"
+                               message:@"JavaScript String cannot be null"
+                               details:nil]);
+    return;
+  }
+  [_webView evaluateJavaScript:jsString
+             completionHandler:^(_Nullable id evaluateResult, NSError* _Nullable error) {
+               if (error) {
+                 result([FlutterError
+                     errorWithCode:@"evaluateJavaScript_failed"
+                           message:@"Failed evaluating JavaScript"
+                           details:[NSString stringWithFormat:@"JavaScript string was: '%@'\n%@",
+                                                              jsString, error]]);
+               } else {
+                 result([NSString stringWithFormat:@"%@", evaluateResult]);
+               }
+             }];
+}
+
 - (void)applySettings:(NSDictionary<NSString*, id>*)settings {
   for (NSString* key in settings) {
     if ([key isEqualToString:@"jsMode"]) {
@@ -151,7 +175,7 @@ - (void)updateJsMode:(NSNumber*)mode {
       [preferences setJavaScriptEnabled:YES];
       break;
     default:
-      NSLog(@"webview_flutter: unknown javascript mode: %@", mode);
+      NSLog(@"webview_flutter: unknown JavaScript mode: %@", mode);
   }
 }
 
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index ade85813c0e5..53862924e797 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -11,7 +11,7 @@ import 'package:flutter/widgets.dart';
 
 typedef void WebViewCreatedCallback(WebViewController controller);
 
-enum JavaScriptMode {
+enum JavascriptMode {
   /// JavaScript execution is disabled.
   disabled,
 
@@ -26,14 +26,14 @@ class WebView extends StatefulWidget {
   /// The web view can be controlled using a `WebViewController` that is passed to the
   /// `onWebViewCreated` callback once the web view is created.
   ///
-  /// The `javaScriptMode` parameter must not be null.
+  /// The `javascriptMode` parameter must not be null.
   const WebView({
     Key key,
     this.onWebViewCreated,
     this.initialUrl,
-    this.javaScriptMode = JavaScriptMode.disabled,
+    this.javascriptMode = JavascriptMode.disabled,
     this.gestureRecognizers,
-  })  : assert(javaScriptMode != null),
+  })  : assert(javascriptMode != null),
         super(key: key);
 
   /// If not null invoked once the web view is created.
@@ -53,8 +53,8 @@ class WebView extends StatefulWidget {
   /// The initial URL to load.
   final String initialUrl;
 
-  /// Whether JavaScript execution is enabled.
-  final JavaScriptMode javaScriptMode;
+  /// Whether Javascript execution is enabled.
+  final JavascriptMode javascriptMode;
 
   @override
   State<StatefulWidget> createState() => _WebViewState();
@@ -103,32 +103,21 @@ class _WebViewState extends State<WebView> {
         '$defaultTargetPlatform is not yet supported by the webview_flutter plugin');
   }
 
-  @override
-  void initState() {
-    super.initState();
-    _settings = _WebSettings.fromWidget(widget);
-  }
-
   @override
   void didUpdateWidget(WebView oldWidget) {
     super.didUpdateWidget(oldWidget);
-    final _WebSettings newSettings = _WebSettings.fromWidget(widget);
-    final Map<String, dynamic> settingsUpdate =
-        _settings.updatesMap(newSettings);
-    _updateSettings(settingsUpdate);
-    _settings = newSettings;
+    _updateSettings(_WebSettings.fromWidget(widget));
   }
 
-  Future<void> _updateSettings(Map<String, dynamic> update) async {
-    if (update == null) {
-      return;
-    }
+  Future<void> _updateSettings(_WebSettings settings) async {
+    _settings = settings;
     final WebViewController controller = await _controller.future;
-    controller._updateSettings(update);
+    controller._updateSettings(settings);
   }
 
   void _onPlatformViewCreated(int id) {
-    final WebViewController controller = WebViewController._(id);
+    final WebViewController controller =
+        WebViewController._(id, _WebSettings.fromWidget(widget));
     _controller.complete(controller);
     if (widget.onWebViewCreated != null) {
       widget.onWebViewCreated(controller);
@@ -159,27 +148,27 @@ class _CreationParams {
 
 class _WebSettings {
   _WebSettings({
-    this.javaScriptMode,
+    this.javascriptMode,
   });
 
   static _WebSettings fromWidget(WebView widget) {
-    return _WebSettings(javaScriptMode: widget.javaScriptMode);
+    return _WebSettings(javascriptMode: widget.javascriptMode);
   }
 
-  final JavaScriptMode javaScriptMode;
+  final JavascriptMode javascriptMode;
 
   Map<String, dynamic> toMap() {
     return <String, dynamic>{
-      'jsMode': javaScriptMode.index,
+      'jsMode': javascriptMode.index,
     };
   }
 
   Map<String, dynamic> updatesMap(_WebSettings newSettings) {
-    if (javaScriptMode == newSettings.javaScriptMode) {
+    if (javascriptMode == newSettings.javascriptMode) {
       return null;
     }
     return <String, dynamic>{
-      'jsMode': newSettings.javaScriptMode.index,
+      'jsMode': newSettings.javascriptMode.index,
     };
   }
 }
@@ -189,11 +178,14 @@ class _WebSettings {
 /// A [WebViewController] instance can be obtained by setting the [WebView.onWebViewCreated]
 /// callback for a [WebView] widget.
 class WebViewController {
-  WebViewController._(int id)
-      : _channel = MethodChannel('plugins.flutter.io/webview_$id');
+  WebViewController._(int id, _WebSettings settings)
+      : _channel = MethodChannel('plugins.flutter.io/webview_$id'),
+        _settings = settings;
 
   final MethodChannel _channel;
 
+  _WebSettings _settings;
+
   /// Loads the specified URL.
   ///
   /// `url` must not be null.
@@ -254,8 +246,38 @@ class WebViewController {
     return _channel.invokeMethod("reload");
   }
 
-  Future<void> _updateSettings(Map<String, dynamic> update) async {
-    return _channel.invokeMethod('updateSettings', update);
+  Future<void> _updateSettings(_WebSettings setting) async {
+    final Map<String, dynamic> updateMap = _settings.updatesMap(setting);
+    if (updateMap == null) {
+      return null;
+    }
+    _settings = setting;
+    return _channel.invokeMethod('updateSettings', updateMap);
+  }
+
+  /// Evaluates a JavaScript expression in the context of the current page.
+  ///
+  /// On Android returns the evaluation result as a JSON formatted string.
+  ///
+  /// On iOS depending on the value type the return value would be one of:
+  ///
+  ///  - For primitive JavaScript types: the value string formatted (e.g JavaScript 100 returns '100').
+  ///  - For JavaScript arrays of supported types: a string formatted NSArray(e.g '(1,2,3), note that the string for NSArray is formatted and might contain newlines and extra spaces.').
+  ///  - Other non-primitive types are not supported on iOS and will complete the Future with an error.
+  ///
+  /// The Future completes with an error if a JavaScript error occurred, or on iOS, if the type of the
+  /// evaluated expression is not supported as described above.
+  Future<String> evaluateJavascript(String javascriptString) async {
+    if (_settings.javascriptMode == JavascriptMode.disabled) {
+      throw FlutterError(
+          'JavaScript mode must be enabled/unrestricted when calling evaluateJavascript.');
+    }
+    if (javascriptString == null) {
+      throw ArgumentError('The argument javascriptString must not be null. ');
+    }
+    final String result =
+        await _channel.invokeMethod('evaluateJavascript', javascriptString);
+    return result;
   }
 }
 
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 45418b4f0332..71d026d49af9 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.1.2
+version: 0.2.0
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 
diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart
index d83017ab05ad..ae286bf5118e 100644
--- a/packages/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/test/webview_flutter_test.dart
@@ -40,23 +40,23 @@ void main() {
     expect(await controller.currentUrl(), 'https://youtube.com');
   });
 
-  testWidgets('JavaScript mode', (WidgetTester tester) async {
+  testWidgets('Javascript mode', (WidgetTester tester) async {
     await tester.pumpWidget(const WebView(
       initialUrl: 'https://youtube.com',
-      javaScriptMode: JavaScriptMode.unrestricted,
+      javascriptMode: JavascriptMode.unrestricted,
     ));
 
     final FakePlatformWebView platformWebView =
         fakePlatformViewsController.lastCreatedView;
 
-    expect(platformWebView.javaScriptMode, JavaScriptMode.unrestricted);
+    expect(platformWebView.javascriptMode, JavascriptMode.unrestricted);
 
     await tester.pumpWidget(const WebView(
       initialUrl: 'https://youtube.com',
-      javaScriptMode: JavaScriptMode.disabled,
+      javascriptMode: JavascriptMode.disabled,
     ));
 
-    expect(platformWebView.javaScriptMode, JavaScriptMode.disabled);
+    expect(platformWebView.javascriptMode, JavascriptMode.disabled);
   });
 
   testWidgets('Load url', (WidgetTester tester) async {
@@ -311,6 +311,48 @@ void main() {
 
     expect(platformWebView.amountOfReloadsOnCurrentUrl, 0);
   });
+
+  testWidgets('evaluate Javascript', (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://flutter.io',
+        javascriptMode: JavascriptMode.unrestricted,
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+    expect(
+        await controller.evaluateJavascript("fake js string"), "fake js string",
+        reason: 'should get the argument');
+    expect(
+      () => controller.evaluateJavascript(null),
+      throwsA(anything),
+    );
+  });
+
+  testWidgets('evaluate Javascript with JavascriptMode disabled',
+      (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://flutter.io',
+        javascriptMode: JavascriptMode.disabled,
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+    expect(
+      () => controller.evaluateJavascript('fake js string'),
+      throwsA(anything),
+    );
+    expect(
+      () => controller.evaluateJavascript(null),
+      throwsA(anything),
+    );
+  });
 }
 
 class FakePlatformWebView {
@@ -321,7 +363,7 @@ class FakePlatformWebView {
         history.add(initialUrl);
         currentPosition++;
       }
-      javaScriptMode = JavaScriptMode.values[params['settings']['jsMode']];
+      javascriptMode = JavascriptMode.values[params['settings']['jsMode']];
     }
     channel = MethodChannel(
         'plugins.flutter.io/webview_$id', const StandardMethodCodec());
@@ -335,7 +377,7 @@ class FakePlatformWebView {
   int amountOfReloadsOnCurrentUrl = 0;
 
   String get currentUrl => history.isEmpty ? null : history[currentPosition];
-  JavaScriptMode javaScriptMode;
+  JavascriptMode javascriptMode;
 
   Future<dynamic> onMethodCall(MethodCall call) {
     switch (call.method) {
@@ -350,7 +392,7 @@ class FakePlatformWebView {
         if (call.arguments['jsMode'] == null) {
           break;
         }
-        javaScriptMode = JavaScriptMode.values[call.arguments['jsMode']];
+        javascriptMode = JavascriptMode.values[call.arguments['jsMode']];
         break;
       case 'canGoBack':
         return Future<bool>.sync(() => currentPosition > 0);
@@ -372,6 +414,8 @@ class FakePlatformWebView {
       case 'currentUrl':
         return Future<String>.value(currentUrl);
         break;
+      case 'evaluateJavascript':
+        return Future<dynamic>.value(call.arguments);
     }
     return Future<void>.sync(() {});
   }

From e46ff9460c53c5f9cef363cc04ce7edafd9e37bf Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@users.noreply.github.com>
Date: Sat, 5 Jan 2019 17:02:09 -0800
Subject: [PATCH 048/410] Rev version to publish 0.3.1 to pub (#1040)

---
 packages/local_auth/CHANGELOG.md | 3 +++
 packages/local_auth/pubspec.yaml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/local_auth/CHANGELOG.md b/packages/local_auth/CHANGELOG.md
index e1612f945e07..2710912b3faa 100644
--- a/packages/local_auth/CHANGELOG.md
+++ b/packages/local_auth/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.3.1
+* Fix crash on Android versions earlier than 24.
+
 ## 0.3.0
 
 * **Breaking change**. Add canCheckBiometrics and getAvailableBiometrics which leads to a new API.
diff --git a/packages/local_auth/pubspec.yaml b/packages/local_auth/pubspec.yaml
index fc5277bf4fa1..33e2a807ab35 100644
--- a/packages/local_auth/pubspec.yaml
+++ b/packages/local_auth/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Android and iOS device authentication sensors
   such as Fingerprint Reader and Touch ID.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/local_auth
-version: 0.3.0
+version: 0.3.1
 
 flutter:
   plugin:

From fe834b67ff868bf1a992068c560fd98f460b7ff7 Mon Sep 17 00:00:00 2001
From: Michael Thomsen <mit-mit@users.noreply.github.com>
Date: Sun, 6 Jan 2019 13:36:36 +0100
Subject: [PATCH 049/410] Remove comments from license file (#1034)

The comments are preventing GitHub's license detection from working (see https://github.com/flutter/packages/blob/master/LICENSE as an example where it's working)
---
 LICENSE | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/LICENSE b/LICENSE
index 000b4618d2bd..7b995420294b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,27 +1,27 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+Copyright 2017 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

From 809ccde7896911f0fd9c4febabbf4ab3989fee0d Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Mon, 7 Jan 2019 11:36:40 -0800
Subject: [PATCH 050/410] Doc and build script updates to the IAP plugin
 (#1024)

Updates the example app README with all the steps required for enabling
the IAP APIs in Google Play and the App Store. Also adds a bit to the
plugin's generic README.

Changes the example app's android build script so that it requires the
package ID to be changed and signing keys added in order for it to be
ran. Users will need to set up their own package ID and signing keys for
the example app to work with `BillingClient`. Also adds `StoreKit` and
enables in app purchases to the XCode project.

flutter/flutter#25987
---
 .gitignore                                    |  2 +
 packages/in_app_purchase/README.md            | 29 ++++++-
 packages/in_app_purchase/android/build.gradle |  4 +
 packages/in_app_purchase/example/README.md    | 85 ++++++++++++++++++-
 .../example/android/app/build.gradle          | 69 +++++++++++++--
 .../ios/Runner.xcodeproj/project.pbxproj      |  9 ++
 .../example/keystore.example.properties       |  4 +
 7 files changed, 190 insertions(+), 12 deletions(-)
 create mode 100644 packages/in_app_purchase/example/keystore.example.properties

diff --git a/.gitignore b/.gitignore
index 73ee12395d8a..e89cf1187f48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ ServiceDefinitions.json
 xcuserdata/
 
 local.properties
+keystore.properties
 .gradle/
 gradlew
 gradlew.bat
@@ -31,3 +32,4 @@ GeneratedPluginRegistrant.m
 GeneratedPluginRegistrant.java
 build/
 .flutter-plugins
+
diff --git a/packages/in_app_purchase/README.md b/packages/in_app_purchase/README.md
index 826c24146c16..30ca2bdead57 100644
--- a/packages/in_app_purchase/README.md
+++ b/packages/in_app_purchase/README.md
@@ -1,5 +1,32 @@
 # In App Purchase
 
+A Flutter plugin for in-app purchases.
+
+## Getting Started
+
 This plugin is not ready to be used yet. Follow
 [flutter/flutter#9591](https://github.com/flutter/flutter/issues/9591) for more
-updates.
\ No newline at end of file
+updates.
+
+There's a significant amount of setup required for testing in app purchases
+successfully, including registering new app IDs and store entries to use for
+testing in both the Play Developer Console and App Store Connect. Both Google
+Play and the App Store require developers to configure an app with in-app items
+for purchase to call their in-app-purchase APIs. You can check out the [example
+app](example/README.md) for an example on configuring both.
+
+## Design
+
+The API surface is stacked into 2 main layers.
+
+1. [in_app_purchase.dart](lib/in_app_purchase.dart), the generic idiommatic
+   Flutter API. This exposes the most basic IAP-related functionality. The goal
+   is that Flutter apps should be able to use this API surface on its own for
+   the vast majority of cases.
+
+2. The dart wrappers around the platform specific IAP APIs and their platform
+   specific implementations of the generic interface. See
+   [google_play.dart](lib/google_play.dart) and
+   [app_store.dart](lib/app_store.dart). These API surfaces should expose all
+   the platform-specific behavior and allow for more fine-tuned control when
+   needed.
diff --git a/packages/in_app_purchase/android/build.gradle b/packages/in_app_purchase/android/build.gradle
index 4252427e4485..1c5afd35a3fb 100644
--- a/packages/in_app_purchase/android/build.gradle
+++ b/packages/in_app_purchase/android/build.gradle
@@ -32,3 +32,7 @@ android {
         disable 'InvalidPackage'
     }
 }
+
+dependencies {
+    implementation 'com.android.billingclient:billing:1.2'
+}
diff --git a/packages/in_app_purchase/example/README.md b/packages/in_app_purchase/example/README.md
index 72cfe4f2d990..4c21b987b627 100644
--- a/packages/in_app_purchase/example/README.md
+++ b/packages/in_app_purchase/example/README.md
@@ -1,8 +1,85 @@
-# in_app_purchase_example
+# In App Purchase Example
 
-Demonstrates how to use the in_app_purchase plugin.
+Demonstrates how to use the In App Purchase (IAP) Plugin.
 
 ## Getting Started
 
-For help getting started with Flutter, view our online
-[documentation](https://flutter.io/).
+WARNING: This plugin and example are not ready to be used. Right now the example
+app doesn't actually demonstrate any IAP functionality yet. Follow
+[flutter/flutter#9591](https://github.com/flutter/flutter/issues/9591) for more
+updates.
+
+There's a significant amount of setup required for testing in app purchases
+successfully, including registering new app IDs and store entries to use for
+testing in both the Play Developer Console and App Store Connect. Both Google
+Play and the App Store require developers to configure an app with in-app items
+for purchase to call their in-app-purchase APIs.
+
+### Android
+
+1. Create a new app in the [Play Developer
+   Console](https://play.google.com/apps/publish/) (PDC).
+
+2. Sign up for a merchant's account in the PDC.
+
+3. Create IAPs in the PDC available for purchase in the app. The example assumes
+   the following SKU IDs exist:
+
+   - `consumable`: A managed product.
+   - `upgrade`: A managed product.
+   - `subscription`: A subscription.
+
+   Make sure that all of the products are set to `ACTIVE`.
+
+4. Update `APP_ID` in `example/android/app/build.gradle` to match your package
+   ID in the PDC.
+
+5. Create an `example/android/keystore.properties` file with all your signing
+   information. `keystore.example.properties` exists as an example to follow.
+   It's impossible to use any of the `BillingClient` APIs from an unsigned APK.
+   See
+   [here](https://developer.android.com/studio/publish/app-signing#secure-shared-keystore)
+   and [here](https://developer.android.com/studio/publish/app-signing#sign-apk)
+   for more information.
+
+6. Build a signed apk. `flutter build apk` will work for this, the gradle files
+   in this project have been configured to sign even debug builds.
+
+7. Upload the signed APK from step 6 to the PDC, and publish that to the alpha
+   test channel. Add your test account as an approved tester. The
+   `BillingClient` APIs won't work unless the app has been fully published to
+   the alpha channel and is being used by an authorized test account. See
+   [here](https://support.google.com/googleplay/android-developer/answer/3131213)
+   for more info.
+
+8. Sign in to the test device with the test account from step #7. Then use
+   `flutter run` to install the app to the device and test like normal.
+
+### iOS
+
+1. Follow ["Workflow for configuring in-app
+   purchases"](https://help.apple.com/app-store-connect/#/devb57be10e7), a
+   detailed guide on all the steps needed to enable IAPs for an app. Complete
+   steps 1 ("Sign a Paid Applications Agreement") and 2 ("Configure in-app
+   purchases").
+
+   For step #2, "Configure in-app purchases in App Store Connect," you'll want
+   to create the following products:
+
+   - A consumable with product ID `consumable`
+   - An upgrade with product ID `upgrade`
+   - An auto-renewing subscription with product ID `subscription`
+
+2. In XCode, `File > Open File` `example/ios/Runner.xcworkspace`. Update the
+   Bundle ID to match the Bundle ID of the app created in step #1.
+
+3. [Create a Sandbox tester
+   account](https://help.apple.com/app-store-connect/#/dev8b997bee1) to test the
+   in-app purchases with.
+
+4. Use `flutter run` to install the app and test it. Note that you need to test
+   it on a real device instead of a simulator, and signing into any production
+   service (including iTunes!) with the test account will permanently invalidate
+   it. Sign in to the test account in the example app following the steps in the
+   [*In-App Purchase Programming
+   Guide*](https://developer.apple.com/library/archive/documentation/NetworkingInternet/Conceptual/StoreKitGuide/Chapters/ShowUI.html#//apple_ref/doc/uid/TP40008267-CH3-SW11).
\ No newline at end of file
diff --git a/packages/in_app_purchase/example/android/app/build.gradle b/packages/in_app_purchase/example/android/app/build.gradle
index 11eb3dd9798e..7e1672b876fc 100644
--- a/packages/in_app_purchase/example/android/app/build.gradle
+++ b/packages/in_app_purchase/example/android/app/build.gradle
@@ -6,6 +6,43 @@ if (localPropertiesFile.exists()) {
     }
 }
 
+// Load the build signing secrets from a local `keystore.properties` file.
+// TODO(YOU): Create release keys and a `keystore.properties` file. See
+// `example/README.md` for more info and `keystore.example.properties` for an
+// example.
+def keystorePropertiesFile = rootProject.file("keystore.properties")
+def keystoreProperties = new Properties()
+def configured = true
+try {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+} catch (IOException e) {
+    configured = false
+    logger.error('Release signing information not found.')
+}
+
+project.ext {
+    // TODO(YOU): Set this to match your package ID in the Play Developer Console (see example/README.md).
+    APP_ID = "io.flutter.plugins.inapppurchaseexample.DEFAULT_DO_NOT_USE"
+    KEYSTORE_STORE_FILE = configured ? rootProject.file(keystoreProperties['storeFile']) : null
+    KEYSTORE_STORE_PASSWORD = keystoreProperties['storePassword']
+    KEYSTORE_KEY_ALIAS = keystoreProperties['keyAlias']
+    KEYSTORE_KEY_PASSWORD = keystoreProperties['keyPassword']
+    VERSION_CODE = 1
+    VERSION_NAME = "0.1"
+}
+
+if (project.APP_ID == "io.flutter.plugins.inapppurchaseexample.DEFAULT_DO_NOT_USE") {
+    configured = false
+    logger.error('Unique package name not set, defaulting to "io.flutter.plugins.inapppurchaseexample.DEFAULT_DO_NOT_USE".')
+}
+
+// Log a final error message if we're unable to create a release key signed
+// build for an app configured in the Play Developer Console. Apks built in this
+// condition won't be able to call any of the BillingClient APIs.
+if (!configured) {
+    logger.error('The app could not be configured for release signing. In app purchases will not be testable. See `example/README.md` for more info and instructions.')
+}
+
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
@@ -15,6 +52,15 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
+    signingConfigs {
+        release {
+            storeFile project.KEYSTORE_STORE_FILE
+            storePassword project.KEYSTORE_STORE_PASSWORD
+            keyAlias project.KEYSTORE_KEY_ALIAS
+            keyPassword project.KEYSTORE_KEY_PASSWORD
+        }
+    }
+
     compileSdkVersion 27
 
     lintOptions {
@@ -22,20 +68,29 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "io.flutter.plugins.inapppurchaseexample"
+        applicationId project.APP_ID
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
+        versionCode Integer.valueOf(VERSION_CODE)
+        versionName VERSION_NAME
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
+        // Google Play Billing APIs only work with apps signed for production.
+        debug {
+            if (configured) {
+                signingConfig signingConfigs.release
+            } else {
+                signingConfig signingConfigs.debug
+            }
+        }
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            if (configured) {
+                signingConfig signingConfigs.release
+            } else {
+                signingConfig signingConfigs.debug
+            }
         }
     }
 }
diff --git a/packages/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj b/packages/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj
index 868b8889c7d8..0feca7ca869d 100644
--- a/packages/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj
@@ -22,6 +22,7 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		A5279298219369C600FF69E6 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5279297219369C600FF69E6 /* StoreKit.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -57,6 +58,7 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		A5279297219369C600FF69E6 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 		B2AB6BE1D4E2232AB5D4A002 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -68,6 +70,7 @@
 				9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
 				3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
 				861D0D93B0757D95C8A69620 /* libPods-Runner.a in Frameworks */,
+				A5279298219369C600FF69E6 /* StoreKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -141,6 +144,7 @@
 		E4DB99639FAD8ADED6B572FC /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				A5279297219369C600FF69E6 /* StoreKit.framework */,
 				B2AB6BE1D4E2232AB5D4A002 /* libPods-Runner.a */,
 			);
 			name = Frameworks;
@@ -182,6 +186,11 @@
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
+						SystemCapabilities = {
+							com.apple.InAppPurchase = {
+								enabled = 1;
+							};
+						};
 					};
 				};
 			};
diff --git a/packages/in_app_purchase/example/keystore.example.properties b/packages/in_app_purchase/example/keystore.example.properties
new file mode 100644
index 000000000000..07be54f3118e
--- /dev/null
+++ b/packages/in_app_purchase/example/keystore.example.properties
@@ -0,0 +1,4 @@
+storePassword=???
+keyPassword=???
+keyAlias=???
+storeFile=???
\ No newline at end of file

From ad53210a693015ff45961a9eec5a773f80cd573a Mon Sep 17 00:00:00 2001
From: Matan Lurey <matanlurey@users.noreply.github.com>
Date: Mon, 7 Jan 2019 13:25:32 -0800
Subject: [PATCH 051/410] Remove scary message (#1042)

... from the `README.md` that applied to 4-5 updates ago, only.
---
 packages/cloud_firestore/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/cloud_firestore/README.md b/packages/cloud_firestore/README.md
index bfaba2d0fdf9..d0d10d036914 100755
--- a/packages/cloud_firestore/README.md
+++ b/packages/cloud_firestore/README.md
@@ -8,8 +8,6 @@ For Flutter plugins for other Firebase products, see [FlutterFire.md](https://gi
 
 *Note*: This plugin is still under development, and some APIs might not be available yet. [Feedback](https://github.com/flutter/flutter/issues) and [Pull Requests](https://github.com/flutter/plugins/pulls) are most welcome!
 
-Recent versions (0.3.x and 0.4.x) of this plugin require [extensible codec functionality](https://github.com/flutter/flutter/pull/15414) that is not yet released to the [beta channel](https://github.com/flutter/flutter/wiki/Flutter-build-release-channels) of Flutter. If you're encountering issues using those versions, consider switching to the dev channel.
-
 ## Setup
 
 To use this plugin:

From aa7ea2b5e232cadecbc65dca150a52eea2ede2d7 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Mon, 7 Jan 2019 15:17:08 -0800
Subject: [PATCH 052/410] Save photo orientation on iOS (#1037)

This patch works by calculating the device's physical orientation from
accelerometer data. This is a tricky approach and I'd rather avoid it,
but it looks like a necessary evil based on a few reasons.

1. The specific callback we're registering doesn't give us any EXIF data
   or data on the photo's orientation.
   https://developer.apple.com/documentation/avfoundation/avcapturephotocapturedelegate/1778647-captureoutput?language=objc
2. There is a better callback to use that does give us this data, but
   it's only supported on ios 11.0+ and the camera plugin supports
   10.0+.
   https://developer.apple.com/documentation/avfoundation/avcapturephotocapturedelegate/2873949-captureoutput?language=objc
3. There's a straightforward iOS API that's supposed to give the
   physical device orientation that would normally be perfect for this,
   but it doesn't work when the UI is locked to portrait mode.
   https://developer.apple.com/documentation/uikit/uidevice/1620053-orientation?language=objc
   We've had Android issues in the past based on the Android API we used
   having this same limitation.

fixes flutter/flutter#16587
---
 packages/camera/CHANGELOG.md               |  4 ++
 packages/camera/ios/Classes/CameraPlugin.m | 63 +++++++++++++++++++---
 packages/camera/pubspec.yaml               |  2 +-
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 314ed79ee969..1a43927c8d59 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.9
+
+* Save photo orientation data on iOS.
+
 ## 0.2.8
 
 * Add access to the image stream from Dart.
diff --git a/packages/camera/ios/Classes/CameraPlugin.m b/packages/camera/ios/Classes/CameraPlugin.m
index 79e6e343ed91..10e7c54e1a58 100644
--- a/packages/camera/ios/Classes/CameraPlugin.m
+++ b/packages/camera/ios/Classes/CameraPlugin.m
@@ -1,6 +1,7 @@
 #import "CameraPlugin.h"
 #import <AVFoundation/AVFoundation.h>
 #import <Accelerate/Accelerate.h>
+#import <CoreMotion/CoreMotion.h>
 #import <libkern/OSAtomic.h>
 
 @interface NSError (FlutterError)
@@ -18,8 +19,13 @@ - (FlutterError *)flutterError {
 @interface FLTSavePhotoDelegate : NSObject <AVCapturePhotoCaptureDelegate>
 @property(readonly, nonatomic) NSString *path;
 @property(readonly, nonatomic) FlutterResult result;
+@property(readonly, nonatomic) CMMotionManager *motionManager;
+@property(readonly, nonatomic) AVCaptureDevicePosition cameraPosition;
 
-- initWithPath:(NSString *)filename result:(FlutterResult)result;
+- initWithPath:(NSString *)filename
+            result:(FlutterResult)result
+     motionManager:(CMMotionManager *)motionManager
+    cameraPosition:(AVCaptureDevicePosition)cameraPosition;
 @end
 
 @interface FLTImageStreamHandler : NSObject <FlutterStreamHandler>
@@ -45,11 +51,16 @@ @implementation FLTSavePhotoDelegate {
   FLTSavePhotoDelegate *selfReference;
 }
 
-- initWithPath:(NSString *)path result:(FlutterResult)result {
+- initWithPath:(NSString *)path
+            result:(FlutterResult)result
+     motionManager:(CMMotionManager *)motionManager
+    cameraPosition:(AVCaptureDevicePosition)cameraPosition {
   self = [super init];
   NSAssert(self, @"super init cannot be nil");
   _path = path;
   _result = result;
+  _motionManager = motionManager;
+  _cameraPosition = cameraPosition;
   selfReference = self;
   return self;
 }
@@ -68,14 +79,46 @@ - (void)captureOutput:(AVCapturePhotoOutput *)output
   NSData *data = [AVCapturePhotoOutput
       JPEGPhotoDataRepresentationForJPEGSampleBuffer:photoSampleBuffer
                             previewPhotoSampleBuffer:previewPhotoSampleBuffer];
+  UIImage *image = [UIImage imageWithCGImage:[UIImage imageWithData:data].CGImage
+                                       scale:1.0
+                                 orientation:[self getImageRotation]];
   // TODO(sigurdm): Consider writing file asynchronously.
-  bool success = [data writeToFile:_path atomically:YES];
+  bool success = [UIImageJPEGRepresentation(image, 1.0) writeToFile:_path atomically:YES];
   if (!success) {
     _result([FlutterError errorWithCode:@"IOError" message:@"Unable to write file" details:nil]);
     return;
   }
   _result(nil);
 }
+
+- (UIImageOrientation)getImageRotation {
+  // Get the true device orientation out of the accelerometer.
+  const CMQuaternion orientation = _motionManager.deviceMotion.attitude.quaternion;
+  const double roll =
+      atan2(2 * (orientation.w * orientation.x + orientation.y * orientation.z),
+            1 - (2 * (orientation.x * orientation.x + orientation.y * orientation.y)));
+  const double pitch = asin(2 * (orientation.w * orientation.y - orientation.z * orientation.x));
+  const bool vertical = fabs(pitch) <= M_PI_4;
+  const bool pointedRight = pitch >= 0;
+  const bool tiltedUp = roll >= 0;
+  // Pixel input defaults to horizontal pointed left, as if the phone was held
+  // with the home button on the right. Rotate the photo accordingly based on
+  // the orientation the photo should really be displayed as. To make this
+  // extra confusing, the landscape orientations also need to be mirrored
+  // based on whether they were taken with the front facing camera.
+  if (vertical && tiltedUp) {              // [^]
+    return UIImageOrientationRight;        // rotate existing image 90* cw
+  } else if (vertical && !tiltedUp) {      // [v]
+    return UIImageOrientationLeft;         // rotate existing image 90* ccw
+  } else if (!vertical && pointedRight) {  // [>]
+    return _cameraPosition == AVCaptureDevicePositionBack ? UIImageOrientationDown /*rotate 180* */
+                                                          : UIImageOrientationUp /*do not rotate*/;
+  } else if (!vertical && !pointedRight) {  // [<]
+    return _cameraPosition == AVCaptureDevicePositionBack ? UIImageOrientationUp
+                                                          : UIImageOrientationDown;
+  }
+  return UIImageOrientationUp;
+}
 @end
 
 @interface FLTCam : NSObject <FlutterTexture,
@@ -106,6 +149,7 @@ @interface FLTCam : NSObject <FlutterTexture,
 @property(assign, nonatomic) BOOL isStreamingImages;
 @property(nonatomic) vImage_Buffer destinationBuffer;
 @property(nonatomic) vImage_Buffer conversionBuffer;
+@property(nonatomic) CMMotionManager *motionManager;
 - (instancetype)initWithCameraName:(NSString *)cameraName
                   resolutionPreset:(NSString *)resolutionPreset
                              error:(NSError **)error;
@@ -177,6 +221,9 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
   _capturePhotoOutput = [AVCapturePhotoOutput new];
   [_capturePhotoOutput setHighResolutionCaptureEnabled:YES];
   [_captureSession addOutput:_capturePhotoOutput];
+  _motionManager = [[CMMotionManager alloc] init];
+  [_motionManager startDeviceMotionUpdatesUsingReferenceFrame:
+                      CMAttitudeReferenceFrameXArbitraryCorrectedZVertical];
   return self;
 }
 
@@ -191,9 +238,12 @@ - (void)stop {
 - (void)captureToFile:(NSString *)path result:(FlutterResult)result {
   AVCapturePhotoSettings *settings = [AVCapturePhotoSettings photoSettings];
   [settings setHighResolutionPhotoEnabled:YES];
-  [_capturePhotoOutput capturePhotoWithSettings:settings
-                                       delegate:[[FLTSavePhotoDelegate alloc] initWithPath:path
-                                                                                    result:result]];
+  [_capturePhotoOutput
+      capturePhotoWithSettings:settings
+                      delegate:[[FLTSavePhotoDelegate alloc] initWithPath:path
+                                                                   result:result
+                                                            motionManager:_motionManager
+                                                           cameraPosition:_captureDevice.position]];
 }
 
 - (void)captureOutput:(AVCaptureOutput *)output
@@ -337,6 +387,7 @@ - (void)dealloc {
   if (_latestPixelBuffer) {
     CFRelease(_latestPixelBuffer);
   }
+  [_motionManager stopDeviceMotionUpdates];
 }
 
 - (CVPixelBufferRef)copyPixelBuffer {
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index bd029dd59b47..00588a48a3f9 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -1,7 +1,7 @@
 name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed and capturing images.
-version: 0.2.8
+version: 0.2.9
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From 61d6a1f63ba9b5c698c8a2c907f8c976f8cb6960 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Wed, 9 Jan 2019 15:33:24 -0800
Subject: [PATCH 053/410] Fix image picker crash on IOS (#1051)

Fix ImagePicker Crash on IOS by checking safe guarding _result to be not nil.

The method dismissViewControllerAnimated does not immediately prevent further
didFinishPickingMediaWithInfo invocations. So the code in the delegate method get triggered multiple times if user taps multiple times.

The crash is caused because the _result block is nil and gets called again. By safe guarding it, the code will only be triggered once and will not cause crash.

Another way to fix the crash would be put the code handling selection inside the completion handler inside the dismissViewControllerAnimated:completion method. This will cause a bit delay on user experience since the completion handler is called after dismissing view controller animation finishes. So the fix provided in this PR is favored.
---
 packages/image_picker/CHANGELOG.md                    | 4 ++++
 packages/image_picker/ios/Classes/ImagePickerPlugin.m | 7 ++++++-
 packages/image_picker/pubspec.yaml                    | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 57b6373145af..083eab595441 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.12
+
+* Fix a crash when user tap the image mutiple times.
+
 ## 0.4.11
 
 * Use `api` to define `support-v4` dependency to allow automatic version resolution.
diff --git a/packages/image_picker/ios/Classes/ImagePickerPlugin.m b/packages/image_picker/ios/Classes/ImagePickerPlugin.m
index 44e736948c66..ea7ee2cf1ee0 100644
--- a/packages/image_picker/ios/Classes/ImagePickerPlugin.m
+++ b/packages/image_picker/ios/Classes/ImagePickerPlugin.m
@@ -129,7 +129,12 @@ - (void)imagePickerController:(UIImagePickerController *)picker
   NSURL *videoURL = [info objectForKey:UIImagePickerControllerMediaURL];
   UIImage *image = [info objectForKey:UIImagePickerControllerEditedImage];
   [_imagePickerController dismissViewControllerAnimated:YES completion:nil];
-
+  // The method dismissViewControllerAnimated does not immediately prevent further
+  // didFinishPickingMediaWithInfo invocations. A nil check is necessary to prevent below code to
+  // be unwantly executed multiple times and cause a crash.
+  if (!_result) {
+    return;
+  }
   if (videoURL != nil) {
     NSData *data = [NSData dataWithContentsOfURL:videoURL];
     NSString *guid = [[NSProcessInfo processInfo] globallyUniqueString];
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index c6f80b401091..615c46f5c1f5 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.4.11
+version: 0.4.12
 
 flutter:
   plugin:

From 74ef78736ca06dd6f1568c58873d269790b64f0a Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Wed, 9 Jan 2019 20:31:50 -0800
Subject: [PATCH 054/410] Update dart doc for forceSafariVC for the usage of
 universal links on iOS (#1058)

Update dart document to explain forceSafariVC flag regarding universal link on IOS

There are numbers of users having problem on launch universal links on iOS.
It is most likely due to the unawareness of forceSafariVC is true by default and safariVC will not handle universal links.
---
 packages/url_launcher/lib/url_launcher.dart | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/url_launcher/lib/url_launcher.dart b/packages/url_launcher/lib/url_launcher.dart
index 0aedb201e2e0..420ad09e0feb 100644
--- a/packages/url_launcher/lib/url_launcher.dart
+++ b/packages/url_launcher/lib/url_launcher.dart
@@ -20,9 +20,10 @@ const MethodChannel _channel = MethodChannel('plugins.flutter.io/url_launcher');
 /// [forceSafariVC] is only used in iOS. If unset, the launcher opens web URLs
 /// in the safari VC, anything else is opened using the default handler on the
 /// platform. If set to true, it opens the URL in the Safari view controller.
-/// If false, the URL is opened in the default browser of the phone. Set this to
-/// false if you want to use the cookies/context of the main browser of the app
-/// (such as SSO flows).
+/// If false, the URL is opened in the default browser of the phone. Note that
+/// to work with universal links on iOS, this must be set to false to let
+/// the platform's system handle the URL. Set this to false if you want to
+/// use the cookies/context of the main browser of the app(such as SSO flows).
 ///
 /// [forceWebView] is an Android only setting. If null or false, the URL is
 /// always launched with the default browser on device. If set to true, the URL

From 04ada95462aa77a30f72ca04c402cc32cdf8ae72 Mon Sep 17 00:00:00 2001
From: bcollins19 <bcollins@hmc.edu>
Date: Thu, 10 Jan 2019 11:49:14 -0800
Subject: [PATCH 055/410] Complete the method channel result once if
 startPreview failed (#1046)

---
 .../src/main/java/io/flutter/plugins/camera/CameraPlugin.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index 709c2f379bb0..4764895d0bb3 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -498,6 +498,9 @@ public void onOpened(@NonNull CameraDevice cameraDevice) {
                     startPreview();
                   } catch (CameraAccessException e) {
                     if (result != null) result.error("CameraAccess", e.getMessage(), null);
+                    cameraDevice.close();
+                    Camera.this.cameraDevice = null;
+                    return;
                   }
 
                   if (result != null) {

From c27f1f9a7b39af6d631fc5d333e7d8ddfddb453b Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Thu, 10 Jan 2019 13:43:19 -0800
Subject: [PATCH 056/410] Bump camera plugin version and update changelog.
 (#1060)

Follow-up to https://github.com/flutter/plugins/pull/1046
---
 packages/camera/CHANGELOG.md | 4 ++++
 packages/camera/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 1a43927c8d59..34cd98e49aaa 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.9+1
+
+* Fix a crash when failing to start preview.
+
 ## 0.2.9
 
 * Save photo orientation data on iOS.
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 00588a48a3f9..8679115771ed 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -1,7 +1,7 @@
 name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed and capturing images.
-version: 0.2.9
+version: 0.2.9+1
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From 4d702ad711f014760434122ce2bd06d2f41b5c6c Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Fri, 11 Jan 2019 19:22:20 -0800
Subject: [PATCH 057/410] Supress `strong_mode_implicit_dynamic_method` for
 `invokeMethod` calls. (#1065)

flutter/flutter#26303 added a template argument to `invokeMethod`, which triggers the `strong_mode_implicit_dynamic_method` analyzer warning in many call sites in the plugins repo.

We should add the type parameter to all these call sites, but we can only do that after bumping the Flutter dependency constraint which we will only do once the `invokeMethod` change makes it to the stable release.

For now we're suppressing the warning in all call sites (we're not disabling the lint wholesale as we still want it for the rest of the code)

See: flutter/flutter#26431
---
 .../lib/android_alarm_manager.dart            | 15 +++++++
 .../android_intent/lib/android_intent.dart    |  3 ++
 packages/battery/lib/battery.dart             |  3 ++
 packages/battery/test/battery_test.dart       |  3 ++
 packages/camera/lib/camera.dart               | 27 +++++++++++++
 .../lib/src/document_reference.dart           | 18 +++++++++
 .../cloud_firestore/lib/src/firestore.dart    |  9 +++++
 packages/cloud_firestore/lib/src/query.dart   |  9 +++++
 .../cloud_firestore/lib/src/transaction.dart  | 12 ++++++
 .../cloud_firestore/lib/src/write_batch.dart  | 15 +++++++
 .../cloud_functions/lib/cloud_functions.dart  |  3 ++
 packages/connectivity/lib/connectivity.dart   |  6 +++
 packages/device_info/lib/device_info.dart     |  6 +++
 .../firebase_admob/lib/firebase_admob.dart    |  3 ++
 .../lib/firebase_analytics.dart               | 21 ++++++++++
 .../test/firebase_analytics_test.dart         |  9 +++++
 .../firebase_auth/lib/src/firebase_auth.dart  | 39 +++++++++++++++++++
 .../firebase_auth/lib/src/firebase_user.dart  | 27 +++++++++++++
 .../firebase_core/lib/src/firebase_app.dart   | 12 ++++++
 .../lib/src/database_reference.dart           | 12 ++++++
 .../lib/src/firebase_database.dart            | 15 +++++++
 .../lib/src/on_disconnect.dart                |  9 +++++
 packages/firebase_database/lib/src/query.dart |  9 +++++
 .../lib/src/dynamic_link_parameters.dart      |  9 +++++
 .../lib/src/firebase_dynamic_links.dart       |  3 ++
 .../lib/firebase_messaging.dart               | 24 ++++++++++++
 .../test/firebase_messaging_test.dart         | 30 ++++++++++++++
 .../lib/src/barcode_detector.dart             |  3 ++
 .../lib/src/face_detector.dart                |  3 ++
 .../lib/src/label_detector.dart               |  6 +++
 .../lib/src/text_recognizer.dart              |  3 ++
 .../lib/src/firebase_performance.dart         |  6 +++
 .../lib/src/http_metric.dart                  |  6 +++
 .../firebase_performance/lib/src/trace.dart   |  6 +++
 .../lib/src/remote_config.dart                | 15 +++++++
 .../lib/src/firebase_storage.dart             | 21 ++++++++++
 .../lib/src/storage_reference.dart            | 24 ++++++++++++
 .../firebase_storage/lib/src/upload_task.dart | 15 +++++++
 .../lib/src/controller.dart                   | 21 ++++++++++
 .../google_sign_in/lib/google_sign_in.dart    | 15 +++++++
 packages/image_picker/lib/image_picker.dart   |  6 +++
 .../in_app_purchase/lib/in_app_purchase.dart  |  3 ++
 packages/local_auth/lib/local_auth.dart       |  9 +++++
 .../lib/location_background_plugin.dart       |  9 +++++
 packages/package_info/lib/package_info.dart   |  3 ++
 packages/path_provider/lib/path_provider.dart |  9 +++++
 packages/quick_actions/lib/quick_actions.dart |  6 +++
 packages/share/lib/share.dart                 |  3 ++
 packages/share/test/share_test.dart           |  6 +++
 .../lib/shared_preferences.dart               | 15 +++++++
 .../test/shared_preferences_test.dart         |  6 +++
 packages/url_launcher/lib/url_launcher.dart   |  9 +++++
 packages/video_player/lib/video_player.dart   | 27 +++++++++++++
 .../webview_flutter/lib/webview_flutter.dart  | 27 +++++++++++++
 54 files changed, 633 insertions(+)

diff --git a/packages/android_alarm_manager/lib/android_alarm_manager.dart b/packages/android_alarm_manager/lib/android_alarm_manager.dart
index a97e591e46d0..36aba4e250b7 100644
--- a/packages/android_alarm_manager/lib/android_alarm_manager.dart
+++ b/packages/android_alarm_manager/lib/android_alarm_manager.dart
@@ -43,6 +43,9 @@ void _alarmManagerCallbackDispatcher() {
 
   // Once we've finished initializing, let the native portion of the plugin
   // know that it can start scheduling alarms.
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   _channel.invokeMethod('AlarmService.initialized');
 }
 
@@ -67,6 +70,9 @@ class AndroidAlarmManager {
       return false;
     }
     final dynamic r = await _channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('AlarmService.start', <dynamic>[handle.toRawHandle()]);
     return r ?? false;
   }
@@ -106,6 +112,9 @@ class AndroidAlarmManager {
     if (handle == null) {
       return false;
     }
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final dynamic r = await _channel.invokeMethod('Alarm.oneShot', <dynamic>[
       id,
       exact,
@@ -152,6 +161,9 @@ class AndroidAlarmManager {
     if (handle == null) {
       return false;
     }
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final dynamic r = await _channel.invokeMethod('Alarm.periodic',
         <dynamic>[id, exact, wakeup, first, period, handle.toRawHandle()]);
     return (r == null) ? false : r;
@@ -166,6 +178,9 @@ class AndroidAlarmManager {
   /// failure.
   static Future<bool> cancel(int id) async {
     final dynamic r =
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         await _channel.invokeMethod('Alarm.cancel', <dynamic>[id]);
     return (r == null) ? false : r;
   }
diff --git a/packages/android_intent/lib/android_intent.dart b/packages/android_intent/lib/android_intent.dart
index 962bc5f849ba..8b0acc90fbdd 100644
--- a/packages/android_intent/lib/android_intent.dart
+++ b/packages/android_intent/lib/android_intent.dart
@@ -57,6 +57,9 @@ class AndroidIntent {
     if (package != null) {
       args['package'] = package;
     }
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('launch', args);
   }
 }
diff --git a/packages/battery/lib/battery.dart b/packages/battery/lib/battery.dart
index 1871ca6049f1..2a0cf2f56b63 100644
--- a/packages/battery/lib/battery.dart
+++ b/packages/battery/lib/battery.dart
@@ -33,6 +33,9 @@ class Battery {
 
   /// Returns the current battery level in percent.
   Future<int> get batteryLevel => _methodChannel
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       .invokeMethod('getBatteryLevel')
       .then<int>((dynamic result) => result);
 
diff --git a/packages/battery/test/battery_test.dart b/packages/battery/test/battery_test.dart
index 202a15ec60c6..c16bf7f4ecbd 100644
--- a/packages/battery/test/battery_test.dart
+++ b/packages/battery/test/battery_test.dart
@@ -22,6 +22,9 @@ void main() {
   });
 
   test('batteryLevel', () async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     when(methodChannel.invokeMethod('getBatteryLevel'))
         .thenAnswer((Invocation invoke) => Future<int>.value(42));
     expect(await battery.batteryLevel, 42);
diff --git a/packages/camera/lib/camera.dart b/packages/camera/lib/camera.dart
index 19028891ad84..aae573e7e0f8 100644
--- a/packages/camera/lib/camera.dart
+++ b/packages/camera/lib/camera.dart
@@ -11,6 +11,9 @@ import 'package:flutter/widgets.dart';
 part 'camera_image.dart';
 
 final MethodChannel _channel = const MethodChannel('plugins.flutter.io/camera')
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   ..invokeMethod('init');
 
 enum CameraLensDirection { front, back, external }
@@ -50,6 +53,9 @@ CameraLensDirection _parseCameraLensDirection(String string) {
 Future<List<CameraDescription>> availableCameras() async {
   try {
     final List<dynamic> cameras =
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         await _channel.invokeMethod('availableCameras');
     return cameras.map((dynamic camera) {
       return CameraDescription(
@@ -214,6 +220,9 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
     try {
       _creatingCompleter = Completer<void>();
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       final Map<dynamic, dynamic> reply = await _channel.invokeMethod(
         'initialize',
         <String, dynamic>{
@@ -283,6 +292,9 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
     try {
       value = value.copyWith(isTakingPicture: true);
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       await _channel.invokeMethod(
         'takePicture',
         <String, dynamic>{'textureId': _textureId, 'path': path},
@@ -328,6 +340,9 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
 
     try {
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       await _channel.invokeMethod('startImageStream');
       value = value.copyWith(isStreamingImages: true);
     } on PlatformException catch (e) {
@@ -369,6 +384,9 @@ class CameraController extends ValueNotifier<CameraValue> {
 
     try {
       value = value.copyWith(isStreamingImages: false);
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       await _channel.invokeMethod('stopImageStream');
     } on PlatformException catch (e) {
       throw CameraException(e.code, e.message);
@@ -409,6 +427,9 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
 
     try {
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       await _channel.invokeMethod(
         'startVideoRecording',
         <String, dynamic>{'textureId': _textureId, 'filePath': filePath},
@@ -435,6 +456,9 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
     try {
       value = value.copyWith(isRecordingVideo: false);
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       await _channel.invokeMethod(
         'stopVideoRecording',
         <String, dynamic>{'textureId': _textureId},
@@ -454,6 +478,9 @@ class CameraController extends ValueNotifier<CameraValue> {
     super.dispose();
     if (_creatingCompleter != null) {
       await _creatingCompleter.future;
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       await _channel.invokeMethod(
         'dispose',
         <String, dynamic>{'textureId': _textureId},
diff --git a/packages/cloud_firestore/lib/src/document_reference.dart b/packages/cloud_firestore/lib/src/document_reference.dart
index b4262166c9f1..bc0c540f22b9 100644
--- a/packages/cloud_firestore/lib/src/document_reference.dart
+++ b/packages/cloud_firestore/lib/src/document_reference.dart
@@ -40,6 +40,9 @@ class DocumentReference {
   /// If [merge] is true, the provided data will be merged into an
   /// existing document instead of overwriting.
   Future<void> setData(Map<String, dynamic> data, {bool merge = false}) {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return Firestore.channel.invokeMethod(
       'DocumentReference#setData',
       <String, dynamic>{
@@ -58,6 +61,9 @@ class DocumentReference {
   ///
   /// If no document exists yet, the update will fail.
   Future<void> updateData(Map<String, dynamic> data) {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return Firestore.channel.invokeMethod(
       'DocumentReference#updateData',
       <String, dynamic>{
@@ -72,6 +78,9 @@ class DocumentReference {
   ///
   /// If no document exists, the read will return null.
   Future<DocumentSnapshot> get() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final Map<dynamic, dynamic> data = await Firestore.channel.invokeMethod(
       'DocumentReference#get',
       <String, dynamic>{'app': firestore.app.name, 'path': path},
@@ -85,6 +94,9 @@ class DocumentReference {
 
   /// Deletes the document referred to by this [DocumentReference].
   Future<void> delete() {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return Firestore.channel.invokeMethod(
       'DocumentReference#delete',
       <String, dynamic>{'app': firestore.app.name, 'path': path},
@@ -108,6 +120,9 @@ class DocumentReference {
     StreamController<DocumentSnapshot> controller; // ignore: close_sinks
     controller = StreamController<DocumentSnapshot>.broadcast(
       onListen: () {
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         _handle = Firestore.channel.invokeMethod(
           'Query#addDocumentListener',
           <String, dynamic>{
@@ -121,6 +136,9 @@ class DocumentReference {
       },
       onCancel: () {
         _handle.then((int handle) async {
+          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+          // https://github.com/flutter/flutter/issues/26431
+          // ignore: strong_mode_implicit_dynamic_method
           await Firestore.channel.invokeMethod(
             'Query#removeListener',
             <String, dynamic>{'handle': handle},
diff --git a/packages/cloud_firestore/lib/src/firestore.dart b/packages/cloud_firestore/lib/src/firestore.dart
index 7af87dff32eb..42639d140bfe 100644
--- a/packages/cloud_firestore/lib/src/firestore.dart
+++ b/packages/cloud_firestore/lib/src/firestore.dart
@@ -111,6 +111,9 @@ class Firestore {
     final int transactionId = _transactionHandlerId++;
     _transactionHandlers[transactionId] = transactionHandler;
     final Map<dynamic, dynamic> result = await channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('Firestore#runTransaction', <String, dynamic>{
       'app': app.name,
       'transactionId': transactionId,
@@ -122,6 +125,9 @@ class Firestore {
   @deprecated
   Future<void> enablePersistence(bool enable) async {
     assert(enable != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await channel.invokeMethod('Firestore#enablePersistence', <String, dynamic>{
       'app': app.name,
       'enable': enable,
@@ -133,6 +139,9 @@ class Firestore {
       String host,
       bool sslEnabled,
       bool timestampsInSnapshotsEnabled}) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await channel.invokeMethod('Firestore#settings', <String, dynamic>{
       'app': app.name,
       'persistenceEnabled': persistenceEnabled,
diff --git a/packages/cloud_firestore/lib/src/query.dart b/packages/cloud_firestore/lib/src/query.dart
index b0d87496ff78..a23809852a86 100644
--- a/packages/cloud_firestore/lib/src/query.dart
+++ b/packages/cloud_firestore/lib/src/query.dart
@@ -53,6 +53,9 @@ class Query {
     StreamController<QuerySnapshot> controller; // ignore: close_sinks
     controller = StreamController<QuerySnapshot>.broadcast(
       onListen: () {
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         _handle = Firestore.channel.invokeMethod(
           'Query#addSnapshotListener',
           <String, dynamic>{
@@ -67,6 +70,9 @@ class Query {
       },
       onCancel: () {
         _handle.then((int handle) async {
+          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+          // https://github.com/flutter/flutter/issues/26431
+          // ignore: strong_mode_implicit_dynamic_method
           await Firestore.channel.invokeMethod(
             'Query#removeListener',
             <String, dynamic>{'handle': handle},
@@ -80,6 +86,9 @@ class Query {
 
   /// Fetch the documents for this query
   Future<QuerySnapshot> getDocuments() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final Map<dynamic, dynamic> data = await Firestore.channel.invokeMethod(
       'Query#getDocuments',
       <String, dynamic>{
diff --git a/packages/cloud_firestore/lib/src/transaction.dart b/packages/cloud_firestore/lib/src/transaction.dart
index d9869dea51f7..ac957437f9a4 100644
--- a/packages/cloud_firestore/lib/src/transaction.dart
+++ b/packages/cloud_firestore/lib/src/transaction.dart
@@ -15,6 +15,9 @@ class Transaction {
 
   Future<DocumentSnapshot> get(DocumentReference documentReference) async {
     final dynamic result = await Firestore.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('Transaction#get', <String, dynamic>{
       'app': _firestore.app.name,
       'transactionId': _transactionId,
@@ -30,6 +33,9 @@ class Transaction {
 
   Future<void> delete(DocumentReference documentReference) async {
     return Firestore.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('Transaction#delete', <String, dynamic>{
       'app': _firestore.app.name,
       'transactionId': _transactionId,
@@ -40,6 +46,9 @@ class Transaction {
   Future<void> update(
       DocumentReference documentReference, Map<String, dynamic> data) async {
     return Firestore.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('Transaction#update', <String, dynamic>{
       'app': _firestore.app.name,
       'transactionId': _transactionId,
@@ -50,6 +59,9 @@ class Transaction {
 
   Future<void> set(
       DocumentReference documentReference, Map<String, dynamic> data) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return Firestore.channel.invokeMethod('Transaction#set', <String, dynamic>{
       'app': _firestore.app.name,
       'transactionId': _transactionId,
diff --git a/packages/cloud_firestore/lib/src/write_batch.dart b/packages/cloud_firestore/lib/src/write_batch.dart
index ea1f0851d1c3..cfa5e5253357 100644
--- a/packages/cloud_firestore/lib/src/write_batch.dart
+++ b/packages/cloud_firestore/lib/src/write_batch.dart
@@ -12,6 +12,9 @@ part of cloud_firestore;
 /// nor can it be committed again.
 class WriteBatch {
   WriteBatch._(this._firestore)
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       : _handle = Firestore.channel.invokeMethod(
             'WriteBatch#create', <String, dynamic>{'app': _firestore.app.name});
 
@@ -29,6 +32,9 @@ class WriteBatch {
     if (!_committed) {
       _committed = true;
       await Future.wait<dynamic>(_actions);
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       await Firestore.channel.invokeMethod(
           'WriteBatch#commit', <String, dynamic>{'handle': await _handle});
     } else {
@@ -41,6 +47,9 @@ class WriteBatch {
     if (!_committed) {
       _handle.then((dynamic handle) {
         _actions.add(
+          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+          // https://github.com/flutter/flutter/issues/26431
+          // ignore: strong_mode_implicit_dynamic_method
           Firestore.channel.invokeMethod(
             'WriteBatch#delete',
             <String, dynamic>{
@@ -68,6 +77,9 @@ class WriteBatch {
     if (!_committed) {
       _handle.then((dynamic handle) {
         _actions.add(
+          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+          // https://github.com/flutter/flutter/issues/26431
+          // ignore: strong_mode_implicit_dynamic_method
           Firestore.channel.invokeMethod(
             'WriteBatch#setData',
             <String, dynamic>{
@@ -93,6 +105,9 @@ class WriteBatch {
     if (!_committed) {
       _handle.then((dynamic handle) {
         _actions.add(
+          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+          // https://github.com/flutter/flutter/issues/26431
+          // ignore: strong_mode_implicit_dynamic_method
           Firestore.channel.invokeMethod(
             'WriteBatch#updateData',
             <String, dynamic>{
diff --git a/packages/cloud_functions/lib/cloud_functions.dart b/packages/cloud_functions/lib/cloud_functions.dart
index f280a55a13fe..59c8e4501cd1 100644
--- a/packages/cloud_functions/lib/cloud_functions.dart
+++ b/packages/cloud_functions/lib/cloud_functions.dart
@@ -34,6 +34,9 @@ class CloudFunctions {
       {@required String functionName, Map<String, dynamic> parameters}) async {
     try {
       final dynamic response =
+          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+          // https://github.com/flutter/flutter/issues/26431
+          // ignore: strong_mode_implicit_dynamic_method
           await channel.invokeMethod('CloudFunctions#call', <String, dynamic>{
         'functionName': functionName,
         'parameters': parameters,
diff --git a/packages/connectivity/lib/connectivity.dart b/packages/connectivity/lib/connectivity.dart
index a60c3a953229..9c25bb75c8da 100644
--- a/packages/connectivity/lib/connectivity.dart
+++ b/packages/connectivity/lib/connectivity.dart
@@ -39,6 +39,9 @@ class Connectivity {
   ///
   /// Instead listen for connectivity changes via [onConnectivityChanged] stream.
   Future<ConnectivityResult> checkConnectivity() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final String result = await _methodChannel.invokeMethod('check');
     return _parseConnectivityResult(result);
   }
@@ -50,6 +53,9 @@ class Connectivity {
   /// From android 8.0 onwards the GPS must be ON (high accuracy)
   /// in order to be able to obtain the SSID.
   Future<String> getWifiName() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     String wifiName = await _methodChannel.invokeMethod('wifiName');
     // as Android might return <unknown ssid>, uniforming result
     // our iOS implementation will return null
diff --git a/packages/device_info/lib/device_info.dart b/packages/device_info/lib/device_info.dart
index bc8c63605f0b..7a56459abcb7 100644
--- a/packages/device_info/lib/device_info.dart
+++ b/packages/device_info/lib/device_info.dart
@@ -22,6 +22,9 @@ class DeviceInfoPlugin {
   /// See: https://developer.android.com/reference/android/os/Build.html
   Future<AndroidDeviceInfo> get androidInfo async =>
       _cachedAndroidDeviceInfo ??= AndroidDeviceInfo._fromMap(
+          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+          // https://github.com/flutter/flutter/issues/26431
+          // ignore: strong_mode_implicit_dynamic_method
           await channel.invokeMethod('getAndroidDeviceInfo'));
 
   /// This information does not change from call to call. Cache it.
@@ -31,6 +34,9 @@ class DeviceInfoPlugin {
   ///
   /// See: https://developer.apple.com/documentation/uikit/uidevice
   Future<IosDeviceInfo> get iosInfo async => _cachedIosDeviceInfo ??=
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       IosDeviceInfo._fromMap(await channel.invokeMethod('getIosDeviceInfo'));
 }
 
diff --git a/packages/firebase_admob/lib/firebase_admob.dart b/packages/firebase_admob/lib/firebase_admob.dart
index e49e7008d615..a0d4f84059b4 100644
--- a/packages/firebase_admob/lib/firebase_admob.dart
+++ b/packages/firebase_admob/lib/firebase_admob.dart
@@ -515,6 +515,9 @@ class FirebaseAdMob {
 }
 
 Future<bool> _invokeBooleanMethod(String method, [dynamic arguments]) async {
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   final bool result = await FirebaseAdMob.instance._channel.invokeMethod(
     method,
     arguments,
diff --git a/packages/firebase_analytics/lib/firebase_analytics.dart b/packages/firebase_analytics/lib/firebase_analytics.dart
index caf8faccfb97..c99d9b152077 100755
--- a/packages/firebase_analytics/lib/firebase_analytics.dart
+++ b/packages/firebase_analytics/lib/firebase_analytics.dart
@@ -55,6 +55,9 @@ class FirebaseAnalytics {
           'Prefix "$kReservedPrefix" is reserved and cannot be used.');
     }
 
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('logEvent', <String, dynamic>{
       'name': name,
       'parameters': parameters,
@@ -67,6 +70,9 @@ class FirebaseAnalytics {
   ///
   /// [1]: https://www.google.com/policies/privacy/
   Future<void> setUserId(String id) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('setUserId', id);
   }
 
@@ -94,6 +100,9 @@ class FirebaseAnalytics {
       throw ArgumentError.notNull('screenName');
     }
 
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('setCurrentScreen', <String, String>{
       'screenName': screenName,
       'screenClassOverride': screenClassOverride,
@@ -128,6 +137,9 @@ class FirebaseAnalytics {
     if (name.startsWith('firebase_'))
       throw ArgumentError.value(name, 'name', '"firebase_" prefix is reserved');
 
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('setUserProperty', <String, String>{
       'name': name,
       'value': value,
@@ -787,6 +799,9 @@ class FirebaseAnalyticsAndroid {
       throw ArgumentError.notNull('enabled');
     }
 
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('setAnalyticsCollectionEnabled', enabled);
   }
 
@@ -798,6 +813,9 @@ class FirebaseAnalyticsAndroid {
       throw ArgumentError.notNull('milliseconds');
     }
 
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('setMinimumSessionDuration', milliseconds);
   }
 
@@ -809,6 +827,9 @@ class FirebaseAnalyticsAndroid {
       throw ArgumentError.notNull('milliseconds');
     }
 
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('setSessionTimeoutDuration', milliseconds);
   }
 }
diff --git a/packages/firebase_analytics/test/firebase_analytics_test.dart b/packages/firebase_analytics/test/firebase_analytics_test.dart
index 67372733bd26..7f57220994eb 100755
--- a/packages/firebase_analytics/test/firebase_analytics_test.dart
+++ b/packages/firebase_analytics/test/firebase_analytics_test.dart
@@ -39,6 +39,9 @@ void main() {
       invokedMethod = null;
       arguments = null;
 
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       when(mockChannel.invokeMethod(any, any))
           .thenAnswer((Invocation invocation) {
         invokedMethod = invocation.positionalArguments[0];
@@ -125,6 +128,9 @@ void main() {
       name = null;
       parameters = null;
 
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       when(mockChannel.invokeMethod('logEvent', any))
           .thenAnswer((Invocation invocation) {
         final Map<String, dynamic> args = invocation.positionalArguments[1];
@@ -134,6 +140,9 @@ void main() {
         return Future<void>.value();
       });
 
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       when(mockChannel.invokeMethod(argThat(isNot('logEvent')), any))
           .thenThrow(ArgumentError('Only logEvent invocations expected'));
 
diff --git a/packages/firebase_auth/lib/src/firebase_auth.dart b/packages/firebase_auth/lib/src/firebase_auth.dart
index f56dd599c66a..b47556b84241 100644
--- a/packages/firebase_auth/lib/src/firebase_auth.dart
+++ b/packages/firebase_auth/lib/src/firebase_auth.dart
@@ -44,6 +44,9 @@ class FirebaseAuth {
 
     StreamController<FirebaseUser> controller;
     controller = StreamController<FirebaseUser>.broadcast(onListen: () {
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       _handle = channel.invokeMethod('startListeningAuthState',
           <String, String>{"app": app.name}).then<int>((dynamic v) => v);
       _handle.then((int handle) {
@@ -51,6 +54,9 @@ class FirebaseAuth {
       });
     }, onCancel: () {
       _handle.then((int handle) async {
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         await channel.invokeMethod("stopListeningAuthState",
             <String, dynamic>{"id": handle, "app": app.name});
         _authStateChangedControllers.remove(handle);
@@ -73,6 +79,9 @@ class FirebaseAuth {
   ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Anonymous accounts are not enabled.
   Future<FirebaseUser> signInAnonymously() async {
     final Map<dynamic, dynamic> data = await channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('signInAnonymously', <String, String>{"app": app.name});
     final FirebaseUser currentUser = FirebaseUser._(data, app);
     return currentUser;
@@ -93,6 +102,9 @@ class FirebaseAuth {
   }) async {
     assert(email != null);
     assert(password != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final Map<dynamic, dynamic> data = await channel.invokeMethod(
       'createUserWithEmailAndPassword',
       <String, String>{'email': email, 'password': password, 'app': app.name},
@@ -114,6 +126,9 @@ class FirebaseAuth {
     @required String email,
   }) async {
     assert(email != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final List<dynamic> providers = await channel.invokeMethod(
       'fetchSignInMethodsForEmail',
       <String, String>{'email': email, 'app': app.name},
@@ -132,6 +147,9 @@ class FirebaseAuth {
     @required String email,
   }) async {
     assert(email != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await channel.invokeMethod(
       'sendPasswordResetEmail',
       <String, String>{'email': email, 'app': app.name},
@@ -187,6 +205,9 @@ class FirebaseAuth {
   ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Google accounts are not enabled.
   Future<FirebaseUser> signInWithCredential(AuthCredential credential) async {
     assert(credential != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final Map<dynamic, dynamic> data = await channel.invokeMethod(
       'signInWithCredential',
       <String, dynamic>{
@@ -267,6 +288,9 @@ class FirebaseAuth {
       'app': app.name,
     };
 
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await channel.invokeMethod('verifyPhoneNumber', params);
   }
 
@@ -290,6 +314,9 @@ class FirebaseAuth {
   ///     Ensure your app's SHA1 is correct in the Firebase console.
   Future<FirebaseUser> signInWithCustomToken({@required String token}) async {
     assert(token != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final Map<dynamic, dynamic> data = await channel.invokeMethod(
       'signInWithCustomToken',
       <String, String>{'token': token, 'app': app.name},
@@ -304,12 +331,18 @@ class FirebaseAuth {
   /// the [onAuthStateChanged] stream.
   Future<void> signOut() async {
     return await channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod("signOut", <String, String>{'app': app.name});
   }
 
   /// Returns the currently signed-in [FirebaseUser] or [null] if there is none.
   Future<FirebaseUser> currentUser() async {
     final Map<dynamic, dynamic> data = await channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod("currentUser", <String, String>{'app': app.name});
     final FirebaseUser currentUser =
         data == null ? null : FirebaseUser._(data, app);
@@ -332,6 +365,9 @@ class FirebaseAuth {
   ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that this type of account is not enabled.
   Future<FirebaseUser> linkWithCredential(AuthCredential credential) async {
     assert(credential != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final Map<dynamic, dynamic> data = await channel.invokeMethod(
       'linkWithCredential',
       <String, dynamic>{
@@ -349,6 +385,9 @@ class FirebaseAuth {
   /// code should follow the conventions defined by the IETF in BCP47.
   Future<void> setLanguageCode(String language) async {
     assert(language != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await FirebaseAuth.channel.invokeMethod('setLanguageCode', <String, String>{
       'language': language,
       'app': app.name,
diff --git a/packages/firebase_auth/lib/src/firebase_user.dart b/packages/firebase_auth/lib/src/firebase_user.dart
index 5d3a7f93fc2b..15fa458f139f 100644
--- a/packages/firebase_auth/lib/src/firebase_user.dart
+++ b/packages/firebase_auth/lib/src/firebase_user.dart
@@ -35,6 +35,9 @@ class FirebaseUser extends UserInfo {
   /// Completes with an error if the user is signed out.
   Future<String> getIdToken({bool refresh = false}) async {
     return await FirebaseAuth.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('getIdToken', <String, dynamic>{
       'refresh': refresh,
       'app': _app.name,
@@ -43,6 +46,9 @@ class FirebaseUser extends UserInfo {
 
   /// Initiates email verification for the user.
   Future<void> sendEmailVerification() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await FirebaseAuth.channel.invokeMethod(
         'sendEmailVerification', <String, String>{'app': _app.name});
   }
@@ -51,12 +57,18 @@ class FirebaseUser extends UserInfo {
   /// attached providers, display name, and so on).
   Future<void> reload() async {
     await FirebaseAuth.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('reload', <String, String>{'app': _app.name});
   }
 
   /// Deletes the user record from your Firebase project's database.
   Future<void> delete() async {
     await FirebaseAuth.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('delete', <String, String>{'app': _app.name});
   }
 
@@ -78,6 +90,9 @@ class FirebaseUser extends UserInfo {
   ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
   Future<void> updateEmail(String email) async {
     assert(email != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await FirebaseAuth.channel.invokeMethod(
       'updateEmail',
       <String, String>{'email': email, 'app': _app.name},
@@ -100,6 +115,9 @@ class FirebaseUser extends UserInfo {
   ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Email & Password accounts are not enabled.
   Future<void> updatePassword(String password) async {
     assert(password != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await FirebaseAuth.channel.invokeMethod(
       'updatePassword',
       <String, String>{'password': password, 'app': _app.name},
@@ -115,6 +133,9 @@ class FirebaseUser extends UserInfo {
     assert(userUpdateInfo != null);
     final Map<String, String> data = userUpdateInfo._updateData;
     data['app'] = _app.name;
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await FirebaseAuth.channel.invokeMethod(
       'updateProfile',
       data,
@@ -140,6 +161,9 @@ class FirebaseUser extends UserInfo {
   Future<FirebaseUser> reauthenticateWithCredential(
       AuthCredential credential) async {
     assert(credential != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await FirebaseAuth.channel.invokeMethod(
       'reauthenticateWithCredential',
       <String, dynamic>{
@@ -166,6 +190,9 @@ class FirebaseUser extends UserInfo {
   ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
   Future<void> unlinkFromProvider(String provider) async {
     assert(provider != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await FirebaseAuth.channel.invokeMethod(
       'unlinkFromProvider',
       <String, String>{'provider': provider, 'app': _app.name},
diff --git a/packages/firebase_core/lib/src/firebase_app.dart b/packages/firebase_core/lib/src/firebase_app.dart
index 86b9404f069e..a48b67454fa4 100644
--- a/packages/firebase_core/lib/src/firebase_app.dart
+++ b/packages/firebase_core/lib/src/firebase_app.dart
@@ -24,6 +24,9 @@ class FirebaseApp {
   /// This getter is asynchronous because apps can also be configured by native
   /// code.
   Future<FirebaseOptions> get options async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final Map<dynamic, dynamic> app = await channel.invokeMethod(
       'FirebaseApp#appNamed',
       name,
@@ -35,6 +38,9 @@ class FirebaseApp {
   /// Returns a previously created FirebaseApp instance with the given name,
   /// or null if no such app exists.
   static Future<FirebaseApp> appNamed(String name) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final Map<dynamic, dynamic> app = await channel.invokeMethod(
       'FirebaseApp#appNamed',
       name,
@@ -66,6 +72,9 @@ class FirebaseApp {
       assert(await existingApp.options == options);
       return existingApp;
     }
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await channel.invokeMethod(
       'FirebaseApp#configure',
       <String, dynamic>{'name': name, 'options': options.asMap},
@@ -76,6 +85,9 @@ class FirebaseApp {
   /// Returns a list of all extant FirebaseApp instances, or null if there are
   /// no FirebaseApp instances.
   static Future<List<FirebaseApp>> allApps() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final List<dynamic> result = await channel.invokeMethod(
       'FirebaseApp#allApps',
     );
diff --git a/packages/firebase_database/lib/src/database_reference.dart b/packages/firebase_database/lib/src/database_reference.dart
index e6f645bc33f5..b6d599394b19 100644
--- a/packages/firebase_database/lib/src/database_reference.dart
+++ b/packages/firebase_database/lib/src/database_reference.dart
@@ -70,6 +70,9 @@ class DatabaseReference extends Query {
   /// Passing null for the new value means all data at this location or any
   /// child location will be deleted.
   Future<void> set(dynamic value, {dynamic priority}) {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _database._channel.invokeMethod(
       'DatabaseReference#set',
       <String, dynamic>{
@@ -84,6 +87,9 @@ class DatabaseReference extends Query {
 
   /// Update the node with the `value`
   Future<void> update(Map<String, dynamic> value) {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _database._channel.invokeMethod(
       'DatabaseReference#update',
       <String, dynamic>{
@@ -120,6 +126,9 @@ class DatabaseReference extends Query {
   /// floating-point numbers. Keys are always stored as strings and are treated
   /// as numbers only when they can be parsed as a 32-bit integer.
   Future<void> setPriority(dynamic priority) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _database._channel.invokeMethod(
       'DatabaseReference#setPriority',
       <String, dynamic>{
@@ -171,6 +180,9 @@ class DatabaseReference extends Query {
     }
 
     _database._channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('DatabaseReference#runTransaction', <String, dynamic>{
       'app': _database.app?.name,
       'databaseURL': _database.databaseURL,
diff --git a/packages/firebase_database/lib/src/firebase_database.dart b/packages/firebase_database/lib/src/firebase_database.dart
index be8d6fcb5ffa..8780f1a5e56b 100644
--- a/packages/firebase_database/lib/src/firebase_database.dart
+++ b/packages/firebase_database/lib/src/firebase_database.dart
@@ -88,6 +88,9 @@ class FirebaseDatabase {
   /// thus be available again when the app is restarted (even when there is no
   /// network connectivity at that time).
   Future<bool> setPersistenceEnabled(bool enabled) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final bool result = await _channel.invokeMethod(
       'FirebaseDatabase#setPersistenceEnabled',
       <String, dynamic>{
@@ -117,6 +120,9 @@ class FirebaseDatabase {
   /// on disk may temporarily exceed it at times. Cache sizes smaller than 1 MB
   /// or greater than 100 MB are not supported.
   Future<bool> setPersistenceCacheSizeBytes(int cacheSize) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final bool result = await _channel.invokeMethod(
       'FirebaseDatabase#setPersistenceCacheSizeBytes',
       <String, dynamic>{
@@ -131,6 +137,9 @@ class FirebaseDatabase {
   /// Resumes our connection to the Firebase Database backend after a previous
   /// [goOffline] call.
   Future<void> goOnline() {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _channel.invokeMethod(
       'FirebaseDatabase#goOnline',
       <String, dynamic>{
@@ -143,6 +152,9 @@ class FirebaseDatabase {
   /// Shuts down our connection to the Firebase Database backend until
   /// [goOnline] is called.
   Future<void> goOffline() {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _channel.invokeMethod(
       'FirebaseDatabase#goOffline',
       <String, dynamic>{
@@ -163,6 +175,9 @@ class FirebaseDatabase {
   /// affected event listeners, and the client will not (re-)send them to the
   /// Firebase Database backend.
   Future<void> purgeOutstandingWrites() {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _channel.invokeMethod(
       'FirebaseDatabase#purgeOutstandingWrites',
       <String, dynamic>{
diff --git a/packages/firebase_database/lib/src/on_disconnect.dart b/packages/firebase_database/lib/src/on_disconnect.dart
index 019c8be7a804..4229706240f5 100644
--- a/packages/firebase_database/lib/src/on_disconnect.dart
+++ b/packages/firebase_database/lib/src/on_disconnect.dart
@@ -8,6 +8,9 @@ class OnDisconnect {
   final String path;
 
   Future<void> set(dynamic value, {dynamic priority}) {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _database._channel.invokeMethod(
       'OnDisconnect#set',
       <String, dynamic>{
@@ -23,6 +26,9 @@ class OnDisconnect {
   Future<void> remove() => set(null);
 
   Future<void> cancel() {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _database._channel.invokeMethod(
       'OnDisconnect#cancel',
       <String, dynamic>{
@@ -34,6 +40,9 @@ class OnDisconnect {
   }
 
   Future<void> update(Map<String, dynamic> value) {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _database._channel.invokeMethod(
       'OnDisconnect#update',
       <String, dynamic>{
diff --git a/packages/firebase_database/lib/src/query.dart b/packages/firebase_database/lib/src/query.dart
index d9abedaf8aaf..a93ded5a91fb 100644
--- a/packages/firebase_database/lib/src/query.dart
+++ b/packages/firebase_database/lib/src/query.dart
@@ -47,6 +47,9 @@ class Query {
     StreamController<Event> controller; // ignore: close_sinks
     controller = StreamController<Event>.broadcast(
       onListen: () {
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         _handle = _database._channel.invokeMethod(
           'Query#observe',
           <String, dynamic>{
@@ -63,6 +66,9 @@ class Query {
       },
       onCancel: () {
         _handle.then((int handle) async {
+          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+          // https://github.com/flutter/flutter/issues/26431
+          // ignore: strong_mode_implicit_dynamic_method
           await _database._channel.invokeMethod(
             'Query#removeObserver',
             <String, dynamic>{
@@ -206,6 +212,9 @@ class Query {
   /// attached for that location. Additionally, while a location is kept synced,
   /// it will not be evicted from the persistent disk cache.
   Future<void> keepSynced(bool value) {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _database._channel.invokeMethod(
       'Query#keepSynced',
       <String, dynamic>{
diff --git a/packages/firebase_dynamic_links/lib/src/dynamic_link_parameters.dart b/packages/firebase_dynamic_links/lib/src/dynamic_link_parameters.dart
index 8d7b5ce9c93f..0391d8c5b9d2 100644
--- a/packages/firebase_dynamic_links/lib/src/dynamic_link_parameters.dart
+++ b/packages/firebase_dynamic_links/lib/src/dynamic_link_parameters.dart
@@ -66,6 +66,9 @@ class DynamicLinkParameters {
   static Future<ShortDynamicLink> shortenUrl(Uri url,
       [DynamicLinkParametersOptions options]) async {
     final Map<dynamic, dynamic> reply = await FirebaseDynamicLinks.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('DynamicLinkParameters#shortenUrl', <String, dynamic>{
       'url': url.toString(),
       'dynamicLinkParametersOptions': options?._data,
@@ -89,6 +92,9 @@ class DynamicLinkParameters {
   /// Generate a long Dynamic Link URL.
   Future<Uri> buildUrl() async {
     final String url = await FirebaseDynamicLinks.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('DynamicLinkParameters#buildUrl', _data);
     return Uri.parse(url);
   }
@@ -96,6 +102,9 @@ class DynamicLinkParameters {
   /// Generate a short Dynamic Link.
   Future<ShortDynamicLink> buildShortLink() async {
     final Map<dynamic, dynamic> reply = await FirebaseDynamicLinks.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('DynamicLinkParameters#buildShortLink', _data);
     return _parseShortLink(reply);
   }
diff --git a/packages/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart b/packages/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart
index 5483d32cc22c..752df5cd691d 100644
--- a/packages/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart
+++ b/packages/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart
@@ -24,6 +24,9 @@ class FirebaseDynamicLinks {
   /// the first attempt.
   Future<PendingDynamicLinkData> retrieveDynamicLink() async {
     final Map<dynamic, dynamic> linkData =
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         await channel.invokeMethod('FirebaseDynamicLinks#retrieveDynamicLink');
 
     if (linkData == null) return null;
diff --git a/packages/firebase_messaging/lib/firebase_messaging.dart b/packages/firebase_messaging/lib/firebase_messaging.dart
index c24a8ce9aa59..3c2770b760f2 100644
--- a/packages/firebase_messaging/lib/firebase_messaging.dart
+++ b/packages/firebase_messaging/lib/firebase_messaging.dart
@@ -42,6 +42,9 @@ class FirebaseMessaging {
     if (!_platform.isIOS) {
       return;
     }
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     _channel.invokeMethod(
         'requestNotificationPermissions', iosSettings.toMap());
   }
@@ -66,6 +69,9 @@ class FirebaseMessaging {
     _onLaunch = onLaunch;
     _onResume = onResume;
     _channel.setMethodCallHandler(_handleMethod);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     _channel.invokeMethod('configure');
   }
 
@@ -79,6 +85,9 @@ class FirebaseMessaging {
 
   /// Returns the FCM token.
   Future<String> getToken() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await _channel.invokeMethod('getToken');
   }
 
@@ -87,11 +96,17 @@ class FirebaseMessaging {
   /// [topic] must match the following regular expression:
   /// "[a-zA-Z0-9-_.~%]{1,900}".
   void subscribeToTopic(String topic) {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     _channel.invokeMethod('subscribeToTopic', topic);
   }
 
   /// Unsubscribe from topic in background.
   void unsubscribeFromTopic(String topic) {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     _channel.invokeMethod('unsubscribeFromTopic', topic);
   }
 
@@ -101,16 +116,25 @@ class FirebaseMessaging {
   ///
   /// returns true if the operations executed successfully and false if an error ocurred
   Future<bool> deleteInstanceID() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await _channel.invokeMethod('deleteInstanceID');
   }
 
   /// Determine whether FCM auto-initialization is enabled or disabled.
   Future<bool> autoInitEnabled() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await _channel.invokeMethod('autoInitEnabled');
   }
 
   /// Enable or disable auto-initialization of Firebase Cloud Messaging.
   Future<void> setAutoInitEnabled(bool enabled) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('setAutoInitEnabled', enabled);
   }
 
diff --git a/packages/firebase_messaging/test/firebase_messaging_test.dart b/packages/firebase_messaging/test/firebase_messaging_test.dart
index 3cb08ff37eb0..9ef535138edb 100644
--- a/packages/firebase_messaging/test/firebase_messaging_test.dart
+++ b/packages/firebase_messaging/test/firebase_messaging_test.dart
@@ -22,6 +22,9 @@ void main() {
 
   test('requestNotificationPermissions on ios with default permissions', () {
     firebaseMessaging.requestNotificationPermissions();
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     verify(mockChannel.invokeMethod('requestNotificationPermissions',
         <String, bool>{'sound': true, 'badge': true, 'alert': true}));
   });
@@ -29,6 +32,9 @@ void main() {
   test('requestNotificationPermissions on ios with custom permissions', () {
     firebaseMessaging.requestNotificationPermissions(
         const IosNotificationSettings(sound: false));
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     verify(mockChannel.invokeMethod('requestNotificationPermissions',
         <String, bool>{'sound': false, 'badge': true, 'alert': true}));
   });
@@ -52,6 +58,9 @@ void main() {
   test('configure', () {
     firebaseMessaging.configure();
     verify(mockChannel.setMethodCallHandler(any));
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     verify(mockChannel.invokeMethod('configure'));
   });
 
@@ -125,26 +134,41 @@ void main() {
 
   test('subscribe to topic', () {
     firebaseMessaging.subscribeToTopic(myTopic);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     verify(mockChannel.invokeMethod('subscribeToTopic', myTopic));
   });
 
   test('unsubscribe from topic', () {
     firebaseMessaging.unsubscribeFromTopic(myTopic);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     verify(mockChannel.invokeMethod('unsubscribeFromTopic', myTopic));
   });
 
   test('getToken', () {
     firebaseMessaging.getToken();
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     verify(mockChannel.invokeMethod('getToken'));
   });
 
   test('deleteInstanceID', () {
     firebaseMessaging.deleteInstanceID();
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     verify(mockChannel.invokeMethod('deleteInstanceID'));
   });
 
   test('autoInitEnabled', () {
     firebaseMessaging.autoInitEnabled();
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     verify(mockChannel.invokeMethod('autoInitEnabled'));
   });
 
@@ -155,6 +179,9 @@ void main() {
     firebaseMessaging.setAutoInitEnabled(true);
 
     // assert we called the method with enabled = true
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     verify(mockChannel.invokeMethod('setAutoInitEnabled', true));
 
     // assert that enabled = false was not yet called
@@ -163,6 +190,9 @@ void main() {
     firebaseMessaging.setAutoInitEnabled(false);
 
     // assert call with enabled = false was properly done
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     verify(mockChannel.invokeMethod('setAutoInitEnabled', false));
   });
 }
diff --git a/packages/firebase_ml_vision/lib/src/barcode_detector.dart b/packages/firebase_ml_vision/lib/src/barcode_detector.dart
index d8705aaeaad6..093628a1eca1 100644
--- a/packages/firebase_ml_vision/lib/src/barcode_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/barcode_detector.dart
@@ -186,6 +186,9 @@ class BarcodeDetector extends FirebaseVisionDetector {
   /// The barcode scanning is performed asynchronously.
   @override
   Future<List<Barcode>> detectInImage(FirebaseVisionImage visionImage) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'BarcodeDetector#detectInImage',
       <String, dynamic>{
diff --git a/packages/firebase_ml_vision/lib/src/face_detector.dart b/packages/firebase_ml_vision/lib/src/face_detector.dart
index 7d87377d840f..a25785bb5d54 100644
--- a/packages/firebase_ml_vision/lib/src/face_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/face_detector.dart
@@ -41,6 +41,9 @@ class FaceDetector extends FirebaseVisionDetector {
   /// Detects faces in the input image.
   @override
   Future<List<Face>> detectInImage(FirebaseVisionImage visionImage) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'FaceDetector#detectInImage',
       <String, dynamic>{
diff --git a/packages/firebase_ml_vision/lib/src/label_detector.dart b/packages/firebase_ml_vision/lib/src/label_detector.dart
index 9adaaae80b43..3a28fd11616f 100644
--- a/packages/firebase_ml_vision/lib/src/label_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/label_detector.dart
@@ -31,6 +31,9 @@ class LabelDetector extends FirebaseVisionDetector {
   /// Performed asynchronously.
   @override
   Future<List<Label>> detectInImage(FirebaseVisionImage visionImage) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'LabelDetector#detectInImage',
       <String, dynamic>{
@@ -76,6 +79,9 @@ class CloudLabelDetector extends FirebaseVisionDetector {
   /// Performed asynchronously.
   @override
   Future<List<Label>> detectInImage(FirebaseVisionImage visionImage) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'CloudLabelDetector#detectInImage',
       <String, dynamic>{
diff --git a/packages/firebase_ml_vision/lib/src/text_recognizer.dart b/packages/firebase_ml_vision/lib/src/text_recognizer.dart
index 3caeefa11ec3..de8bf1c97c2d 100644
--- a/packages/firebase_ml_vision/lib/src/text_recognizer.dart
+++ b/packages/firebase_ml_vision/lib/src/text_recognizer.dart
@@ -19,6 +19,9 @@ class TextRecognizer implements FirebaseVisionDetector {
   /// The OCR is performed asynchronously.
   Future<VisionText> processImage(FirebaseVisionImage visionImage) async {
     final Map<dynamic, dynamic> reply =
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         await FirebaseVision.channel.invokeMethod(
       'TextRecognizer#processImage',
       <String, dynamic>{
diff --git a/packages/firebase_performance/lib/src/firebase_performance.dart b/packages/firebase_performance/lib/src/firebase_performance.dart
index 7690fa804ed4..381236d44dc7 100644
--- a/packages/firebase_performance/lib/src/firebase_performance.dart
+++ b/packages/firebase_performance/lib/src/firebase_performance.dart
@@ -30,6 +30,9 @@ class FirebasePerformance {
   /// does not reflect whether instrumentation is enabled/disabled.
   Future<bool> isPerformanceCollectionEnabled() async {
     final bool isEnabled = await channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('FirebasePerformance#isPerformanceCollectionEnabled');
     return isEnabled;
   }
@@ -39,6 +42,9 @@ class FirebasePerformance {
   /// This setting is persisted and applied on future invocations of your
   /// application. By default, performance monitoring is enabled.
   Future<void> setPerformanceCollectionEnabled(bool enable) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await channel.invokeMethod(
         'FirebasePerformance#setPerformanceCollectionEnabled', enable);
   }
diff --git a/packages/firebase_performance/lib/src/http_metric.dart b/packages/firebase_performance/lib/src/http_metric.dart
index 81e19e84c37a..a2e221b368e1 100644
--- a/packages/firebase_performance/lib/src/http_metric.dart
+++ b/packages/firebase_performance/lib/src/http_metric.dart
@@ -48,6 +48,9 @@ class HttpMetric extends PerformanceAttributes {
 
     _hasStarted = true;
     return FirebasePerformance.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('HttpMetric#start', <String, dynamic>{
       'handle': _handle,
       'url': _url,
@@ -76,6 +79,9 @@ class HttpMetric extends PerformanceAttributes {
     };
 
     _hasStopped = true;
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return FirebasePerformance.channel.invokeMethod('HttpMetric#stop', data);
   }
 
diff --git a/packages/firebase_performance/lib/src/trace.dart b/packages/firebase_performance/lib/src/trace.dart
index b84bb163d1e8..6ff6ab996ee9 100644
--- a/packages/firebase_performance/lib/src/trace.dart
+++ b/packages/firebase_performance/lib/src/trace.dart
@@ -48,6 +48,9 @@ class Trace extends PerformanceAttributes {
 
     _hasStarted = true;
     return FirebasePerformance.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('Trace#start', <String, dynamic>{
       'handle': _handle,
       'name': _name,
@@ -73,6 +76,9 @@ class Trace extends PerformanceAttributes {
     };
 
     _hasStopped = true;
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return FirebasePerformance.channel.invokeMethod('Trace#stop', data);
   }
 
diff --git a/packages/firebase_remote_config/lib/src/remote_config.dart b/packages/firebase_remote_config/lib/src/remote_config.dart
index 821818578bcf..be3912c61dbe 100644
--- a/packages/firebase_remote_config/lib/src/remote_config.dart
+++ b/packages/firebase_remote_config/lib/src/remote_config.dart
@@ -36,6 +36,9 @@ class RemoteConfig extends ChangeNotifier {
 
   static void _getRemoteConfigInstance() async {
     final Map<dynamic, dynamic> properties =
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         await channel.invokeMethod('RemoteConfig#instance');
 
     final RemoteConfig instance = RemoteConfig();
@@ -99,6 +102,9 @@ class RemoteConfig extends ChangeNotifier {
   Future<void> setConfigSettings(
       RemoteConfigSettings remoteConfigSettings) async {
     await channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod('RemoteConfig#setConfigSettings', <String, dynamic>{
       'debugMode': remoteConfigSettings.debugMode,
     });
@@ -113,6 +119,9 @@ class RemoteConfig extends ChangeNotifier {
   /// Expiration must be defined in seconds.
   Future<void> fetch({Duration expiration = const Duration(hours: 12)}) async {
     try {
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       final Map<dynamic, dynamic> properties = await channel.invokeMethod(
           'RemoteConfig#fetch',
           <dynamic, dynamic>{'expiration': expiration.inSeconds});
@@ -138,6 +147,9 @@ class RemoteConfig extends ChangeNotifier {
   /// from the currently activated config, it contains false otherwise.
   Future<bool> activateFetched() async {
     final Map<dynamic, dynamic> properties =
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         await channel.invokeMethod('RemoteConfig#activate');
     final Map<dynamic, dynamic> rawParameters = properties['parameters'];
     final bool newConfig = properties['newConfig'];
@@ -164,6 +176,9 @@ class RemoteConfig extends ChangeNotifier {
         _parameters[key] = remoteConfigValue;
       }
     });
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await channel.invokeMethod(
         'RemoteConfig#setDefaults', <String, dynamic>{'defaults': defaults});
   }
diff --git a/packages/firebase_storage/lib/src/firebase_storage.dart b/packages/firebase_storage/lib/src/firebase_storage.dart
index 050ebd1c3af8..e12b8c737ffe 100644
--- a/packages/firebase_storage/lib/src/firebase_storage.dart
+++ b/packages/firebase_storage/lib/src/firebase_storage.dart
@@ -58,6 +58,9 @@ class FirebaseStorage {
   StorageReference ref() => StorageReference._(const <String>[], this);
 
   Future<int> getMaxDownloadRetryTimeMillis() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await channel.invokeMethod(
         "FirebaseStorage#getMaxDownloadRetryTime", <String, dynamic>{
       'app': app?.name,
@@ -66,6 +69,9 @@ class FirebaseStorage {
   }
 
   Future<int> getMaxUploadRetryTimeMillis() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await channel.invokeMethod(
         "FirebaseStorage#getMaxUploadRetryTime", <String, dynamic>{
       'app': app?.name,
@@ -74,6 +80,9 @@ class FirebaseStorage {
   }
 
   Future<int> getMaxOperationRetryTimeMillis() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await channel.invokeMethod(
         "FirebaseStorage#getMaxOperationRetryTime", <String, dynamic>{
       'app': app?.name,
@@ -82,6 +91,9 @@ class FirebaseStorage {
   }
 
   Future<void> setMaxDownloadRetryTimeMillis(int time) {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return channel.invokeMethod(
         "FirebaseStorage#setMaxDownloadRetryTime", <String, dynamic>{
       'app': app?.name,
@@ -91,6 +103,9 @@ class FirebaseStorage {
   }
 
   Future<void> setMaxUploadRetryTimeMillis(int time) {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return channel.invokeMethod(
         "FirebaseStorage#setMaxUploadRetryTime", <String, dynamic>{
       'app': app?.name,
@@ -100,6 +115,9 @@ class FirebaseStorage {
   }
 
   Future<void> setMaxOperationRetryTimeMillis(int time) {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return channel.invokeMethod(
         "FirebaseStorage#setMaxOperationRetryTime", <String, dynamic>{
       'app': app?.name,
@@ -118,6 +136,9 @@ class StorageFileDownloadTask {
   final File _file;
 
   Future<void> _start() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final int totalByteCount = await FirebaseStorage.channel.invokeMethod(
       "StorageReference#writeToFile",
       <String, dynamic>{
diff --git a/packages/firebase_storage/lib/src/storage_reference.dart b/packages/firebase_storage/lib/src/storage_reference.dart
index d3e9e2ab7faa..0325c9e33a85 100644
--- a/packages/firebase_storage/lib/src/storage_reference.dart
+++ b/packages/firebase_storage/lib/src/storage_reference.dart
@@ -77,6 +77,9 @@ class StorageReference {
   /// Returns the Google Cloud Storage bucket that holds this object.
   Future<String> getBucket() async {
     return await FirebaseStorage.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod("StorageReference#getBucket", <String, String>{
       'app': _firebaseStorage.app?.name,
       'bucket': _firebaseStorage.storageBucket,
@@ -88,6 +91,9 @@ class StorageReference {
   /// Storage bucket.
   Future<String> getPath() async {
     return await FirebaseStorage.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod("StorageReference#getPath", <String, String>{
       'app': _firebaseStorage.app?.name,
       'bucket': _firebaseStorage.storageBucket,
@@ -98,6 +104,9 @@ class StorageReference {
   /// Returns the short name of this object.
   Future<String> getName() async {
     return await FirebaseStorage.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod("StorageReference#getName", <String, String>{
       'app': _firebaseStorage.app?.name,
       'bucket': _firebaseStorage.storageBucket,
@@ -108,6 +117,9 @@ class StorageReference {
   /// Asynchronously downloads the object at the StorageReference to a list in memory.
   /// A list of the provided max size will be allocated.
   Future<Uint8List> getData(int maxSize) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await FirebaseStorage.channel.invokeMethod(
       "StorageReference#getData",
       <String, dynamic>{
@@ -133,6 +145,9 @@ class StorageReference {
   /// developer in the Firebase Console if desired.
   Future<dynamic> getDownloadURL() async {
     return await FirebaseStorage.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod("StorageReference#getDownloadUrl", <String, String>{
       'app': _firebaseStorage.app?.name,
       'bucket': _firebaseStorage.storageBucket,
@@ -142,6 +157,9 @@ class StorageReference {
 
   Future<void> delete() {
     return FirebaseStorage.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod("StorageReference#delete", <String, String>{
       'app': _firebaseStorage.app?.name,
       'bucket': _firebaseStorage.storageBucket,
@@ -152,6 +170,9 @@ class StorageReference {
   /// Retrieves metadata associated with an object at this [StorageReference].
   Future<StorageMetadata> getMetadata() async {
     return StorageMetadata._fromMap(await FirebaseStorage.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod("StorageReference#getMetadata", <String, String>{
       'app': _firebaseStorage.app?.name,
       'bucket': _firebaseStorage.storageBucket,
@@ -168,6 +189,9 @@ class StorageReference {
   /// by passing the empty string.
   Future<StorageMetadata> updateMetadata(StorageMetadata metadata) async {
     return StorageMetadata._fromMap(await FirebaseStorage.channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod("StorageReference#updateMetadata", <String, dynamic>{
       'app': _firebaseStorage.app?.name,
       'bucket': _firebaseStorage.storageBucket,
diff --git a/packages/firebase_storage/lib/src/upload_task.dart b/packages/firebase_storage/lib/src/upload_task.dart
index 945ed391be48..be432589873d 100644
--- a/packages/firebase_storage/lib/src/upload_task.dart
+++ b/packages/firebase_storage/lib/src/upload_task.dart
@@ -89,6 +89,9 @@ abstract class StorageUploadTask {
   }
 
   /// Pause the upload
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   void pause() => FirebaseStorage.channel.invokeMethod(
         'UploadTask#pause',
         <String, dynamic>{
@@ -99,6 +102,9 @@ abstract class StorageUploadTask {
       );
 
   /// Resume the upload
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   void resume() => FirebaseStorage.channel.invokeMethod(
         'UploadTask#resume',
         <String, dynamic>{
@@ -109,6 +115,9 @@ abstract class StorageUploadTask {
       );
 
   /// Cancel the upload
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   void cancel() => FirebaseStorage.channel.invokeMethod(
         'UploadTask#cancel',
         <String, dynamic>{
@@ -128,6 +137,9 @@ class _StorageFileUploadTask extends StorageUploadTask {
 
   @override
   Future<dynamic> _platformStart() {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return FirebaseStorage.channel.invokeMethod(
       'StorageReference#putFile',
       <String, dynamic>{
@@ -151,6 +163,9 @@ class _StorageDataUploadTask extends StorageUploadTask {
 
   @override
   Future<dynamic> _platformStart() {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return FirebaseStorage.channel.invokeMethod(
       'StorageReference#putData',
       <String, dynamic>{
diff --git a/packages/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/lib/src/controller.dart
index ee25ac2ce5e3..e2ff8e5d1ca8 100644
--- a/packages/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/lib/src/controller.dart
@@ -31,6 +31,9 @@ class GoogleMapController extends ChangeNotifier {
     assert(id != null);
     final MethodChannel channel =
         MethodChannel('plugins.flutter.io/google_maps_$id');
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await channel.invokeMethod('map#waitForMap');
     return GoogleMapController._(id, channel, initialCameraPosition);
   }
@@ -103,6 +106,9 @@ class GoogleMapController extends ChangeNotifier {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updateMapOptions(Map<String, dynamic> optionsUpdate) async {
     assert(optionsUpdate != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final dynamic json = await _channel.invokeMethod(
       'map#update',
       <String, dynamic>{
@@ -118,6 +124,9 @@ class GoogleMapController extends ChangeNotifier {
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
   Future<void> animateCamera(CameraUpdate cameraUpdate) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('camera#animate', <String, dynamic>{
       'cameraUpdate': cameraUpdate._toJson(),
     });
@@ -128,6 +137,9 @@ class GoogleMapController extends ChangeNotifier {
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
   Future<void> moveCamera(CameraUpdate cameraUpdate) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('camera#move', <String, dynamic>{
       'cameraUpdate': cameraUpdate._toJson(),
     });
@@ -143,6 +155,9 @@ class GoogleMapController extends ChangeNotifier {
   Future<Marker> addMarker(MarkerOptions options) async {
     final MarkerOptions effectiveOptions =
         MarkerOptions.defaultOptions.copyWith(options);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final String markerId = await _channel.invokeMethod(
       'marker#add',
       <String, dynamic>{
@@ -166,6 +181,9 @@ class GoogleMapController extends ChangeNotifier {
     assert(marker != null);
     assert(_markers[marker._id] == marker);
     assert(changes != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('marker#update', <String, dynamic>{
       'marker': marker._id,
       'options': changes._toJson(),
@@ -209,6 +227,9 @@ class GoogleMapController extends ChangeNotifier {
   /// The returned [Future] completes once the marker has been removed from
   /// [_markers].
   Future<void> _removeMarker(String id) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('marker#remove', <String, dynamic>{
       'marker': id,
     });
diff --git a/packages/google_sign_in/lib/google_sign_in.dart b/packages/google_sign_in/lib/google_sign_in.dart
index 2465890a6c31..234eb5102da2 100755
--- a/packages/google_sign_in/lib/google_sign_in.dart
+++ b/packages/google_sign_in/lib/google_sign_in.dart
@@ -79,6 +79,9 @@ class GoogleSignInAccount implements GoogleIdentity {
     }
 
     final Map<dynamic, dynamic> response =
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         await GoogleSignIn.channel.invokeMethod(
       'getTokens',
       <String, dynamic>{
@@ -108,6 +111,9 @@ class GoogleSignInAccount implements GoogleIdentity {
   /// this method and grab `authHeaders` once again.
   Future<void> clearAuthCache() async {
     final String token = (await authentication).accessToken;
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await GoogleSignIn.channel.invokeMethod(
       'clearAuthCache',
       <String, dynamic>{'token': token},
@@ -214,6 +220,9 @@ class GoogleSignIn {
   Future<GoogleSignInAccount> _callMethod(String method) async {
     await _ensureInitialized();
 
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final Map<dynamic, dynamic> response = await channel.invokeMethod(method);
     return _setCurrentUser(response != null && response.isNotEmpty
         ? GoogleSignInAccount._(this, response)
@@ -230,6 +239,9 @@ class GoogleSignIn {
 
   Future<void> _ensureInitialized() {
     if (_initialization == null) {
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       _initialization = channel.invokeMethod('init', <String, dynamic>{
         'signInOption': (signInOption ?? SignInOption.standard).toString(),
         'scopes': scopes ?? <String>[],
@@ -306,6 +318,9 @@ class GoogleSignIn {
   /// Returns a future that resolves to whether a user is currently signed in.
   Future<bool> isSignedIn() async {
     await _ensureInitialized();
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final bool result = await channel.invokeMethod('isSignedIn');
     return result;
   }
diff --git a/packages/image_picker/lib/image_picker.dart b/packages/image_picker/lib/image_picker.dart
index da7847d3ecbf..ae1d366d428b 100755
--- a/packages/image_picker/lib/image_picker.dart
+++ b/packages/image_picker/lib/image_picker.dart
@@ -44,6 +44,9 @@ class ImagePicker {
       throw ArgumentError.value(maxHeight, 'maxHeight cannot be negative');
     }
 
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final String path = await _channel.invokeMethod(
       'pickImage',
       <String, dynamic>{
@@ -61,6 +64,9 @@ class ImagePicker {
   }) async {
     assert(source != null);
 
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final String path = await _channel.invokeMethod(
       'pickVideo',
       <String, dynamic>{
diff --git a/packages/in_app_purchase/lib/in_app_purchase.dart b/packages/in_app_purchase/lib/in_app_purchase.dart
index 8f231eb00e9d..0e04095eae9c 100644
--- a/packages/in_app_purchase/lib/in_app_purchase.dart
+++ b/packages/in_app_purchase/lib/in_app_purchase.dart
@@ -6,6 +6,9 @@ class InAppPurchase {
   static const MethodChannel _channel = MethodChannel('in_app_purchase');
 
   static Future<String> get platformVersion async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final String version = await _channel.invokeMethod('getPlatformVersion');
     return version;
   }
diff --git a/packages/local_auth/lib/local_auth.dart b/packages/local_auth/lib/local_auth.dart
index 3971bb6218db..9cd011736fff 100644
--- a/packages/local_auth/lib/local_auth.dart
+++ b/packages/local_auth/lib/local_auth.dart
@@ -72,6 +72,9 @@ class LocalAuthentication {
               'operating systems.',
           details: 'Your operating system is ${Platform.operatingSystem}');
     }
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await _channel.invokeMethod('authenticateWithBiometrics', args);
   }
 
@@ -79,6 +82,9 @@ class LocalAuthentication {
   ///
   /// Returns a [Future] bool true or false:
   Future<bool> get canCheckBiometrics async =>
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       (await _channel.invokeMethod('getAvailableBiometrics')).isNotEmpty;
 
   /// Returns a list of enrolled biometrics
@@ -89,6 +95,9 @@ class LocalAuthentication {
   /// - BiometricType.iris (not yet implemented)
   Future<List<BiometricType>> getAvailableBiometrics() async {
     final List<String> result =
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         (await _channel.invokeMethod('getAvailableBiometrics')).cast<String>();
     final List<BiometricType> biometrics = <BiometricType>[];
     result.forEach((String value) {
diff --git a/packages/location_background/lib/location_background_plugin.dart b/packages/location_background/lib/location_background_plugin.dart
index c587a7c0da32..479862e7209d 100644
--- a/packages/location_background/lib/location_background_plugin.dart
+++ b/packages/location_background/lib/location_background_plugin.dart
@@ -118,6 +118,9 @@ class LocationBackgroundPlugin {
         PluginUtilities.getCallbackHandle(_backgroundCallbackDispatcher);
     assert(handle != null, 'Unable to lookup callback.');
     _channel
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         .invokeMethod(_kStartHeadlessService, <dynamic>[handle.toRawHandle()]);
   }
 
@@ -144,6 +147,9 @@ class LocationBackgroundPlugin {
       throw ArgumentError.notNull('callback');
     }
     final CallbackHandle handle = PluginUtilities.getCallbackHandle(callback);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _channel.invokeMethod(_kMonitorLocationChanges, <dynamic>[
       handle.toRawHandle(),
       pauseLocationUpdatesAutomatically,
@@ -154,5 +160,8 @@ class LocationBackgroundPlugin {
 
   /// Stop all location updates.
   Future<void> cancelLocationUpdates() =>
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       _channel.invokeMethod(_kCancelLocationUpdates);
 }
diff --git a/packages/package_info/lib/package_info.dart b/packages/package_info/lib/package_info.dart
index 1a66f5d61e65..093601242cd1 100644
--- a/packages/package_info/lib/package_info.dart
+++ b/packages/package_info/lib/package_info.dart
@@ -32,6 +32,9 @@ class PackageInfo {
     if (_fromPlatform == null) {
       final Completer<PackageInfo> completer = Completer<PackageInfo>();
 
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       _kChannel.invokeMethod('getAll').then((dynamic result) {
         final Map<dynamic, dynamic> map = result;
 
diff --git a/packages/path_provider/lib/path_provider.dart b/packages/path_provider/lib/path_provider.dart
index 905685b86586..1875f7436d8b 100644
--- a/packages/path_provider/lib/path_provider.dart
+++ b/packages/path_provider/lib/path_provider.dart
@@ -21,6 +21,9 @@ const MethodChannel _channel =
 ///
 /// On Android, this uses the `getCacheDir` API on the context.
 Future<Directory> getTemporaryDirectory() async {
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   final String path = await _channel.invokeMethod('getTemporaryDirectory');
   if (path == null) {
     return null;
@@ -37,6 +40,9 @@ Future<Directory> getTemporaryDirectory() async {
 /// On Android, this returns the AppData directory.
 Future<Directory> getApplicationDocumentsDirectory() async {
   final String path =
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       await _channel.invokeMethod('getApplicationDocumentsDirectory');
   if (path == null) {
     return null;
@@ -55,6 +61,9 @@ Future<Directory> getApplicationDocumentsDirectory() async {
 Future<Directory> getExternalStorageDirectory() async {
   if (Platform.isIOS)
     throw UnsupportedError("Functionality not available on iOS");
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   final String path = await _channel.invokeMethod('getStorageDirectory');
   if (path == null) {
     return null;
diff --git a/packages/quick_actions/lib/quick_actions.dart b/packages/quick_actions/lib/quick_actions.dart
index 7747495d37b8..f359fb78e6c4 100644
--- a/packages/quick_actions/lib/quick_actions.dart
+++ b/packages/quick_actions/lib/quick_actions.dart
@@ -52,11 +52,17 @@ class QuickActions {
   Future<void> setShortcutItems(List<ShortcutItem> items) async {
     final List<Map<String, String>> itemsList =
         items.map(_serializeItem).toList();
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _kChannel.invokeMethod('setShortcutItems', itemsList);
   }
 
   /// Removes all [ShortcutItem]s registered for the app.
   Future<void> clearShortcutItems() =>
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       _kChannel.invokeMethod('clearShortcutItems');
 
   Map<String, String> _serializeItem(ShortcutItem item) {
diff --git a/packages/share/lib/share.dart b/packages/share/lib/share.dart
index dc6354e89f8b..a86a8261b5f5 100644
--- a/packages/share/lib/share.dart
+++ b/packages/share/lib/share.dart
@@ -41,6 +41,9 @@ class Share {
       params['originHeight'] = sharePositionOrigin.height;
     }
 
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return channel.invokeMethod('share', params);
   }
 }
diff --git a/packages/share/test/share_test.dart b/packages/share/test/share_test.dart
index 290305aa2177..5ea12626d353 100644
--- a/packages/share/test/share_test.dart
+++ b/packages/share/test/share_test.dart
@@ -17,6 +17,9 @@ void main() {
     mockChannel = MockMethodChannel();
     // Re-pipe to mockito for easier verifies.
     Share.channel.setMockMethodCallHandler((MethodCall call) async {
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       mockChannel.invokeMethod(call.method, call.arguments);
     });
   });
@@ -42,6 +45,9 @@ void main() {
       'some text to share',
       sharePositionOrigin: Rect.fromLTWH(1.0, 2.0, 3.0, 4.0),
     );
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     verify(mockChannel.invokeMethod('share', <String, dynamic>{
       'text': 'some text to share',
       'originX': 1.0,
diff --git a/packages/shared_preferences/lib/shared_preferences.dart b/packages/shared_preferences/lib/shared_preferences.dart
index eaece4c4fb96..cb24d12fde0d 100644
--- a/packages/shared_preferences/lib/shared_preferences.dart
+++ b/packages/shared_preferences/lib/shared_preferences.dart
@@ -22,6 +22,9 @@ class SharedPreferences {
   static Future<SharedPreferences> getInstance() async {
     if (_instance == null) {
       final Map<Object, Object> fromSystem =
+          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+          // https://github.com/flutter/flutter/issues/26431
+          // ignore: strong_mode_implicit_dynamic_method
           await _kChannel.invokeMethod('getAll');
       assert(fromSystem != null);
       // Strip the flutter. prefix from the returned preferences.
@@ -118,12 +121,18 @@ class SharedPreferences {
     if (value == null) {
       _preferenceCache.remove(key);
       return _kChannel
+          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+          // https://github.com/flutter/flutter/issues/26431
+          // ignore: strong_mode_implicit_dynamic_method
           .invokeMethod('remove', params)
           .then<bool>((dynamic result) => result);
     } else {
       _preferenceCache[key] = value;
       params['value'] = value;
       return _kChannel
+          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+          // https://github.com/flutter/flutter/issues/26431
+          // ignore: strong_mode_implicit_dynamic_method
           .invokeMethod('set$valueType', params)
           .then<bool>((dynamic result) => result);
     }
@@ -132,11 +141,17 @@ class SharedPreferences {
   /// Always returns true.
   /// On iOS, synchronize is marked deprecated. On Android, we commit every set.
   @deprecated
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   Future<bool> commit() async => await _kChannel.invokeMethod('commit');
 
   /// Completes with true once the user preferences for the app has been cleared.
   Future<bool> clear() async {
     _preferenceCache.clear();
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return await _kChannel.invokeMethod('clear');
   }
 
diff --git a/packages/shared_preferences/test/shared_preferences_test.dart b/packages/shared_preferences/test/shared_preferences_test.dart
index 09903eb1008e..c296bde635c5 100755
--- a/packages/shared_preferences/test/shared_preferences_test.dart
+++ b/packages/shared_preferences/test/shared_preferences_test.dart
@@ -136,8 +136,14 @@ void main() {
     });
 
     test('mocking', () async {
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       expect(await channel.invokeMethod('getAll'), kTestValues);
       SharedPreferences.setMockInitialValues(kTestValues2);
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       expect(await channel.invokeMethod('getAll'), kTestValues2);
     });
   });
diff --git a/packages/url_launcher/lib/url_launcher.dart b/packages/url_launcher/lib/url_launcher.dart
index 420ad09e0feb..ef51f727e979 100644
--- a/packages/url_launcher/lib/url_launcher.dart
+++ b/packages/url_launcher/lib/url_launcher.dart
@@ -64,6 +64,9 @@ Future<void> launch(
         ? SystemUiOverlayStyle.dark
         : SystemUiOverlayStyle.light);
   }
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   return _channel.invokeMethod(
     'launch',
     <String, Object>{
@@ -86,6 +89,9 @@ Future<bool> canLaunch(String urlString) async {
   if (urlString == null) {
     return false;
   }
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   return await _channel.invokeMethod(
     'canLaunch',
     <String, Object>{'url': urlString},
@@ -100,5 +106,8 @@ Future<bool> canLaunch(String urlString) async {
 /// `true`, this call will not do anything either, simply because there is no
 /// WebView available to be closed.
 Future<void> closeWebView() async {
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   return await _channel.invokeMethod('closeWebView');
 }
diff --git a/packages/video_player/lib/video_player.dart b/packages/video_player/lib/video_player.dart
index c297078bf8f9..46477e1e4096 100644
--- a/packages/video_player/lib/video_player.dart
+++ b/packages/video_player/lib/video_player.dart
@@ -12,6 +12,9 @@ import 'package:meta/meta.dart';
 final MethodChannel _channel = const MethodChannel('flutter.io/videoPlayer')
   // This will clear all open videos on the platform when a full restart is
   // performed.
+  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+  // https://github.com/flutter/flutter/issues/26431
+  // ignore: strong_mode_implicit_dynamic_method
   ..invokeMethod('init');
 
 class DurationRange {
@@ -205,6 +208,9 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
       case DataSourceType.file:
         dataSourceDescription = <String, dynamic>{'uri': dataSource};
     }
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final Map<dynamic, dynamic> response = await _channel.invokeMethod(
       'create',
       dataSourceDescription,
@@ -278,6 +284,9 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
         _isDisposed = true;
         _timer?.cancel();
         await _eventSubscription?.cancel();
+        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+        // https://github.com/flutter/flutter/issues/26431
+        // ignore: strong_mode_implicit_dynamic_method
         await _channel.invokeMethod(
           'dispose',
           <String, dynamic>{'textureId': _textureId},
@@ -308,6 +317,9 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
     if (!value.initialized || _isDisposed) {
       return;
     }
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     _channel.invokeMethod(
       'setLooping',
       <String, dynamic>{'textureId': _textureId, 'looping': value.isLooping},
@@ -319,6 +331,9 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
       return;
     }
     if (value.isPlaying) {
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       await _channel.invokeMethod(
         'play',
         <String, dynamic>{'textureId': _textureId},
@@ -338,6 +353,9 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
       );
     } else {
       _timer?.cancel();
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       await _channel.invokeMethod(
         'pause',
         <String, dynamic>{'textureId': _textureId},
@@ -349,6 +367,9 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
     if (!value.initialized || _isDisposed) {
       return;
     }
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod(
       'setVolume',
       <String, dynamic>{'textureId': _textureId, 'volume': value.volume},
@@ -361,6 +382,9 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
       return null;
     }
     return Duration(
+      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
       milliseconds: await _channel.invokeMethod(
         'position',
         <String, dynamic>{'textureId': _textureId},
@@ -377,6 +401,9 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
     } else if (moment < const Duration()) {
       moment = const Duration();
     }
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     await _channel.invokeMethod('seekTo', <String, dynamic>{
       'textureId': _textureId,
       'location': moment.inMilliseconds,
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index 53862924e797..43f88b6892e4 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -194,6 +194,9 @@ class WebViewController {
   Future<void> loadUrl(String url) async {
     assert(url != null);
     _validateUrlString(url);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _channel.invokeMethod('loadUrl', url);
   }
 
@@ -205,6 +208,9 @@ class WebViewController {
   /// words, by the time this future completes, the WebView may be displaying a
   /// different URL).
   Future<String> currentUrl() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final String url = await _channel.invokeMethod('currentUrl');
     return url;
   }
@@ -214,6 +220,9 @@ class WebViewController {
   /// Note that this operation is asynchronous, and it is possible that the "canGoBack" state has
   /// changed by the time the future completed.
   Future<bool> canGoBack() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final bool canGoBack = await _channel.invokeMethod("canGoBack");
     return canGoBack;
   }
@@ -223,6 +232,9 @@ class WebViewController {
   /// Note that this operation is asynchronous, and it is possible that the "canGoForward" state has
   /// changed by the time the future completed.
   Future<bool> canGoForward() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final bool canGoForward = await _channel.invokeMethod("canGoForward");
     return canGoForward;
   }
@@ -231,6 +243,9 @@ class WebViewController {
   ///
   /// If there is no back history item this is a no-op.
   Future<void> goBack() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _channel.invokeMethod("goBack");
   }
 
@@ -238,11 +253,17 @@ class WebViewController {
   ///
   /// If there is no forward history item this is a no-op.
   Future<void> goForward() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _channel.invokeMethod("goForward");
   }
 
   /// Reloads the current URL.
   Future<void> reload() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _channel.invokeMethod("reload");
   }
 
@@ -252,6 +273,9 @@ class WebViewController {
       return null;
     }
     _settings = setting;
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     return _channel.invokeMethod('updateSettings', updateMap);
   }
 
@@ -275,6 +299,9 @@ class WebViewController {
     if (javascriptString == null) {
       throw ArgumentError('The argument javascriptString must not be null. ');
     }
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
     final String result =
         await _channel.invokeMethod('evaluateJavascript', javascriptString);
     return result;

From 23852d394b52bf9373041548e37f4159965c7ba1 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Mon, 14 Jan 2019 10:18:37 -0800
Subject: [PATCH 058/410] adding nil check (#1072)

Adding nil checks in NSDictionary and default them to NSNull to prevent crashes.
---
 packages/package_info/CHANGELOG.md                |  4 ++++
 .../package_info/ios/Classes/PackageInfoPlugin.m  | 15 ++++++---------
 packages/package_info/pubspec.yaml                |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md
index 7432ad95f17d..f12333d15071 100644
--- a/packages/package_info/CHANGELOG.md
+++ b/packages/package_info/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.2+1
+
+* Fixed a crash on IOS when some of the package infos are not available.
+
 ## 0.3.2
 
 * Updated Gradle tooling to match Android Studio 3.1.2.
diff --git a/packages/package_info/ios/Classes/PackageInfoPlugin.m b/packages/package_info/ios/Classes/PackageInfoPlugin.m
index 5c0adbb6f931..58f62b0e80a7 100644
--- a/packages/package_info/ios/Classes/PackageInfoPlugin.m
+++ b/packages/package_info/ios/Classes/PackageInfoPlugin.m
@@ -15,17 +15,14 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
 
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   if ([call.method isEqualToString:@"getAll"]) {
-    NSString* displayName =
-        [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"];
-    // Cannot put nil into a map so return an empty string.
-    if (displayName == nil) {
-      displayName = @"";
-    }
     result(@{
-      @"appName" : displayName,
-      @"packageName" : [[NSBundle mainBundle] bundleIdentifier],
-      @"version" : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"],
+      @"appName" : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]
+          ?: [NSNull null],
+      @"packageName" : [[NSBundle mainBundle] bundleIdentifier] ?: [NSNull null],
+      @"version" : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]
+          ?: [NSNull null],
       @"buildNumber" : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]
+          ?: [NSNull null],
     });
   } else {
     result(FlutterMethodNotImplemented);
diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml
index cd1012a5d5ab..3fe19af8f6bc 100644
--- a/packages/package_info/pubspec.yaml
+++ b/packages/package_info/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for querying information about the application
   package, such as CFBundleVersion on iOS or versionCode on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/package_info
-version: 0.3.2
+version: 0.3.2+1
 
 flutter:
   plugin:

From 43ee28cf183a9c9b4df87636648571dd8b5c17b1 Mon Sep 17 00:00:00 2001
From: KyleWong <kangwang1988@users.noreply.github.com>
Date: Tue, 15 Jan 2019 06:17:28 +0800
Subject: [PATCH 059/410] Fix `Manifest versionCode not found` (#1076)

For each plugin, make sure example/android/app/build.gradle has proper versionCode/versionName setting. Henceforth, keep up with the `flutter create --template=plugin plugin_test` logic and solve a versionCode check problem introduced by https://github.com/flutter/flutter/commit/55f3da7af
---
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 17 +++++++++++++++--
 .../battery/example/android/app/build.gradle    | 15 ++++++++++++++-
 .../camera/example/android/app/build.gradle     | 14 +++++++++++++-
 .../example/android/app/build.gradle            | 17 +++++++++++++++--
 .../example/android/app/build.gradle            |  5 ++---
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 13 +++++++++++++
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 14 ++++++++++++++
 .../example/android/app/build.gradle            | 14 ++++++++++++--
 .../example/android/app/build.gradle            | 15 ++++++++++++---
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 14 ++++++++++++--
 .../example/android/app/build.gradle            | 17 +++++++++++++++--
 .../example/android/app/build.gradle            | 16 ++++++++++++++--
 .../example/android/app/build.gradle            | 16 ++++++++++++----
 .../local_auth/example/android/app/build.gradle | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 15 ++++++++++++---
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 17 +++++++++++++++--
 .../sensors/example/android/app/build.gradle    | 15 ++++++++++++++-
 packages/share/example/android/app/build.gradle | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 .../example/android/app/build.gradle            | 15 ++++++++++++++-
 33 files changed, 442 insertions(+), 47 deletions(-)

diff --git a/packages/android_alarm_manager/example/android/app/build.gradle b/packages/android_alarm_manager/example/android/app/build.gradle
index fb922e941141..4171ac109f80 100644
--- a/packages/android_alarm_manager/example/android/app/build.gradle
+++ b/packages/android_alarm_manager/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,8 +32,11 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
         applicationId "io.flutter.plugins.androidalarmmanagerexample"
+        minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/android_intent/example/android/app/build.gradle b/packages/android_intent/example/android/app/build.gradle
index ebb1628ec23d..e79f43f221e4 100644
--- a/packages/android_intent/example/android/app/build.gradle
+++ b/packages/android_intent/example/android/app/build.gradle
@@ -11,20 +11,33 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 27
-    
+
     lintOptions {
         disable 'InvalidPackage'
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.androidintentexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.androidintentexample"
     }
 
     buildTypes {
diff --git a/packages/battery/example/android/app/build.gradle b/packages/battery/example/android/app/build.gradle
index 32472b730e88..9c8a8dcc7c2e 100644
--- a/packages/battery/example/android/app/build.gradle
+++ b/packages/battery/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.batteryexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.batteryexample"
     }
 
     buildTypes {
diff --git a/packages/camera/example/android/app/build.gradle b/packages/camera/example/android/app/build.gradle
index fc7265c4acb5..aff850af09d4 100644
--- a/packages/camera/example/android/app/build.gradle
+++ b/packages/camera/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,11 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.cameraexample"
         minSdkVersion 21
         targetSdkVersion 27
-        applicationId "io.flutter.plugins.cameraexample"
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/cloud_firestore/example/android/app/build.gradle b/packages/cloud_firestore/example/android/app/build.gradle
index 5da4141f7a9d..47645e15ce99 100755
--- a/packages/cloud_firestore/example/android/app/build.gradle
+++ b/packages/cloud_firestore/example/android/app/build.gradle
@@ -11,19 +11,32 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 27
-    
+
     lintOptions {
         disable 'InvalidPackage'
     }
 
     defaultConfig {
-        minSdkVersion 16
         applicationId 'io.flutter.plugins.firebase.firestoreexample'
+        minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/cloud_functions/example/android/app/build.gradle b/packages/cloud_functions/example/android/app/build.gradle
index 17b4a12411a4..b9c5299da262 100644
--- a/packages/cloud_functions/example/android/app/build.gradle
+++ b/packages/cloud_functions/example/android/app/build.gradle
@@ -13,12 +13,12 @@ if (flutterRoot == null) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    throw new GradleException("versionCode not found. Define flutter.versionCode in the local.properties file.")
+    flutterVersionCode = '1'
 }
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
-    throw new GradleException("versionName not found. Define flutter.versionName in the local.properties file.")
+    flutterVersionName = '1.0'
 }
 
 apply plugin: 'com.android.application'
@@ -32,7 +32,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.flutter.plugins.firebase.cloudfunctions.cloudfunctionsexample"
         minSdkVersion 16
         targetSdkVersion 27
diff --git a/packages/connectivity/example/android/app/build.gradle b/packages/connectivity/example/android/app/build.gradle
index f6c80e3525c6..71806a978283 100644
--- a/packages/connectivity/example/android/app/build.gradle
+++ b/packages/connectivity/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.connectivityexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.connectivityexample"
     }
 
     buildTypes {
diff --git a/packages/device_info/example/android/app/build.gradle b/packages/device_info/example/android/app/build.gradle
index 8fbd0dc4dffc..a039c3abd2cf 100644
--- a/packages/device_info/example/android/app/build.gradle
+++ b/packages/device_info/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.deviceinfoexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.deviceinfoexample"
     }
 
     buildTypes {
diff --git a/packages/firebase_admob/example/android/app/build.gradle b/packages/firebase_admob/example/android/app/build.gradle
index 51b3c6a44d29..89442bce2b2d 100644
--- a/packages/firebase_admob/example/android/app/build.gradle
+++ b/packages/firebase_admob/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.firebaseadmobexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.firebaseadmobexample"
     }
 
     buildTypes {
diff --git a/packages/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/example/android/app/build.gradle
index 540930d2c99f..c32fd9145f1b 100755
--- a/packages/firebase_analytics/example/android/app/build.gradle
+++ b/packages/firebase_analytics/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.firebaseanalyticsexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.firebaseanalyticsexample"
     }
 
     buildTypes {
diff --git a/packages/firebase_auth/example/android/app/build.gradle b/packages/firebase_auth/example/android/app/build.gradle
index 696849ca3aa6..3aa166262333 100755
--- a/packages/firebase_auth/example/android/app/build.gradle
+++ b/packages/firebase_auth/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,8 +32,11 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
         applicationId "io.flutter.plugins.firebaseauthexample"
+        minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/firebase_core/example/android/app/build.gradle b/packages/firebase_core/example/android/app/build.gradle
index 5efba3f9fb64..36268e4b9323 100644
--- a/packages/firebase_core/example/android/app/build.gradle
+++ b/packages/firebase_core/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,8 +32,11 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
         applicationId "io.flutter.plugins.firebasecoreexample"
+        minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/firebase_database/example/android/app/build.gradle b/packages/firebase_database/example/android/app/build.gradle
index 108a6adcdbf7..d7836d9872ed 100755
--- a/packages/firebase_database/example/android/app/build.gradle
+++ b/packages/firebase_database/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,8 +32,11 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
         applicationId 'io.flutter.plugins.firebasedatabaseexample'
+        minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/firebase_dynamic_links/example/android/app/build.gradle b/packages/firebase_dynamic_links/example/android/app/build.gradle
index aac18d2ba06b..30d7bdf372dc 100644
--- a/packages/firebase_dynamic_links/example/android/app/build.gradle
+++ b/packages/firebase_dynamic_links/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -24,6 +34,9 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebasedynamiclinksexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/firebase_messaging/example/android/app/build.gradle b/packages/firebase_messaging/example/android/app/build.gradle
index 634e0f5f20aa..7fb33cf1d015 100644
--- a/packages/firebase_messaging/example/android/app/build.gradle
+++ b/packages/firebase_messaging/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId 'io.flutter.plugins.firebasemessagingexample'
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId 'io.flutter.plugins.firebasemessagingexample'
     }
 
     buildTypes {
diff --git a/packages/firebase_ml_vision/example/android/app/build.gradle b/packages/firebase_ml_vision/example/android/app/build.gradle
index 9383e31cc780..8dba32b0405c 100644
--- a/packages/firebase_ml_vision/example/android/app/build.gradle
+++ b/packages/firebase_ml_vision/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -24,6 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebasemlvisionexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
diff --git a/packages/firebase_performance/example/android/app/build.gradle b/packages/firebase_performance/example/android/app/build.gradle
index 16cc478ef35b..25a5a634d5c8 100644
--- a/packages/firebase_performance/example/android/app/build.gradle
+++ b/packages/firebase_performance/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -25,8 +35,8 @@ android {
         applicationId "io.flutter.plugins.firebaseperformanceexample"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/firebase_remote_config/example/android/app/build.gradle b/packages/firebase_remote_config/example/android/app/build.gradle
index ef095ac5878f..2498d1cc4f98 100644
--- a/packages/firebase_remote_config/example/android/app/build.gradle
+++ b/packages/firebase_remote_config/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,12 +32,11 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.flutter.plugins.firebase.firebaseremoteconfigexample"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/firebase_storage/example/android/app/build.gradle b/packages/firebase_storage/example/android/app/build.gradle
index 7e83c05c325c..86c9a900ddba 100755
--- a/packages/firebase_storage/example/android/app/build.gradle
+++ b/packages/firebase_storage/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,8 +32,11 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
         applicationId 'io.flutter.plugins.firebasestorageexample'
+        minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/google_maps_flutter/example/android/app/build.gradle b/packages/google_maps_flutter/example/android/app/build.gradle
index 49b26a009430..04314837d767 100644
--- a/packages/google_maps_flutter/example/android/app/build.gradle
+++ b/packages/google_maps_flutter/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -25,8 +35,8 @@ android {
         applicationId "io.flutter.plugins.googlemapsexample"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/google_sign_in/example/android/app/build.gradle b/packages/google_sign_in/example/android/app/build.gradle
index 17a3fd86e922..0f5f615f762d 100755
--- a/packages/google_sign_in/example/android/app/build.gradle
+++ b/packages/google_sign_in/example/android/app/build.gradle
@@ -11,19 +11,32 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 27
-    
+
     lintOptions {
         disable 'InvalidPackage'
     }
 
     defaultConfig {
-        minSdkVersion 16
         applicationId "io.flutter.plugins.googlesigninexample"
+        minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/image_picker/example/android/app/build.gradle b/packages/image_picker/example/android/app/build.gradle
index a25aef5dc518..af38db3ebd06 100755
--- a/packages/image_picker/example/android/app/build.gradle
+++ b/packages/image_picker/example/android/app/build.gradle
@@ -11,20 +11,32 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 27
-    
+
     lintOptions {
         disable 'InvalidPackage'
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.imagepicker.example"
         minSdkVersion 16
         targetSdkVersion 27
-        applicationId "io.flutter.plugins.imagepicker.example"
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/in_app_purchase/example/android/app/build.gradle b/packages/in_app_purchase/example/android/app/build.gradle
index 7e1672b876fc..5bb13c4c28e2 100644
--- a/packages/in_app_purchase/example/android/app/build.gradle
+++ b/packages/in_app_purchase/example/android/app/build.gradle
@@ -27,8 +27,6 @@ project.ext {
     KEYSTORE_STORE_PASSWORD = keystoreProperties['storePassword']
     KEYSTORE_KEY_ALIAS = keystoreProperties['keyAlias']
     KEYSTORE_KEY_PASSWORD = keystoreProperties['keyPassword']
-    VERSION_CODE = 1
-    VERSION_NAME = "0.1"
 }
 
 if (project.APP_ID == "io.flutter.plugins.inapppurchaseexample.DEFAULT_DO_NOT_USE") {
@@ -48,6 +46,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -71,8 +79,8 @@ android {
         applicationId project.APP_ID
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode Integer.valueOf(VERSION_CODE)
-        versionName VERSION_NAME
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/local_auth/example/android/app/build.gradle b/packages/local_auth/example/android/app/build.gradle
index 7ba1ea94a1d2..2fa5a8b02831 100644
--- a/packages/local_auth/example/android/app/build.gradle
+++ b/packages/local_auth/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.localauthexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.localauthexample"
     }
 
     buildTypes {
diff --git a/packages/location_background/example/android/app/build.gradle b/packages/location_background/example/android/app/build.gradle
index 435c5cbeecc7..c38cbc852959 100644
--- a/packages/location_background/example/android/app/build.gradle
+++ b/packages/location_background/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,12 +32,11 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.flutter.example.locationbackgroundpluginexample"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/package_info/example/android/app/build.gradle b/packages/package_info/example/android/app/build.gradle
index 7575bb421457..d550a2e3f40c 100644
--- a/packages/package_info/example/android/app/build.gradle
+++ b/packages/package_info/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.packageinfoexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.packageinfoexample"
     }
 
     buildTypes {
diff --git a/packages/path_provider/example/android/app/build.gradle b/packages/path_provider/example/android/app/build.gradle
index 8676fd2d3017..cec0f33c8e1d 100644
--- a/packages/path_provider/example/android/app/build.gradle
+++ b/packages/path_provider/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.pathproviderexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.pathproviderexample"
     }
 
     buildTypes {
diff --git a/packages/quick_actions/example/android/app/build.gradle b/packages/quick_actions/example/android/app/build.gradle
index 5e1c503cd036..6f8004f74c38 100644
--- a/packages/quick_actions/example/android/app/build.gradle
+++ b/packages/quick_actions/example/android/app/build.gradle
@@ -11,20 +11,33 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 27
-    
+
     lintOptions {
         disable 'InvalidPackage'
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.quickactionsexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.quickactionsexample"
     }
 
     buildTypes {
diff --git a/packages/sensors/example/android/app/build.gradle b/packages/sensors/example/android/app/build.gradle
index 70ec3f9bd4ec..79dcbffb08a8 100644
--- a/packages/sensors/example/android/app/build.gradle
+++ b/packages/sensors/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.sensorsexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.sensorsexample"
     }
 
     buildTypes {
diff --git a/packages/share/example/android/app/build.gradle b/packages/share/example/android/app/build.gradle
index 732432c192e8..b55eb82d291b 100644
--- a/packages/share/example/android/app/build.gradle
+++ b/packages/share/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.shareexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.shareexample"
     }
 
     buildTypes {
diff --git a/packages/shared_preferences/example/android/app/build.gradle b/packages/shared_preferences/example/android/app/build.gradle
index 1a901371ff3f..75fcec6a41c5 100644
--- a/packages/shared_preferences/example/android/app/build.gradle
+++ b/packages/shared_preferences/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.sharedpreferencesexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.sharedpreferencesexample"
     }
 
     buildTypes {
diff --git a/packages/url_launcher/example/android/app/build.gradle b/packages/url_launcher/example/android/app/build.gradle
index b248e0da88d2..6e480a14c034 100644
--- a/packages/url_launcher/example/android/app/build.gradle
+++ b/packages/url_launcher/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,9 +32,12 @@ android {
     }
 
     defaultConfig {
+        applicationId "io.flutter.plugins.urllauncherexample"
         minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        applicationId "io.flutter.plugins.urllauncherexample"
     }
 
     buildTypes {
diff --git a/packages/video_player/example/android/app/build.gradle b/packages/video_player/example/android/app/build.gradle
index a6ddbff61af8..5eece97c4f48 100644
--- a/packages/video_player/example/android/app/build.gradle
+++ b/packages/video_player/example/android/app/build.gradle
@@ -11,6 +11,16 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -22,8 +32,11 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
         applicationId "io.flutter.plugins.videoplayerexample"
+        minSdkVersion 16
+        targetSdkVersion 28
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

From fe03e4072cfb89b1fc0309bb2070a88ea02d4cde Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Mon, 14 Jan 2019 14:29:52 -0800
Subject: [PATCH 060/410] [IAP] Check if the payment processor is available
 (#1057)

The actual functionality here is extremely minimal. Most of this patch
is establishing the structure of the rest of the plugin code to follow.

1. Add a generic IAP plugin interface with platform-specific
   implementations (`*_connection.dart`.)
2. Add platform specific wrappers (`*_wrappers.dart`).
3. Add dart end to end tests covering the sample app and unit tests
   covering dart and the platform code. These all need to be run manually
   currently.

Fixes flutter/flutter#26321
flutter/flutter#25987
---
 packages/in_app_purchase/README.md            |  19 ++-
 packages/in_app_purchase/android/build.gradle |   4 +
 .../gradle/wrapper/gradle-wrapper.properties  |   6 +
 .../plugins/InAppPurchasePlugin.java          |  25 ---
 .../inapppurchase/InAppPurchasePlugin.java    | 105 ++++++++++++
 .../example/android/app/build.gradle          |   2 +
 .../InAppPurchasePluginTest.java              | 105 ++++++++++++
 .../org.mockito.plugins.MockMaker             |   1 +
 .../ios/Runner.xcodeproj/project.pbxproj      | 150 +++++++++++++++++-
 .../xcshareddata/xcschemes/Runner.xcscheme    |  14 +-
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 +
 .../in_app_purchase_pluginTests/Info.plist    |  22 +++
 .../in_app_purchase_pluginTests.m             |  36 +++++
 .../in_app_purchase/example/lib/main.dart     |  75 +++++----
 packages/in_app_purchase/example/pubspec.yaml |   6 +-
 .../example/test/widget_test.dart             |  25 ---
 .../example/test_driver/app.dart              |   7 +
 .../example/test_driver/app_test.dart         |  24 +++
 .../ios/Classes/InAppPurchasePlugin.h         |   2 +-
 .../ios/Classes/InAppPurchasePlugin.m         |  20 ++-
 .../lib/billing_client_wrappers.dart          |   1 +
 .../in_app_purchase/lib/in_app_purchase.dart  |  15 --
 .../lib/in_app_purchase_connection.dart       |   1 +
 .../billing_client_wrapper.dart               | 115 ++++++++++++++
 packages/in_app_purchase/lib/src/channel.dart |  16 ++
 .../app_store_connection.dart                 |  25 +++
 .../google_play_connection.dart               |  58 +++++++
 .../in_app_purchase_connection.dart           |  34 ++++
 .../sk_payment_queue_wrapper.dart             |  13 ++
 .../lib/store_kit_wrappers.dart               |   1 +
 packages/in_app_purchase/pubspec.yaml         |  11 +-
 .../billing_client_wrapper_test.dart          |  70 ++++++++
 .../test/fake_platform_views_controller.dart  |  28 ++++
 .../app_store_connection_test.dart            |  30 ++++
 .../google_play_connection_test.dart          |  66 ++++++++
 .../sk_payment_queue_wrapper_test.dart        |  31 ++++
 36 files changed, 1055 insertions(+), 116 deletions(-)
 create mode 100644 packages/in_app_purchase/android/gradle/wrapper/gradle-wrapper.properties
 delete mode 100644 packages/in_app_purchase/android/src/main/java/io/flutter/inapppurchase/plugins/InAppPurchasePlugin.java
 create mode 100644 packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
 create mode 100644 packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
 create mode 100644 packages/in_app_purchase/example/android/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
 create mode 100644 packages/in_app_purchase/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Info.plist
 create mode 100644 packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/in_app_purchase_pluginTests.m
 delete mode 100644 packages/in_app_purchase/example/test/widget_test.dart
 create mode 100644 packages/in_app_purchase/example/test_driver/app.dart
 create mode 100644 packages/in_app_purchase/example/test_driver/app_test.dart
 create mode 100644 packages/in_app_purchase/lib/billing_client_wrappers.dart
 delete mode 100644 packages/in_app_purchase/lib/in_app_purchase.dart
 create mode 100644 packages/in_app_purchase/lib/in_app_purchase_connection.dart
 create mode 100644 packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
 create mode 100644 packages/in_app_purchase/lib/src/channel.dart
 create mode 100644 packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
 create mode 100644 packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
 create mode 100644 packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
 create mode 100644 packages/in_app_purchase/lib/store_kit_wrappers.dart
 create mode 100644 packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
 create mode 100644 packages/in_app_purchase/test/fake_platform_views_controller.dart
 create mode 100644 packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
 create mode 100644 packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
 create mode 100644 packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart

diff --git a/packages/in_app_purchase/README.md b/packages/in_app_purchase/README.md
index 30ca2bdead57..1622bd10e301 100644
--- a/packages/in_app_purchase/README.md
+++ b/packages/in_app_purchase/README.md
@@ -19,14 +19,17 @@ app](example/README.md) for an example on configuring both.
 
 The API surface is stacked into 2 main layers.
 
-1. [in_app_purchase.dart](lib/in_app_purchase.dart), the generic idiommatic
-   Flutter API. This exposes the most basic IAP-related functionality. The goal
-   is that Flutter apps should be able to use this API surface on its own for
-   the vast majority of cases.
+1. [in_app_purchase_connection.dart](lib/src/in_app_purchase_connection.dart),
+   the generic idiommatic Flutter API. This exposes the most basic IAP-related
+   functionality. The goal is that Flutter apps should be able to use this API
+   surface on its own for the vast majority of cases.
+   [google_play_connection.dart](lib/src/google_play_connection.dart) and
+   [app_store_connection.dart](lib/src/app_store_connection.dart) implement this
+   for the specific platforms.
 
 2. The dart wrappers around the platform specific IAP APIs and their platform
    specific implementations of the generic interface. See
-   [google_play.dart](lib/google_play.dart) and
-   [app_store.dart](lib/app_store.dart). These API surfaces should expose all
-   the platform-specific behavior and allow for more fine-tuned control when
-   needed.
+   [store_kit_wrappers.dart](lib/src/store_kit_wrappers.dart) and
+   [billing_client_wrappers.dart](lib/src/billing_client_wrappers.dart). These
+   API surfaces should expose all the platform-specific behavior and allow for
+   more fine-tuned control when needed.
diff --git a/packages/in_app_purchase/android/build.gradle b/packages/in_app_purchase/android/build.gradle
index 1c5afd35a3fb..82cd6b8bbb35 100644
--- a/packages/in_app_purchase/android/build.gradle
+++ b/packages/in_app_purchase/android/build.gradle
@@ -35,4 +35,8 @@ android {
 
 dependencies {
     implementation 'com.android.billingclient:billing:1.2'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.17.0'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/packages/in_app_purchase/android/gradle/wrapper/gradle-wrapper.properties b/packages/in_app_purchase/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..fa3b92d587b9
--- /dev/null
+++ b/packages/in_app_purchase/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Oct 29 10:30:44 PDT 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/inapppurchase/plugins/InAppPurchasePlugin.java b/packages/in_app_purchase/android/src/main/java/io/flutter/inapppurchase/plugins/InAppPurchasePlugin.java
deleted file mode 100644
index 4bc3e8365bfc..000000000000
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/inapppurchase/plugins/InAppPurchasePlugin.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.flutter.plugins.inapppurchase;
-
-import io.flutter.plugin.common.MethodCall;
-import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
-import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
-
-/** InAppPurchasePlugin */
-public class InAppPurchasePlugin implements MethodCallHandler {
-  /** Plugin registration. */
-  public static void registerWith(Registrar registrar) {
-    final MethodChannel channel = new MethodChannel(registrar.messenger(), "in_app_purchase");
-    channel.setMethodCallHandler(new InAppPurchasePlugin());
-  }
-
-  @Override
-  public void onMethodCall(MethodCall call, Result result) {
-    if (call.method.equals("getPlatformVersion")) {
-      result.success("Android " + android.os.Build.VERSION.RELEASE);
-    } else {
-      result.notImplemented();
-    }
-  }
-}
diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
new file mode 100644
index 000000000000..78cdc83bee66
--- /dev/null
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
@@ -0,0 +1,105 @@
+package io.flutter.plugins.inapppurchase;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import com.android.billingclient.api.BillingClient;
+import com.android.billingclient.api.BillingClientStateListener;
+import com.android.billingclient.api.Purchase;
+import com.android.billingclient.api.PurchasesUpdatedListener;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
+import io.flutter.plugin.common.MethodChannel.Result;
+import io.flutter.plugin.common.PluginRegistry.Registrar;
+import java.lang.Override;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/** Wraps a {@link BillingClient} instance and responds to Dart calls for it. */
+public class InAppPurchasePlugin implements MethodCallHandler {
+  private @Nullable BillingClient billingClient;
+  private final Context context;
+  private final MethodChannel channel;
+
+  /** Plugin registration. */
+  public static void registerWith(Registrar registrar) {
+    final MethodChannel channel =
+        new MethodChannel(registrar.messenger(), "plugins.flutter.io/in_app_purchase");
+    channel.setMethodCallHandler(new InAppPurchasePlugin(registrar.context(), channel));
+  }
+
+  public InAppPurchasePlugin(Context context, MethodChannel channel) {
+    this.context = context;
+    this.channel = channel;
+  }
+
+  @Override
+  public void onMethodCall(MethodCall call, Result result) {
+    switch (call.method) {
+      case "BillingClient#isReady()":
+        isReady(result);
+        break;
+      case "BillingClient#startConnection(BillingClientStateListener)":
+        startConnection((int) call.argument("handle"), result);
+        break;
+      case "BillingClient#endConnection()":
+        endConnection(result);
+        break;
+      default:
+        result.notImplemented();
+    }
+  }
+
+  @VisibleForTesting
+  /*package*/ InAppPurchasePlugin(BillingClient billingClient, MethodChannel channel) {
+    this.billingClient = billingClient;
+    this.channel = channel;
+    this.context = null;
+  }
+
+  private void startConnection(final int handle, final Result result) {
+    if (billingClient == null) {
+      billingClient = buildBillingClient(context);
+    }
+
+    billingClient.startConnection(
+        new BillingClientStateListener() {
+          @Override
+          public void onBillingSetupFinished(int responseCode) {
+            // Consider the fact that we've finished a success, leave it to the Dart side to validate the responseCode.
+            result.success(responseCode);
+          }
+
+          @Override
+          public void onBillingServiceDisconnected() {
+            final Map<String, Object> arguments = new HashMap<>();
+            arguments.put("handle", handle);
+            channel.invokeMethod(
+                "BillingClientStateListener#onBillingServiceDisconnected()", arguments);
+          }
+        });
+  }
+
+  private void endConnection(final Result result) {
+    billingClient.endConnection();
+    billingClient = null;
+    result.success(null);
+  }
+
+  private void isReady(Result result) {
+    result.success(billingClient.isReady());
+  }
+
+  private static BillingClient buildBillingClient(Context context) {
+    return BillingClient.newBuilder(context)
+        .setListener(
+            new PurchasesUpdatedListener() {
+              @Override
+              public void onPurchasesUpdated(
+                  int responseCode, @Nullable List<Purchase> purchases) {}
+            })
+        .build();
+  }
+}
diff --git a/packages/in_app_purchase/example/android/app/build.gradle b/packages/in_app_purchase/example/android/app/build.gradle
index 5bb13c4c28e2..f059f885383a 100644
--- a/packages/in_app_purchase/example/android/app/build.gradle
+++ b/packages/in_app_purchase/example/android/app/build.gradle
@@ -108,7 +108,9 @@ flutter {
 }
 
 dependencies {
+    implementation 'com.android.billingclient:billing:1.2'
     testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.17.0'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
new file mode 100644
index 000000000000..a49109387bc5
--- /dev/null
+++ b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
@@ -0,0 +1,105 @@
+package io.flutter.plugins.inapppurchase;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.android.billingclient.api.BillingClient;
+import com.android.billingclient.api.BillingClientStateListener;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.MethodChannel.Result;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+
+public class InAppPurchasePluginTest {
+  InAppPurchasePlugin plugin;
+  @Mock BillingClient mockBillingClient;
+  @Mock MethodChannel mockMethodChannel;
+  @Spy Result result;
+
+  @Before
+  public void setUp() {
+    MockitoAnnotations.initMocks(this);
+    plugin = new InAppPurchasePlugin(mockBillingClient, mockMethodChannel);
+  }
+
+  @Test
+  public void invalidMethod() {
+    MethodCall call = new MethodCall("invalid", null);
+    plugin.onMethodCall(call, result);
+    verify(result, times(1)).notImplemented();
+  }
+
+  @Test
+  public void isReady_true() {
+    MethodCall call = new MethodCall("BillingClient#isReady()", null);
+    when(mockBillingClient.isReady()).thenReturn(true);
+    plugin.onMethodCall(call, result);
+    verify(result).success(true);
+  }
+
+  @Test
+  public void isReady_false() {
+    MethodCall call = new MethodCall("BillingClient#isReady()", null);
+    when(mockBillingClient.isReady()).thenReturn(false);
+    plugin.onMethodCall(call, result);
+    verify(result).success(false);
+  }
+
+  @Test
+  public void startConnection() {
+    Map<String, Integer> arguments = new HashMap<>();
+    arguments.put("handle", 1);
+    MethodCall call =
+        new MethodCall("BillingClient#startConnection(BillingClientStateListener)", arguments);
+    ArgumentCaptor<BillingClientStateListener> captor =
+        ArgumentCaptor.forClass(BillingClientStateListener.class);
+    doNothing().when(mockBillingClient).startConnection(captor.capture());
+
+    plugin.onMethodCall(call, result);
+    verify(result, never()).success(any());
+    captor.getValue().onBillingSetupFinished(100);
+
+    verify(result, times(1)).success(100);
+  }
+
+  @Test
+  public void endConnection() {
+    // Set up a connected BillingClient instance
+    final int disconnectCallbackHandle = 22;
+    Map<String, Integer> arguments = new HashMap<>();
+    arguments.put("handle", disconnectCallbackHandle);
+    MethodCall connectCall =
+        new MethodCall("BillingClient#startConnection(BillingClientStateListener)", arguments);
+    ArgumentCaptor<BillingClientStateListener> captor =
+        ArgumentCaptor.forClass(BillingClientStateListener.class);
+    doNothing().when(mockBillingClient).startConnection(captor.capture());
+    plugin.onMethodCall(connectCall, mock(Result.class));
+    final BillingClientStateListener stateListener = captor.getValue();
+
+    // Disconnect the connected client
+    MethodCall disconnectCall = new MethodCall("BillingClient#endConnection()", null);
+    plugin.onMethodCall(disconnectCall, result);
+
+    // Verify that the client is disconnected and that the OnDisconnect callback has been triggered
+    verify(result, times(1)).success(any());
+    verify(mockBillingClient, times(1)).endConnection();
+    stateListener.onBillingServiceDisconnected();
+    Map<String, Integer> expectedInvocation = new HashMap<>();
+    expectedInvocation.put("handle", disconnectCallbackHandle);
+    verify(mockMethodChannel, times(1))
+        .invokeMethod(
+            "BillingClientStateListener#onBillingServiceDisconnected()", expectedInvocation);
+  }
+}
diff --git a/packages/in_app_purchase/example/android/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/packages/in_app_purchase/example/android/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 000000000000..1f0955d450f0
--- /dev/null
+++ b/packages/in_app_purchase/example/android/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
diff --git a/packages/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj b/packages/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj
index 0feca7ca869d..c60b5a8e36a2 100644
--- a/packages/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj
@@ -15,16 +15,25 @@
 		861D0D93B0757D95C8A69620 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2AB6BE1D4E2232AB5D4A002 /* libPods-Runner.a */; };
 		9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
 		9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
-		9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
 		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
 		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		A5279298219369C600FF69E6 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5279297219369C600FF69E6 /* StoreKit.framework */; };
+		A59001A721E69658004A3E5E /* in_app_purchase_pluginTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A59001A621E69658004A3E5E /* in_app_purchase_pluginTests.m */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		A59001A921E69658004A3E5E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
+			remoteInfo = Runner;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -59,6 +68,9 @@
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A5279297219369C600FF69E6 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
+		A59001A421E69658004A3E5E /* in_app_purchase_pluginTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = in_app_purchase_pluginTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		A59001A621E69658004A3E5E /* in_app_purchase_pluginTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = in_app_purchase_pluginTests.m; sourceTree = "<group>"; };
+		A59001A821E69658004A3E5E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		B2AB6BE1D4E2232AB5D4A002 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -74,6 +86,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		A59001A121E69658004A3E5E /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -103,6 +122,7 @@
 			children = (
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
+				A59001A521E69658004A3E5E /* in_app_purchase_pluginTests */,
 				97C146EF1CF9000F007C117D /* Products */,
 				2D4BBB2E0E7B18550E80D50C /* Pods */,
 				E4DB99639FAD8ADED6B572FC /* Frameworks */,
@@ -113,6 +133,7 @@
 			isa = PBXGroup;
 			children = (
 				97C146EE1CF9000F007C117D /* Runner.app */,
+				A59001A421E69658004A3E5E /* in_app_purchase_pluginTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -141,6 +162,15 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		A59001A521E69658004A3E5E /* in_app_purchase_pluginTests */ = {
+			isa = PBXGroup;
+			children = (
+				A59001A621E69658004A3E5E /* in_app_purchase_pluginTests.m */,
+				A59001A821E69658004A3E5E /* Info.plist */,
+			);
+			path = in_app_purchase_pluginTests;
+			sourceTree = "<group>";
+		};
 		E4DB99639FAD8ADED6B572FC /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -175,13 +205,32 @@
 			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
 			productType = "com.apple.product-type.application";
 		};
+		A59001A321E69658004A3E5E /* in_app_purchase_pluginTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A59001AD21E69658004A3E5E /* Build configuration list for PBXNativeTarget "in_app_purchase_pluginTests" */;
+			buildPhases = (
+				A59001A021E69658004A3E5E /* Sources */,
+				A59001A121E69658004A3E5E /* Frameworks */,
+				A59001A221E69658004A3E5E /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A59001AA21E69658004A3E5E /* PBXTargetDependency */,
+			);
+			name = in_app_purchase_pluginTests;
+			productName = in_app_purchase_pluginTests;
+			productReference = A59001A421E69658004A3E5E /* in_app_purchase_pluginTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0910;
+				DefaultBuildSystemTypeForWorkspace = Original;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "The Chromium Authors";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -192,6 +241,11 @@
 							};
 						};
 					};
+					A59001A321E69658004A3E5E = {
+						CreatedOnToolsVersion = 10.0;
+						ProvisioningStyle = Automatic;
+						TestTargetID = 97C146ED1CF9000F007C117D;
+					};
 				};
 			};
 			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
@@ -208,6 +262,7 @@
 			projectRoot = "";
 			targets = (
 				97C146ED1CF9000F007C117D /* Runner */,
+				A59001A321E69658004A3E5E /* in_app_purchase_pluginTests */,
 			);
 		};
 /* End PBXProject section */
@@ -218,15 +273,20 @@
 			buildActionMask = 2147483647;
 			files = (
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
-				9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		A59001A221E69658004A3E5E /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -307,8 +367,24 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		A59001A021E69658004A3E5E /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A59001A721E69658004A3E5E /* in_app_purchase_pluginTests.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		A59001AA21E69658004A3E5E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 97C146ED1CF9000F007C117D /* Runner */;
+			targetProxy = A59001A921E69658004A3E5E /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -343,12 +419,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -397,12 +475,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -477,6 +557,57 @@
 			};
 			name = Release;
 		};
+		A59001AB21E69658004A3E5E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				INFOPLIST_FILE = in_app_purchase_pluginTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = "sample.changme.in-app-purchase-pluginTests";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/Runner";
+			};
+			name = Debug;
+		};
+		A59001AC21E69658004A3E5E /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				INFOPLIST_FILE = in_app_purchase_pluginTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = "sample.changme.in-app-purchase-pluginTests";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/Runner";
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -498,6 +629,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		A59001AD21E69658004A3E5E /* Build configuration list for PBXNativeTarget "in_app_purchase_pluginTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A59001AB21E69658004A3E5E /* Debug */,
+				A59001AC21E69658004A3E5E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
diff --git a/packages/in_app_purchase/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/in_app_purchase/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 1263ac84b105..3352cfc3831f 100644
--- a/packages/in_app_purchase/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/packages/in_app_purchase/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A59001A321E69658004A3E5E"
+               BuildableName = "in_app_purchase_pluginTests.xctest"
+               BlueprintName = "in_app_purchase_pluginTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
@@ -46,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/packages/in_app_purchase/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/in_app_purchase/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000000..18d981003d68
--- /dev/null
+++ b/packages/in_app_purchase/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Info.plist b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Info.plist
new file mode 100644
index 000000000000..6c40a6cd0c4a
--- /dev/null
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/in_app_purchase_pluginTests.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/in_app_purchase_pluginTests.m
new file mode 100644
index 000000000000..29ef97ba6cad
--- /dev/null
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/in_app_purchase_pluginTests.m
@@ -0,0 +1,36 @@
+#import <XCTest/XCTest.h>
+#import "InAppPurchasePlugin.h"
+
+@interface in_app_purchase_pluginTests : XCTestCase
+
+@end
+
+@implementation in_app_purchase_pluginTests
+InAppPurchasePlugin* plugin;
+
+- (void)setUp {
+  plugin = [[InAppPurchasePlugin alloc] init];
+}
+
+- (void)tearDown {
+}
+
+- (void)testInvalidMethodCall {
+  FlutterMethodCall* call = [FlutterMethodCall methodCallWithMethodName:@"invalid" arguments:NULL];
+  [plugin handleMethodCall:call
+                    result:^(id result) {
+                      XCTAssert(result == FlutterMethodNotImplemented);
+                    }];
+}
+
+- (void)testCanMakePayments {
+  FlutterMethodCall* call =
+      [FlutterMethodCall methodCallWithMethodName:@"-[SKPaymentQueue canMakePayments:]"
+                                        arguments:NULL];
+  [plugin handleMethodCall:call
+                    result:^(id result) {
+                      XCTAssert(result == [NSNumber numberWithBool:YES]);
+                    }];
+}
+
+@end
diff --git a/packages/in_app_purchase/example/lib/main.dart b/packages/in_app_purchase/example/lib/main.dart
index 82177593dfe8..e214275385c3 100644
--- a/packages/in_app_purchase/example/lib/main.dart
+++ b/packages/in_app_purchase/example/lib/main.dart
@@ -1,8 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:in_app_purchase/in_app_purchase.dart';
+import 'package:in_app_purchase/in_app_purchase_connection.dart';
 
 void main() => runApp(MyApp());
 
@@ -12,32 +11,9 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> {
-  String _platformVersion = 'Unknown';
-
   @override
   void initState() {
     super.initState();
-    initPlatformState();
-  }
-
-  // Platform messages are asynchronous, so we initialize in an async method.
-  Future<void> initPlatformState() async {
-    String platformVersion;
-    // Platform messages may fail, so we use a try/catch PlatformException.
-    try {
-      platformVersion = await InAppPurchase.platformVersion;
-    } on PlatformException {
-      platformVersion = 'Failed to get platform version.';
-    }
-
-    // If the widget was removed from the tree while the asynchronous platform
-    // message was in flight, we want to discard the reply rather than calling
-    // setState to update our non-existent appearance.
-    if (!mounted) return;
-
-    setState(() {
-      _platformVersion = platformVersion;
-    });
   }
 
   @override
@@ -45,12 +21,55 @@ class _MyAppState extends State<MyApp> {
     return MaterialApp(
       home: Scaffold(
         appBar: AppBar(
-          title: const Text('Plugin example app'),
+          title: const Text('IAP Example'),
         ),
         body: Center(
-          child: Text('Running on: $_platformVersion\n'),
-        ),
+            child: FutureBuilder<List<Widget>>(
+                future: buildStorefront(),
+                builder: (BuildContext context,
+                    AsyncSnapshot<List<Widget>> snapshot) {
+                  if (!snapshot.hasData) {
+                    return ListView(children: <Widget>[
+                      buildListCard(
+                          ListTile(title: const Text('Trying to connect...')))
+                    ]);
+                  } else if (snapshot.error != null) {
+                    return ListView(children: <Widget>[
+                      buildListCard(ListTile(
+                          title: Text('Error connecting: ' +
+                              snapshot.error.toString())))
+                    ]);
+                  }
+
+                  return ListView(children: snapshot.data);
+                })),
       ),
     );
   }
+
+  Future<List<Widget>> buildStorefront() async {
+    final bool available = await InAppPurchaseConnection.instance.isAvailable();
+    final Widget storeHeader = buildListCard(ListTile(
+        leading: Icon(available ? Icons.check : Icons.block),
+        title: Text('The store is ' +
+            (available ? 'available' : 'unavailable') +
+            '.')));
+    final List<Widget> children = <Widget>[storeHeader];
+
+    if (!available) {
+      children.add(buildListCard(ListTile(
+          title: Text('Not connected',
+              style: TextStyle(color: ThemeData.light().errorColor)),
+          subtitle: const Text(
+              'Unable to connect to the payments processor. Has this app been configured correctly? See the example README for instructions.'))));
+    } else {
+      children.add(
+          buildListCard(ListTile(title: const Text('Nothing to see yet.'))));
+    }
+
+    return children;
+  }
+
+  static ListTile buildListCard(ListTile innerTile) =>
+      ListTile(title: Card(child: innerTile));
 }
diff --git a/packages/in_app_purchase/example/pubspec.yaml b/packages/in_app_purchase/example/pubspec.yaml
index 498050b78bc8..f6678ec0207b 100644
--- a/packages/in_app_purchase/example/pubspec.yaml
+++ b/packages/in_app_purchase/example/pubspec.yaml
@@ -8,7 +8,8 @@ dependencies:
   cupertino_icons: ^0.1.2
 
 dev_dependencies:
-  flutter_test:
+  test: 1.5.1
+  flutter_driver:
     sdk: flutter
   in_app_purchase:
     path: ../
@@ -16,3 +17,6 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
+environment:
+  sdk: ">=2.0.0-dev.28.0 <3.0.0"
+  flutter: ">=0.4.4 <2.0.0"
diff --git a/packages/in_app_purchase/example/test/widget_test.dart b/packages/in_app_purchase/example/test/widget_test.dart
deleted file mode 100644
index 0a50ae82f2b0..000000000000
--- a/packages/in_app_purchase/example/test/widget_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// This is a basic Flutter widget test.
-// To perform an interaction with a widget in your test, use the WidgetTester utility that Flutter
-// provides. For example, you can send tap and scroll gestures. You can also use WidgetTester to
-// find child widgets in the widget tree, read text, and verify that the values of widget properties
-// are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import '../lib/main.dart';
-
-void main() {
-  testWidgets('Verify Platform version', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(MyApp());
-
-    // Verify that platform version is retrieved.
-    expect(
-        find.byWidgetPredicate(
-          (Widget widget) =>
-              widget is Text && widget.data.startsWith('Running on:'),
-        ),
-        findsOneWidget);
-  });
-}
diff --git a/packages/in_app_purchase/example/test_driver/app.dart b/packages/in_app_purchase/example/test_driver/app.dart
new file mode 100644
index 000000000000..8529fcf7e0b2
--- /dev/null
+++ b/packages/in_app_purchase/example/test_driver/app.dart
@@ -0,0 +1,7 @@
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:in_app_purchase_example/main.dart' as app;
+
+void main() {
+  enableFlutterDriverExtension();
+  app.main();
+}
diff --git a/packages/in_app_purchase/example/test_driver/app_test.dart b/packages/in_app_purchase/example/test_driver/app_test.dart
new file mode 100644
index 000000000000..a45953e278d5
--- /dev/null
+++ b/packages/in_app_purchase/example/test_driver/app_test.dart
@@ -0,0 +1,24 @@
+import 'package:test/test.dart';
+import 'package:flutter_driver/flutter_driver.dart';
+
+void main() {
+  group('Store connection tests', () {
+    FlutterDriver driver;
+    final SerializableFinder connectedFinder =
+        find.text('The store is available.');
+
+    setUpAll(() async {
+      driver = await FlutterDriver.connect();
+    });
+
+    tearDownAll(() async {
+      if (driver != null) {
+        driver.close();
+      }
+    });
+
+    test('can connect', () async {
+      await driver.waitFor(connectedFinder);
+    });
+  });
+}
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
index 49413df710a2..1ddf59ce62bf 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
@@ -1,4 +1,4 @@
 #import <Flutter/Flutter.h>
 
-@interface InAppPurchasePlugin : NSObject <FlutterPlugin>
+@interface InAppPurchasePlugin<SKProductsRequestDelegate> : NSObject <FlutterPlugin>
 @end
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
index 8c63d88c6319..073cd107a33b 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
@@ -1,20 +1,34 @@
 #import "InAppPurchasePlugin.h"
+#import <StoreKit/StoreKit.h>
 
 @implementation InAppPurchasePlugin
+
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
   FlutterMethodChannel* channel =
-      [FlutterMethodChannel methodChannelWithName:@"in_app_purchase"
+      [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/in_app_purchase"
                                   binaryMessenger:[registrar messenger]];
   InAppPurchasePlugin* instance = [[InAppPurchasePlugin alloc] init];
   [registrar addMethodCallDelegate:instance channel:channel];
 }
 
+- (instancetype)init {
+  self = [super init];
+  if (!self) {
+    return nil;
+  }
+  return self;
+}
+
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
-  if ([@"getPlatformVersion" isEqualToString:call.method]) {
-    result([@"iOS " stringByAppendingString:[[UIDevice currentDevice] systemVersion]]);
+  if ([@"-[SKPaymentQueue canMakePayments:]" isEqualToString:call.method]) {
+    [self canMakePayments:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
 }
 
+- (void)canMakePayments:(FlutterResult)result {
+  result([NSNumber numberWithBool:[SKPaymentQueue canMakePayments]]);
+}
+
 @end
diff --git a/packages/in_app_purchase/lib/billing_client_wrappers.dart b/packages/in_app_purchase/lib/billing_client_wrappers.dart
new file mode 100644
index 000000000000..e5fa0e4a3f88
--- /dev/null
+++ b/packages/in_app_purchase/lib/billing_client_wrappers.dart
@@ -0,0 +1 @@
+export 'src/billing_client_wrappers/billing_client_wrapper.dart';
diff --git a/packages/in_app_purchase/lib/in_app_purchase.dart b/packages/in_app_purchase/lib/in_app_purchase.dart
deleted file mode 100644
index 0e04095eae9c..000000000000
--- a/packages/in_app_purchase/lib/in_app_purchase.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/services.dart';
-
-class InAppPurchase {
-  static const MethodChannel _channel = MethodChannel('in_app_purchase');
-
-  static Future<String> get platformVersion async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    final String version = await _channel.invokeMethod('getPlatformVersion');
-    return version;
-  }
-}
diff --git a/packages/in_app_purchase/lib/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/in_app_purchase_connection.dart
new file mode 100644
index 000000000000..908514abbdca
--- /dev/null
+++ b/packages/in_app_purchase/lib/in_app_purchase_connection.dart
@@ -0,0 +1 @@
+export 'src/in_app_purchase_connection/in_app_purchase_connection.dart';
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
new file mode 100644
index 000000000000..f81421ba7b5b
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
@@ -0,0 +1,115 @@
+import 'dart:async';
+import 'package:flutter/services.dart';
+import 'package:flutter/foundation.dart';
+import '../channel.dart';
+
+/// This class can be used directly instead of [InAppPurchaseConnection] to call
+/// Play-specific billing APIs.
+///
+/// Wraps a
+/// [`com.android.billingclient.api.BillingClient`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient)
+/// instance.
+///
+///
+/// In general this API conforms to the Java
+/// `com.android.billingclient.api.BillingClient` API as much as possible, with
+/// some minor changes to account for language differences. Callbacks have been
+/// converted to futures where appropriate.
+class BillingClient {
+  BillingClient() {
+    _channel.setMethodCallHandler(_callHandler);
+  }
+  MethodChannel _channel = Channel.instance;
+
+  // Occasionally methods in the native layer require a Dart callback to be
+  // triggered in response to a Java callback. For example,
+  // [startConnection] registers an [OnBillingServiceDisconnected] callback.
+  // This list of names to callbacks is used to trigger Dart callbacks in
+  // response to those Java callbacks. Dart sends the Java layer a handle to the
+  // matching callback here to remember, and then once its twin is triggered it
+  // sends the handle back over the platform channel. We then access that handle
+  // in this array and call it in Dart code. See also [_callHandler].
+  List<Map<String, Function>> _callbacks = <Map<String, Function>>[];
+
+  /// Calls
+  /// [`BillingClient#isReady()`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.html#isReady())
+  /// to get the ready status of the BillingClient instance.
+  Future<bool> isReady() async =>
+      await _channel.invokeMethod('BillingClient#isReady()');
+
+  /// Calls
+  /// [`BillingClient#startConnection(BillingClientStateListener)`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.html#startconnection)
+  /// to create and connect a `BillingClient` instance.
+  ///
+  /// [onBillingServiceConnected] has been converted from a callback parameter
+  /// to the Future result returned by this function. This returns the
+  /// `BillingClient.BillingResponse` `responseCode` of the connection result.
+  ///
+  /// This triggers the creation of a new `BillingClient` instance in Java if
+  /// one doesn't already exist.
+  Future<BillingResponse> startConnection(
+      {@required
+          OnBillingServiceDisconnected onBillingServiceDisconnected}) async {
+    final Map<String, Function> callbacks = <String, Function>{
+      'OnBillingServiceDisconnected': onBillingServiceDisconnected,
+    };
+    _callbacks.add(callbacks);
+    return BillingResponse._(await _channel.invokeMethod(
+        "BillingClient#startConnection(BillingClientStateListener)",
+        <String, dynamic>{'handle': _callbacks.length - 1}));
+  }
+
+  /// Calls
+  /// [`BillingClient#endConnection(BillingClientStateListener)`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.html#endconnect
+  /// to disconnect a `BillingClient` instance.
+  ///
+  /// Will trigger the [OnBillingServiceDisconnected] callback passed to [startConnection].
+  ///
+  /// This triggers the destruction of the `BillingClient` instance in Java.
+  Future<void> endConnection() async {
+    return _channel.invokeMethod("BillingClient#endConnection()", null);
+  }
+
+  Future<void> _callHandler(MethodCall call) async {
+    switch (call.method) {
+      case 'BillingClientStateListener#onBillingServiceDisconnected()':
+        final int handle = call.arguments['handle'];
+        await _callbacks[handle]['OnBillingServiceDisconnected']();
+        _callbacks.removeAt(handle);
+        break;
+    }
+  }
+}
+
+/// Wraps
+/// [`com.android.billingclient.api.BillingClientStateListener.onServiceDisconnected()`](https://developer.android.com/reference/com/android/billingclient/api/BillingClientStateListener.html#onBillingServiceDisconnected())
+/// to call back on `BillingClient` disconnect.
+typedef void OnBillingServiceDisconnected();
+
+/// Wraps
+/// [`BillingClient.BillingResponse`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.BillingResponse),
+/// possible status codes.
+///
+/// See the `BillingResponse` docs for an explanation of the different constants.
+class BillingResponse {
+  const BillingResponse._(this._code);
+  final int _code;
+  @override
+  String toString() => _code.toString();
+  @override
+  int get hashCode => _code;
+  @override
+  bool operator ==(dynamic other) =>
+      other is BillingResponse && other._code == _code;
+
+  static const BillingResponse FEATURE_NOT_SUPPORTED = BillingResponse._(-2);
+  static const BillingResponse OK = BillingResponse._(0);
+  static const BillingResponse USER_CANCELED = BillingResponse._(1);
+  static const BillingResponse SERVICE_UNAVAILABLE = BillingResponse._(2);
+  static const BillingResponse BILLING_UNAVAILABLE = BillingResponse._(3);
+  static const BillingResponse ITEM_UNAVAILABLE = BillingResponse._(4);
+  static const BillingResponse DEVELOPER_ERROR = BillingResponse._(5);
+  static const BillingResponse ERROR = BillingResponse._(6);
+  static const BillingResponse ITEM_ALREADY_OWNED = BillingResponse._(7);
+  static const BillingResponse ITEM_NOT_OWNED = BillingResponse._(8);
+}
diff --git a/packages/in_app_purchase/lib/src/channel.dart b/packages/in_app_purchase/lib/src/channel.dart
new file mode 100644
index 000000000000..78e9b9b0705b
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/channel.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/services.dart';
+import 'package:meta/meta.dart';
+
+const MethodChannel channel =
+    MethodChannel('plugins.flutter.io/in_app_purchase');
+
+class Channel {
+  static MethodChannel _channel =
+      const MethodChannel('plugins.flutter.io/in_app_purchase');
+  static MethodChannel _override;
+
+  static MethodChannel get instance => _override ?? _channel;
+
+  @visibleForTesting
+  static set override(MethodChannel override) => _override = override;
+}
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
new file mode 100644
index 000000000000..4f7944225aa0
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
@@ -0,0 +1,25 @@
+import 'dart:async';
+
+import '../../store_kit_wrappers.dart';
+import 'in_app_purchase_connection.dart';
+
+/// An [InAppPurchaseConnection] that wraps StoreKit.
+///
+/// This translates various `StoreKit` calls and responses into the
+/// generic plugin API.
+class AppStoreConnection implements InAppPurchaseConnection {
+  static AppStoreConnection get instance => _getOrCreateInstance();
+  static AppStoreConnection _instance;
+
+  @override
+  Future<bool> isAvailable() => SKPaymentQueueWrapper.canMakePayments();
+
+  static AppStoreConnection _getOrCreateInstance() {
+    if (_instance != null) {
+      return _instance;
+    }
+
+    _instance = AppStoreConnection();
+    return _instance;
+  }
+}
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
new file mode 100644
index 000000000000..d52cb6a18501
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
@@ -0,0 +1,58 @@
+import 'dart:async';
+
+import 'package:flutter/widgets.dart';
+import '../../billing_client_wrappers.dart';
+import 'in_app_purchase_connection.dart';
+
+/// An [InAppPurchaseConnection] that wraps Google Play Billing.
+///
+/// This translates various [BillingClient] calls and responses into the
+/// common plugin API.
+class GooglePlayConnection
+    with WidgetsBindingObserver
+    implements InAppPurchaseConnection {
+  GooglePlayConnection._() : _billingClient = BillingClient() {
+    _readyFuture = _connect();
+    WidgetsBinding.instance.addObserver(this);
+  }
+  static GooglePlayConnection get instance => _getOrCreateInstance();
+  static GooglePlayConnection _instance;
+  final BillingClient _billingClient;
+  Future<void> _readyFuture;
+
+  @override
+  Future<bool> isAvailable() async {
+    await _readyFuture;
+    return _billingClient.isReady();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    switch (state) {
+      case AppLifecycleState.paused:
+        _disconnect();
+        break;
+      case AppLifecycleState.resumed:
+        _readyFuture = _connect();
+        break;
+      default:
+    }
+  }
+
+  @visibleForTesting
+  static void reset() => _instance = null;
+
+  static GooglePlayConnection _getOrCreateInstance() {
+    if (_instance != null) {
+      return _instance;
+    }
+
+    _instance = GooglePlayConnection._();
+    return _instance;
+  }
+
+  Future<void> _connect() =>
+      _billingClient.startConnection(onBillingServiceDisconnected: () {});
+
+  Future<void> _disconnect() => _billingClient.endConnection();
+}
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
new file mode 100644
index 000000000000..06ca411410d8
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
@@ -0,0 +1,34 @@
+import 'dart:async';
+import 'dart:io';
+import 'app_store_connection.dart';
+import 'google_play_connection.dart';
+
+/// Basic generic API for making in app purchases across multiple platforms.
+abstract class InAppPurchaseConnection {
+  /// Returns true if the payment platform is ready and available.
+  Future<bool> isAvailable();
+
+  /// The [InAppPurchaseConnection] implemented for this platform.
+  ///
+  /// Throws an [UnsupportedError] when accessed on a platform other than
+  /// Android or iOS.
+  static InAppPurchaseConnection get instance => _getOrCreateInstance();
+  static InAppPurchaseConnection _instance;
+
+  static InAppPurchaseConnection _getOrCreateInstance() {
+    if (_instance != null) {
+      return _instance;
+    }
+
+    if (Platform.isAndroid) {
+      _instance = GooglePlayConnection.instance;
+    } else if (Platform.isIOS) {
+      _instance = AppStoreConnection.instance;
+    } else {
+      throw UnsupportedError(
+          'InAppPurchase plugin only works on Android and iOS.');
+    }
+
+    return _instance;
+  }
+}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
new file mode 100644
index 000000000000..1dd7839364c0
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
@@ -0,0 +1,13 @@
+import 'dart:async';
+import 'package:flutter/services.dart';
+
+import '../channel.dart';
+
+/// A wrapper around [`SKPaymentQueue`](https://developer.apple.com/documentation/storekit/skpaymentqueue?language=objc).
+class SKPaymentQueueWrapper {
+  static MethodChannel _channel = Channel.instance;
+
+  /// Calls [`-[SKPaymentQueue canMakePayments:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506139-canmakepayments?language=objc).
+  static Future<bool> canMakePayments() async =>
+      await _channel.invokeMethod('-[SKPaymentQueue canMakePayments:]');
+}
diff --git a/packages/in_app_purchase/lib/store_kit_wrappers.dart b/packages/in_app_purchase/lib/store_kit_wrappers.dart
new file mode 100644
index 000000000000..db2e4ae18773
--- /dev/null
+++ b/packages/in_app_purchase/lib/store_kit_wrappers.dart
@@ -0,0 +1 @@
+export 'src/store_kit_wrappers/sk_payment_queue_wrapper.dart';
diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml
index 2b0353ba327c..67baf782c062 100644
--- a/packages/in_app_purchase/pubspec.yaml
+++ b/packages/in_app_purchase/pubspec.yaml
@@ -7,16 +7,23 @@ version: 0.0.2
 dependencies:
   flutter:
     sdk: flutter
+  async: ^2.0.8
+  meta: ^1.1.6
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  test: 1.5.1
+  flutter_driver:
+    sdk: flutter
+  in_app_purchase_example:
+    path: example/
 
 flutter:
   plugin:
     androidPackage: io.flutter.plugins.inapppurchase
-    pluginClass: InAppPurchasePlugin    
-    
+    pluginClass: InAppPurchasePlugin
+
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
   flutter: ">=0.4.4 <2.0.0"
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
new file mode 100644
index 000000000000..1758630eab7c
--- /dev/null
+++ b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
@@ -0,0 +1,70 @@
+import 'package:test/test.dart';
+import 'package:flutter/services.dart';
+
+import 'package:in_app_purchase/billing_client_wrappers.dart';
+import 'package:in_app_purchase/src/channel.dart';
+import '../fake_platform_views_controller.dart';
+
+void main() {
+  final FakePlatformViewsController fakePlatformViewsController =
+      FakePlatformViewsController();
+  BillingClient billingClient;
+
+  setUpAll(() {
+    Channel.override = SystemChannels.platform_views;
+    SystemChannels.platform_views.setMockMethodCallHandler(
+        fakePlatformViewsController.fakePlatformViewsMethodHandler);
+  });
+
+  setUp(() {
+    billingClient = BillingClient();
+    fakePlatformViewsController.reset();
+  });
+
+  group('isReady', () {
+    test('true', () async {
+      fakePlatformViewsController.addCall(
+          name: 'BillingClient#isReady()', value: true);
+      expect(await billingClient.isReady(), isTrue);
+    });
+
+    test('false', () async {
+      fakePlatformViewsController.addCall(
+          name: 'BillingClient#isReady()', value: false);
+      expect(await billingClient.isReady(), isFalse);
+    });
+  });
+
+  group('startConnection', () {
+    test('returns BillingResponse', () async {
+      fakePlatformViewsController.addCall(
+          name: 'BillingClient#startConnection(BillingClientStateListener)',
+          value: int.parse(BillingResponse.OK.toString()));
+      expect(
+          await billingClient.startConnection(
+              onBillingServiceDisconnected: () {}),
+          equals(BillingResponse.OK));
+    });
+
+    test('passes handle to onBillingServiceDisconnected', () async {
+      final String methodName =
+          'BillingClient#startConnection(BillingClientStateListener)';
+      fakePlatformViewsController.addCall(
+          name: methodName, value: int.parse(BillingResponse.OK.toString()));
+      await billingClient.startConnection(onBillingServiceDisconnected: () {});
+      final MethodCall call =
+          fakePlatformViewsController.previousCallMatching(methodName);
+      expect(call.arguments, equals(<dynamic, dynamic>{'handle': 0}));
+    });
+  });
+
+  test('endConnection', () async {
+    final String endConnectionName = 'BillingClient#endConnection()';
+    expect(fakePlatformViewsController.countPreviousCalls(endConnectionName),
+        equals(0));
+    fakePlatformViewsController.addCall(name: endConnectionName, value: null);
+    await billingClient.endConnection();
+    expect(fakePlatformViewsController.countPreviousCalls(endConnectionName),
+        equals(1));
+  });
+}
diff --git a/packages/in_app_purchase/test/fake_platform_views_controller.dart b/packages/in_app_purchase/test/fake_platform_views_controller.dart
new file mode 100644
index 000000000000..98b84bd337b8
--- /dev/null
+++ b/packages/in_app_purchase/test/fake_platform_views_controller.dart
@@ -0,0 +1,28 @@
+import 'dart:async';
+import 'package:flutter/services.dart';
+
+class FakePlatformViewsController {
+  Map<String, dynamic> _expectedCalls = <String, dynamic>{};
+  void addCall({String name, dynamic value}) => _expectedCalls[name] = value;
+
+  List<MethodCall> _previousCalls = <MethodCall>[];
+  List<MethodCall> get previousCalls => _previousCalls;
+  MethodCall previousCallMatching(String name) => _previousCalls
+      .firstWhere((MethodCall call) => call.method == name, orElse: () => null);
+  int countPreviousCalls(String name) =>
+      _previousCalls.where((MethodCall call) => call.method == name).length;
+
+  void reset() {
+    _expectedCalls.clear();
+    _previousCalls.clear();
+  }
+
+  Future<dynamic> fakePlatformViewsMethodHandler(MethodCall call) {
+    _previousCalls.add(call);
+    if (_expectedCalls.containsKey(call.method)) {
+      return Future<dynamic>.sync(() => _expectedCalls[call.method]);
+    } else {
+      return Future<void>.sync(() => null);
+    }
+  }
+}
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
new file mode 100644
index 000000000000..a4d7514b186b
--- /dev/null
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
@@ -0,0 +1,30 @@
+import 'package:test/test.dart';
+import 'package:flutter/services.dart';
+
+import 'package:in_app_purchase/src/channel.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/app_store_connection.dart';
+import '../fake_platform_views_controller.dart';
+
+void main() {
+  final FakePlatformViewsController controller = FakePlatformViewsController();
+
+  setUpAll(() {
+    Channel.override = SystemChannels.platform_views;
+    SystemChannels.platform_views
+        .setMockMethodCallHandler(controller.fakePlatformViewsMethodHandler);
+  });
+
+  group('isAvailable', () {
+    test('true', () async {
+      controller.addCall(
+          name: '-[SKPaymentQueue canMakePayments:]', value: true);
+      expect(await AppStoreConnection.instance.isAvailable(), isTrue);
+    });
+
+    test('false', () async {
+      controller.addCall(
+          name: '-[SKPaymentQueue canMakePayments:]', value: false);
+      expect(await AppStoreConnection.instance.isAvailable(), isFalse);
+    });
+  });
+}
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
new file mode 100644
index 000000000000..1674f268f44e
--- /dev/null
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -0,0 +1,66 @@
+import 'package:test/test.dart';
+import 'package:flutter/services.dart';
+
+import 'package:flutter/widgets.dart';
+import 'package:in_app_purchase/billing_client_wrappers.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/google_play_connection.dart';
+import 'package:in_app_purchase/src/channel.dart';
+import '../fake_platform_views_controller.dart';
+
+void main() {
+  final FakePlatformViewsController controller = FakePlatformViewsController();
+  GooglePlayConnection connection;
+  const String startConnectionCall =
+      'BillingClient#startConnection(BillingClientStateListener)';
+  const String endConnectionCall = 'BillingClient#endConnection()';
+
+  setUpAll(() {
+    Channel.override = SystemChannels.platform_views;
+    SystemChannels.platform_views
+        .setMockMethodCallHandler(controller.fakePlatformViewsMethodHandler);
+  });
+
+  setUp(() {
+    WidgetsFlutterBinding.ensureInitialized();
+    controller.addCall(
+        name: startConnectionCall,
+        value: int.parse(BillingResponse.OK.toString()));
+    controller.addCall(name: endConnectionCall, value: null);
+    connection = GooglePlayConnection.instance;
+  });
+
+  tearDown(() {
+    controller.reset();
+    GooglePlayConnection.reset();
+  });
+
+  group('connection management', () {
+    test('connects on initialization', () {
+      expect(controller.countPreviousCalls(startConnectionCall), equals(1));
+    });
+
+    test('disconnects on app pause', () {
+      expect(controller.countPreviousCalls(endConnectionCall), equals(0));
+      connection.didChangeAppLifecycleState(AppLifecycleState.paused);
+      expect(controller.countPreviousCalls(endConnectionCall), equals(1));
+    });
+
+    test('reconnects on app resume', () {
+      expect(controller.countPreviousCalls(startConnectionCall), equals(1));
+      connection.didChangeAppLifecycleState(AppLifecycleState.resumed);
+      expect(controller.countPreviousCalls(startConnectionCall), equals(2));
+    });
+  });
+
+  group('isAvailable', () {
+    test('true', () async {
+      controller.addCall(name: 'BillingClient#isReady()', value: true);
+      expect(await connection.isAvailable(), isTrue);
+    });
+
+    test('false', () async {
+      controller.addCall(name: 'BillingClient#isReady()', value: false);
+      expect(await connection.isAvailable(), isFalse);
+    });
+  });
+}
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
new file mode 100644
index 000000000000..7a8f45851227
--- /dev/null
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/services.dart';
+import 'package:test/test.dart';
+
+import 'package:in_app_purchase/store_kit_wrappers.dart';
+import 'package:in_app_purchase/src/channel.dart';
+import '../fake_platform_views_controller.dart';
+
+void main() {
+  final FakePlatformViewsController fakePlatformViewsController =
+      FakePlatformViewsController();
+
+  setUpAll(() {
+    Channel.override = SystemChannels.platform_views;
+    SystemChannels.platform_views.setMockMethodCallHandler(
+        fakePlatformViewsController.fakePlatformViewsMethodHandler);
+  });
+
+  group('canMakePayments', () {
+    test('YES', () async {
+      fakePlatformViewsController.addCall(
+          name: '-[SKPaymentQueue canMakePayments:]', value: true);
+      expect(await SKPaymentQueueWrapper.canMakePayments(), isTrue);
+    });
+
+    test('NO', () async {
+      fakePlatformViewsController.addCall(
+          name: '-[SKPaymentQueue canMakePayments:]', value: false);
+      expect(await SKPaymentQueueWrapper.canMakePayments(), isFalse);
+    });
+  });
+}

From 5347e8772ea63fada979acc9f7815361e276a13a Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Tue, 15 Jan 2019 15:15:24 -0800
Subject: [PATCH 061/410] [IAP] Clean up Dart unit tests (#1082)

Rename `PlatformViewsController` to `StubInAppPurchasePlatform` to more
accurately describe what it's stubbing. Remove the overcomplicated
`Channel` class and just set a mock handler on the `const MethodChannel`
used by the entire plugin itself.
---
 .../billing_client_wrapper.dart               |  9 +++--
 packages/in_app_purchase/lib/src/channel.dart | 12 -------
 .../sk_payment_queue_wrapper.dart             |  5 +--
 .../billing_client_wrapper_test.dart          | 36 +++++++------------
 .../app_store_connection_test.dart            | 16 ++++-----
 .../google_play_connection_test.dart          | 32 ++++++++---------
 .../sk_payment_queue_wrapper_test.dart        | 17 ++++-----
 ...art => stub_in_app_purchase_platform.dart} |  7 ++--
 8 files changed, 48 insertions(+), 86 deletions(-)
 rename packages/in_app_purchase/test/{fake_platform_views_controller.dart => stub_in_app_purchase_platform.dart} (81%)

diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
index f81421ba7b5b..952cdba26636 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
@@ -17,9 +17,8 @@ import '../channel.dart';
 /// converted to futures where appropriate.
 class BillingClient {
   BillingClient() {
-    _channel.setMethodCallHandler(_callHandler);
+    channel.setMethodCallHandler(_callHandler);
   }
-  MethodChannel _channel = Channel.instance;
 
   // Occasionally methods in the native layer require a Dart callback to be
   // triggered in response to a Java callback. For example,
@@ -35,7 +34,7 @@ class BillingClient {
   /// [`BillingClient#isReady()`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.html#isReady())
   /// to get the ready status of the BillingClient instance.
   Future<bool> isReady() async =>
-      await _channel.invokeMethod('BillingClient#isReady()');
+      await channel.invokeMethod('BillingClient#isReady()');
 
   /// Calls
   /// [`BillingClient#startConnection(BillingClientStateListener)`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.html#startconnection)
@@ -54,7 +53,7 @@ class BillingClient {
       'OnBillingServiceDisconnected': onBillingServiceDisconnected,
     };
     _callbacks.add(callbacks);
-    return BillingResponse._(await _channel.invokeMethod(
+    return BillingResponse._(await channel.invokeMethod(
         "BillingClient#startConnection(BillingClientStateListener)",
         <String, dynamic>{'handle': _callbacks.length - 1}));
   }
@@ -67,7 +66,7 @@ class BillingClient {
   ///
   /// This triggers the destruction of the `BillingClient` instance in Java.
   Future<void> endConnection() async {
-    return _channel.invokeMethod("BillingClient#endConnection()", null);
+    return channel.invokeMethod("BillingClient#endConnection()", null);
   }
 
   Future<void> _callHandler(MethodCall call) async {
diff --git a/packages/in_app_purchase/lib/src/channel.dart b/packages/in_app_purchase/lib/src/channel.dart
index 78e9b9b0705b..695c6c0b3411 100644
--- a/packages/in_app_purchase/lib/src/channel.dart
+++ b/packages/in_app_purchase/lib/src/channel.dart
@@ -1,16 +1,4 @@
 import 'package:flutter/services.dart';
-import 'package:meta/meta.dart';
 
 const MethodChannel channel =
     MethodChannel('plugins.flutter.io/in_app_purchase');
-
-class Channel {
-  static MethodChannel _channel =
-      const MethodChannel('plugins.flutter.io/in_app_purchase');
-  static MethodChannel _override;
-
-  static MethodChannel get instance => _override ?? _channel;
-
-  @visibleForTesting
-  static set override(MethodChannel override) => _override = override;
-}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
index 1dd7839364c0..b55519d5116f 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
@@ -1,13 +1,10 @@
 import 'dart:async';
-import 'package:flutter/services.dart';
 
 import '../channel.dart';
 
 /// A wrapper around [`SKPaymentQueue`](https://developer.apple.com/documentation/storekit/skpaymentqueue?language=objc).
 class SKPaymentQueueWrapper {
-  static MethodChannel _channel = Channel.instance;
-
   /// Calls [`-[SKPaymentQueue canMakePayments:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506139-canmakepayments?language=objc).
   static Future<bool> canMakePayments() async =>
-      await _channel.invokeMethod('-[SKPaymentQueue canMakePayments:]');
+      await channel.invokeMethod('-[SKPaymentQueue canMakePayments:]');
 }
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
index 1758630eab7c..357f325bd407 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
@@ -3,41 +3,34 @@ import 'package:flutter/services.dart';
 
 import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/src/channel.dart';
-import '../fake_platform_views_controller.dart';
+import '../stub_in_app_purchase_platform.dart';
 
 void main() {
-  final FakePlatformViewsController fakePlatformViewsController =
-      FakePlatformViewsController();
+  final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
   BillingClient billingClient;
-
-  setUpAll(() {
-    Channel.override = SystemChannels.platform_views;
-    SystemChannels.platform_views.setMockMethodCallHandler(
-        fakePlatformViewsController.fakePlatformViewsMethodHandler);
-  });
+  setUpAll(() =>
+      channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
 
   setUp(() {
     billingClient = BillingClient();
-    fakePlatformViewsController.reset();
+    stubPlatform.reset();
   });
 
   group('isReady', () {
     test('true', () async {
-      fakePlatformViewsController.addCall(
-          name: 'BillingClient#isReady()', value: true);
+      stubPlatform.addResponse(name: 'BillingClient#isReady()', value: true);
       expect(await billingClient.isReady(), isTrue);
     });
 
     test('false', () async {
-      fakePlatformViewsController.addCall(
-          name: 'BillingClient#isReady()', value: false);
+      stubPlatform.addResponse(name: 'BillingClient#isReady()', value: false);
       expect(await billingClient.isReady(), isFalse);
     });
   });
 
   group('startConnection', () {
     test('returns BillingResponse', () async {
-      fakePlatformViewsController.addCall(
+      stubPlatform.addResponse(
           name: 'BillingClient#startConnection(BillingClientStateListener)',
           value: int.parse(BillingResponse.OK.toString()));
       expect(
@@ -49,22 +42,19 @@ void main() {
     test('passes handle to onBillingServiceDisconnected', () async {
       final String methodName =
           'BillingClient#startConnection(BillingClientStateListener)';
-      fakePlatformViewsController.addCall(
+      stubPlatform.addResponse(
           name: methodName, value: int.parse(BillingResponse.OK.toString()));
       await billingClient.startConnection(onBillingServiceDisconnected: () {});
-      final MethodCall call =
-          fakePlatformViewsController.previousCallMatching(methodName);
+      final MethodCall call = stubPlatform.previousCallMatching(methodName);
       expect(call.arguments, equals(<dynamic, dynamic>{'handle': 0}));
     });
   });
 
   test('endConnection', () async {
     final String endConnectionName = 'BillingClient#endConnection()';
-    expect(fakePlatformViewsController.countPreviousCalls(endConnectionName),
-        equals(0));
-    fakePlatformViewsController.addCall(name: endConnectionName, value: null);
+    expect(stubPlatform.countPreviousCalls(endConnectionName), equals(0));
+    stubPlatform.addResponse(name: endConnectionName, value: null);
     await billingClient.endConnection();
-    expect(fakePlatformViewsController.countPreviousCalls(endConnectionName),
-        equals(1));
+    expect(stubPlatform.countPreviousCalls(endConnectionName), equals(1));
   });
 }
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
index a4d7514b186b..47151d3416e9 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
@@ -1,28 +1,24 @@
 import 'package:test/test.dart';
-import 'package:flutter/services.dart';
 
 import 'package:in_app_purchase/src/channel.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/app_store_connection.dart';
-import '../fake_platform_views_controller.dart';
+import '../stub_in_app_purchase_platform.dart';
 
 void main() {
-  final FakePlatformViewsController controller = FakePlatformViewsController();
+  final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
 
-  setUpAll(() {
-    Channel.override = SystemChannels.platform_views;
-    SystemChannels.platform_views
-        .setMockMethodCallHandler(controller.fakePlatformViewsMethodHandler);
-  });
+  setUpAll(() =>
+      channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
 
   group('isAvailable', () {
     test('true', () async {
-      controller.addCall(
+      stubPlatform.addResponse(
           name: '-[SKPaymentQueue canMakePayments:]', value: true);
       expect(await AppStoreConnection.instance.isAvailable(), isTrue);
     });
 
     test('false', () async {
-      controller.addCall(
+      stubPlatform.addResponse(
           name: '-[SKPaymentQueue canMakePayments:]', value: false);
       expect(await AppStoreConnection.instance.isAvailable(), isFalse);
     });
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index 1674f268f44e..d5d4701e7f71 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -1,65 +1,61 @@
 import 'package:test/test.dart';
-import 'package:flutter/services.dart';
 
 import 'package:flutter/widgets.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/google_play_connection.dart';
 import 'package:in_app_purchase/src/channel.dart';
-import '../fake_platform_views_controller.dart';
+import '../stub_in_app_purchase_platform.dart';
 
 void main() {
-  final FakePlatformViewsController controller = FakePlatformViewsController();
+  final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
   GooglePlayConnection connection;
   const String startConnectionCall =
       'BillingClient#startConnection(BillingClientStateListener)';
   const String endConnectionCall = 'BillingClient#endConnection()';
 
-  setUpAll(() {
-    Channel.override = SystemChannels.platform_views;
-    SystemChannels.platform_views
-        .setMockMethodCallHandler(controller.fakePlatformViewsMethodHandler);
-  });
+  setUpAll(() =>
+      channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
 
   setUp(() {
     WidgetsFlutterBinding.ensureInitialized();
-    controller.addCall(
+    stubPlatform.addResponse(
         name: startConnectionCall,
         value: int.parse(BillingResponse.OK.toString()));
-    controller.addCall(name: endConnectionCall, value: null);
+    stubPlatform.addResponse(name: endConnectionCall, value: null);
     connection = GooglePlayConnection.instance;
   });
 
   tearDown(() {
-    controller.reset();
+    stubPlatform.reset();
     GooglePlayConnection.reset();
   });
 
   group('connection management', () {
     test('connects on initialization', () {
-      expect(controller.countPreviousCalls(startConnectionCall), equals(1));
+      expect(stubPlatform.countPreviousCalls(startConnectionCall), equals(1));
     });
 
     test('disconnects on app pause', () {
-      expect(controller.countPreviousCalls(endConnectionCall), equals(0));
+      expect(stubPlatform.countPreviousCalls(endConnectionCall), equals(0));
       connection.didChangeAppLifecycleState(AppLifecycleState.paused);
-      expect(controller.countPreviousCalls(endConnectionCall), equals(1));
+      expect(stubPlatform.countPreviousCalls(endConnectionCall), equals(1));
     });
 
     test('reconnects on app resume', () {
-      expect(controller.countPreviousCalls(startConnectionCall), equals(1));
+      expect(stubPlatform.countPreviousCalls(startConnectionCall), equals(1));
       connection.didChangeAppLifecycleState(AppLifecycleState.resumed);
-      expect(controller.countPreviousCalls(startConnectionCall), equals(2));
+      expect(stubPlatform.countPreviousCalls(startConnectionCall), equals(2));
     });
   });
 
   group('isAvailable', () {
     test('true', () async {
-      controller.addCall(name: 'BillingClient#isReady()', value: true);
+      stubPlatform.addResponse(name: 'BillingClient#isReady()', value: true);
       expect(await connection.isAvailable(), isTrue);
     });
 
     test('false', () async {
-      controller.addCall(name: 'BillingClient#isReady()', value: false);
+      stubPlatform.addResponse(name: 'BillingClient#isReady()', value: false);
       expect(await connection.isAvailable(), isFalse);
     });
   });
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
index 7a8f45851227..594cf3e8b696 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
@@ -1,29 +1,24 @@
-import 'package:flutter/services.dart';
 import 'package:test/test.dart';
 
 import 'package:in_app_purchase/store_kit_wrappers.dart';
 import 'package:in_app_purchase/src/channel.dart';
-import '../fake_platform_views_controller.dart';
+import '../stub_in_app_purchase_platform.dart';
 
 void main() {
-  final FakePlatformViewsController fakePlatformViewsController =
-      FakePlatformViewsController();
+  final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
 
-  setUpAll(() {
-    Channel.override = SystemChannels.platform_views;
-    SystemChannels.platform_views.setMockMethodCallHandler(
-        fakePlatformViewsController.fakePlatformViewsMethodHandler);
-  });
+  setUpAll(() =>
+      channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
 
   group('canMakePayments', () {
     test('YES', () async {
-      fakePlatformViewsController.addCall(
+      stubPlatform.addResponse(
           name: '-[SKPaymentQueue canMakePayments:]', value: true);
       expect(await SKPaymentQueueWrapper.canMakePayments(), isTrue);
     });
 
     test('NO', () async {
-      fakePlatformViewsController.addCall(
+      stubPlatform.addResponse(
           name: '-[SKPaymentQueue canMakePayments:]', value: false);
       expect(await SKPaymentQueueWrapper.canMakePayments(), isFalse);
     });
diff --git a/packages/in_app_purchase/test/fake_platform_views_controller.dart b/packages/in_app_purchase/test/stub_in_app_purchase_platform.dart
similarity index 81%
rename from packages/in_app_purchase/test/fake_platform_views_controller.dart
rename to packages/in_app_purchase/test/stub_in_app_purchase_platform.dart
index 98b84bd337b8..f10187ce0846 100644
--- a/packages/in_app_purchase/test/fake_platform_views_controller.dart
+++ b/packages/in_app_purchase/test/stub_in_app_purchase_platform.dart
@@ -1,9 +1,10 @@
 import 'dart:async';
 import 'package:flutter/services.dart';
 
-class FakePlatformViewsController {
+class StubInAppPurchasePlatform {
   Map<String, dynamic> _expectedCalls = <String, dynamic>{};
-  void addCall({String name, dynamic value}) => _expectedCalls[name] = value;
+  void addResponse({String name, dynamic value}) =>
+      _expectedCalls[name] = value;
 
   List<MethodCall> _previousCalls = <MethodCall>[];
   List<MethodCall> get previousCalls => _previousCalls;
@@ -17,7 +18,7 @@ class FakePlatformViewsController {
     _previousCalls.clear();
   }
 
-  Future<dynamic> fakePlatformViewsMethodHandler(MethodCall call) {
+  Future<dynamic> fakeMethodCallHandler(MethodCall call) {
     _previousCalls.add(call);
     if (_expectedCalls.containsKey(call.method)) {
       return Future<dynamic>.sync(() => _expectedCalls[call.method]);

From 6bbaa7e52f4a1674d09750ebb3c63aaa4226b0b1 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Tue, 15 Jan 2019 16:35:02 -0800
Subject: [PATCH 062/410] [IAP] Add missing license headers (#1083)

---
 .../io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java | 4 ++++
 .../java/com/example/inapppurchaseexample/MainActivity.java   | 4 ++++
 packages/in_app_purchase/example/lib/main.dart                | 4 ++++
 packages/in_app_purchase/example/test_driver/app.dart         | 4 ++++
 packages/in_app_purchase/example/test_driver/app_test.dart    | 4 ++++
 packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h    | 4 ++++
 packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m    | 4 ++++
 packages/in_app_purchase/lib/billing_client_wrappers.dart     | 4 ++++
 packages/in_app_purchase/lib/in_app_purchase_connection.dart  | 4 ++++
 .../src/billing_client_wrappers/billing_client_wrapper.dart   | 4 ++++
 packages/in_app_purchase/lib/src/channel.dart                 | 4 ++++
 .../src/in_app_purchase_connection/app_store_connection.dart  | 4 ++++
 .../in_app_purchase_connection/google_play_connection.dart    | 4 ++++
 .../in_app_purchase_connection.dart                           | 4 ++++
 .../lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart  | 4 ++++
 packages/in_app_purchase/lib/store_kit_wrappers.dart          | 4 ++++
 .../billing_client_wrappers/billing_client_wrapper_test.dart  | 4 ++++
 .../in_app_purchase_connection/app_store_connection_test.dart | 4 ++++
 .../google_play_connection_test.dart                          | 4 ++++
 .../store_kit_wrappers/sk_payment_queue_wrapper_test.dart     | 4 ++++
 .../in_app_purchase/test/stub_in_app_purchase_platform.dart   | 4 ++++
 21 files changed, 84 insertions(+)

diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
index 78cdc83bee66..86edf2a3b5fc 100644
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugins.inapppurchase;
 
 import android.content.Context;
diff --git a/packages/in_app_purchase/example/android/app/src/main/java/com/example/inapppurchaseexample/MainActivity.java b/packages/in_app_purchase/example/android/app/src/main/java/com/example/inapppurchaseexample/MainActivity.java
index 9c9412e13194..2f75b8330670 100644
--- a/packages/in_app_purchase/example/android/app/src/main/java/com/example/inapppurchaseexample/MainActivity.java
+++ b/packages/in_app_purchase/example/android/app/src/main/java/com/example/inapppurchaseexample/MainActivity.java
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugins.inapppurchaseexample;
 
 import android.os.Bundle;
diff --git a/packages/in_app_purchase/example/lib/main.dart b/packages/in_app_purchase/example/lib/main.dart
index e214275385c3..edf3db140183 100644
--- a/packages/in_app_purchase/example/lib/main.dart
+++ b/packages/in_app_purchase/example/lib/main.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'dart:async';
 
 import 'package:flutter/material.dart';
diff --git a/packages/in_app_purchase/example/test_driver/app.dart b/packages/in_app_purchase/example/test_driver/app.dart
index 8529fcf7e0b2..051f7a128cf5 100644
--- a/packages/in_app_purchase/example/test_driver/app.dart
+++ b/packages/in_app_purchase/example/test_driver/app.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'package:flutter_driver/driver_extension.dart';
 import 'package:in_app_purchase_example/main.dart' as app;
 
diff --git a/packages/in_app_purchase/example/test_driver/app_test.dart b/packages/in_app_purchase/example/test_driver/app_test.dart
index a45953e278d5..abc518540cf9 100644
--- a/packages/in_app_purchase/example/test_driver/app_test.dart
+++ b/packages/in_app_purchase/example/test_driver/app_test.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'package:test/test.dart';
 import 'package:flutter_driver/flutter_driver.dart';
 
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
index 1ddf59ce62bf..efcbce94e84e 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #import <Flutter/Flutter.h>
 
 @interface InAppPurchasePlugin<SKProductsRequestDelegate> : NSObject <FlutterPlugin>
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
index 073cd107a33b..50825abb566f 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #import "InAppPurchasePlugin.h"
 #import <StoreKit/StoreKit.h>
 
diff --git a/packages/in_app_purchase/lib/billing_client_wrappers.dart b/packages/in_app_purchase/lib/billing_client_wrappers.dart
index e5fa0e4a3f88..f9f28eb01a65 100644
--- a/packages/in_app_purchase/lib/billing_client_wrappers.dart
+++ b/packages/in_app_purchase/lib/billing_client_wrappers.dart
@@ -1 +1,5 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 export 'src/billing_client_wrappers/billing_client_wrapper.dart';
diff --git a/packages/in_app_purchase/lib/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/in_app_purchase_connection.dart
index 908514abbdca..e6d6ac627c55 100644
--- a/packages/in_app_purchase/lib/in_app_purchase_connection.dart
+++ b/packages/in_app_purchase/lib/in_app_purchase_connection.dart
@@ -1 +1,5 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 export 'src/in_app_purchase_connection/in_app_purchase_connection.dart';
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
index 952cdba26636..fd6f5d67aa33 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'dart:async';
 import 'package:flutter/services.dart';
 import 'package:flutter/foundation.dart';
diff --git a/packages/in_app_purchase/lib/src/channel.dart b/packages/in_app_purchase/lib/src/channel.dart
index 695c6c0b3411..7fc9e1a3dda5 100644
--- a/packages/in_app_purchase/lib/src/channel.dart
+++ b/packages/in_app_purchase/lib/src/channel.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'package:flutter/services.dart';
 
 const MethodChannel channel =
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
index 4f7944225aa0..abb4b94ee1af 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'dart:async';
 
 import '../../store_kit_wrappers.dart';
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
index d52cb6a18501..91546ebfb25a 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'dart:async';
 
 import 'package:flutter/widgets.dart';
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
index 06ca411410d8..439a101aec47 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'dart:async';
 import 'dart:io';
 import 'app_store_connection.dart';
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
index b55519d5116f..a006f802342b 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'dart:async';
 
 import '../channel.dart';
diff --git a/packages/in_app_purchase/lib/store_kit_wrappers.dart b/packages/in_app_purchase/lib/store_kit_wrappers.dart
index db2e4ae18773..a216687c4013 100644
--- a/packages/in_app_purchase/lib/store_kit_wrappers.dart
+++ b/packages/in_app_purchase/lib/store_kit_wrappers.dart
@@ -1 +1,5 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 export 'src/store_kit_wrappers/sk_payment_queue_wrapper.dart';
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
index 357f325bd407..03e7d033912e 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'package:test/test.dart';
 import 'package:flutter/services.dart';
 
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
index 47151d3416e9..5d17b4380a63 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'package:test/test.dart';
 
 import 'package:in_app_purchase/src/channel.dart';
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index d5d4701e7f71..8c9262b4d279 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'package:test/test.dart';
 
 import 'package:flutter/widgets.dart';
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
index 594cf3e8b696..09f7bcbccc10 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'package:test/test.dart';
 
 import 'package:in_app_purchase/store_kit_wrappers.dart';
diff --git a/packages/in_app_purchase/test/stub_in_app_purchase_platform.dart b/packages/in_app_purchase/test/stub_in_app_purchase_platform.dart
index f10187ce0846..9fd015975fc1 100644
--- a/packages/in_app_purchase/test/stub_in_app_purchase_platform.dart
+++ b/packages/in_app_purchase/test/stub_in_app_purchase_platform.dart
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'dart:async';
 import 'package:flutter/services.dart';
 

From 229b0fc79b9050ff5d2c3f83bb349d7dd2bc1bee Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Tue, 15 Jan 2019 21:48:49 -0800
Subject: [PATCH 063/410] Url launcher ios universallinksonly (#1062)

Added a setting universalLinksOnly for IOS with version >= 10.0

Updated the version to 4.1.0 because there is a breaking change updating launch to return bool from void
---
 packages/url_launcher/CHANGELOG.md            |  5 ++
 .../urllauncher/UrlLauncherPlugin.java        |  2 +-
 packages/url_launcher/example/lib/main.dart   | 23 +++++++++
 .../ios/Classes/UrlLauncherPlugin.m           | 31 +++++-------
 packages/url_launcher/lib/url_launcher.dart   | 48 +++++++++++++------
 packages/url_launcher/pubspec.yaml            |  2 +-
 .../url_launcher/test/url_launcher_test.dart  | 22 +++++++++
 7 files changed, 97 insertions(+), 36 deletions(-)

diff --git a/packages/url_launcher/CHANGELOG.md b/packages/url_launcher/CHANGELOG.md
index f91c38419de9..699278fae1c0 100644
--- a/packages/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 4.1.0
+
+* Added `universalLinksOnly` setting.
+* Updated `launch` to return `Future<bool>`.
+
 ## 4.0.3
 
 * Fixed launch url fail for Android: `launch` now assert activity not null and using activity to startActivity.
diff --git a/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java b/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
index 851b9b59a4bb..fc2192c0688f 100644
--- a/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
+++ b/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
@@ -60,7 +60,7 @@ public void onMethodCall(MethodCall call, Result result) {
         launchIntent.setData(Uri.parse(url));
       }
       activity.startActivity(launchIntent);
-      result.success(null);
+      result.success(true);
     } else if (call.method.equals("closeWebView")) {
       Intent intent = new Intent("close");
       mRegistrar.context().sendBroadcast(intent);
diff --git a/packages/url_launcher/example/lib/main.dart b/packages/url_launcher/example/lib/main.dart
index 365c4531ed6e..6ef679084771 100644
--- a/packages/url_launcher/example/lib/main.dart
+++ b/packages/url_launcher/example/lib/main.dart
@@ -65,6 +65,22 @@ class _MyHomePageState extends State<MyHomePage> {
     }
   }
 
+  Future<void> _launchUniversalLinkIos(String url) async {
+    if (await canLaunch('https://youtube.com')) {
+      final bool nativeAppLaunchSucceeded = await launch(
+        'https://youtube.com',
+        forceSafariVC: false,
+        universalLinksOnly: true,
+      );
+      if (!nativeAppLaunchSucceeded) {
+        await launch(
+          'https://youtube.com',
+          forceSafariVC: true,
+        );
+      }
+    }
+  }
+
   Widget _launchStatus(BuildContext context, AsyncSnapshot<void> snapshot) {
     if (snapshot.hasError) {
       return Text('Error: ${snapshot.error}');
@@ -129,6 +145,13 @@ class _MyHomePageState extends State<MyHomePage> {
                   }),
               child: const Text('Launch in app(JavaScript ON)'),
             ),
+            RaisedButton(
+              onPressed: () => setState(() {
+                    _launched = _launchUniversalLinkIos(toLaunch);
+                  }),
+              child: const Text(
+                  'Launch a universal link in a native app, fallback to Safari.(Youtube)'),
+            ),
             const Padding(padding: EdgeInsets.all(16.0)),
             RaisedButton(
               onPressed: () => setState(() {
diff --git a/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m b/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
index 6cd5851a9bf0..03a00c7bc5e3 100644
--- a/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
+++ b/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
@@ -81,7 +81,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     if (useSafariVC.boolValue) {
       [self launchURLInVC:url result:result];
     } else {
-      [self launchURL:url result:result];
+      [self launchURL:url call:call result:result];
     }
   } else if ([@"closeWebView" isEqualToString:call.method]) {
     [self closeWebView:url result:result];
@@ -96,32 +96,23 @@ - (BOOL)canLaunchURL:(NSString *)urlString {
   return [application canOpenURL:url];
 }
 
-- (void)launchURL:(NSString *)urlString result:(FlutterResult)result {
+- (void)launchURL:(NSString *)urlString
+             call:(FlutterMethodCall *)call
+           result:(FlutterResult)result {
   NSURL *url = [NSURL URLWithString:urlString];
   UIApplication *application = [UIApplication sharedApplication];
-  if ([application respondsToSelector:@selector(openURL:options:completionHandler:)]) {
+
+  if (@available(iOS 10.0, *)) {
+    NSNumber *universalLinksOnly = call.arguments[@"universalLinksOnly"] ?: @0;
+    NSDictionary *options = @{UIApplicationOpenURLOptionUniversalLinksOnly : universalLinksOnly};
     [application openURL:url
-                  options:@{}
+                  options:options
         completionHandler:^(BOOL success) {
-          if (success) {
-            result(nil);
-          } else {
-            result([FlutterError
-                errorWithCode:@"Error"
-                      message:[NSString stringWithFormat:@"Error while launching %@", url]
-                      details:nil]);
-          }
+          result(@(success));
         }];
   } else {
     BOOL success = [application openURL:url];
-    if (success) {
-      result(nil);
-    } else {
-      result([FlutterError
-          errorWithCode:@"Error"
-                message:[NSString stringWithFormat:@"Error while launching %@", url]
-                details:nil]);
-    }
+    result(@(success));
   }
 }
 
diff --git a/packages/url_launcher/lib/url_launcher.dart b/packages/url_launcher/lib/url_launcher.dart
index ef51f727e979..6cdb57d1619d 100644
--- a/packages/url_launcher/lib/url_launcher.dart
+++ b/packages/url_launcher/lib/url_launcher.dart
@@ -17,19 +17,30 @@ const MethodChannel _channel = MethodChannel('plugins.flutter.io/url_launcher');
 /// schemes which cannot be handled, that is when [canLaunch] would complete
 /// with false.
 ///
-/// [forceSafariVC] is only used in iOS. If unset, the launcher opens web URLs
-/// in the safari VC, anything else is opened using the default handler on the
-/// platform. If set to true, it opens the URL in the Safari view controller.
-/// If false, the URL is opened in the default browser of the phone. Note that
-/// to work with universal links on iOS, this must be set to false to let
-/// the platform's system handle the URL. Set this to false if you want to
-/// use the cookies/context of the main browser of the app(such as SSO flows).
+/// [forceSafariVC] is only used in iOS with iOS version >= 9.0. By default (when unset), the launcher
+/// opens web URLs in the Safari View Controller, anything else is opened
+/// using the default handler on the platform. If set to true, it opens the
+/// URL in the Safari View Controller. If false, the URL is opened in the
+/// default browser of the phone. Note that to work with universal links on iOS,
+/// this must be set to false to let the platform's system handle the URL.
+/// Set this to false if you want to use the cookies/context of the main browser
+/// of the app (such as SSO flows). This setting will nullify [universalLinksOnly]
+/// and will always launch a web content in the built-in Safari View Controller regardless
+/// if the url is a universal link or not.
+///
+/// [universalLinksOnly] is only used in iOS with iOS version >= 10.0. This setting is only validated
+/// when [forceSafariVC] is set to false. The default value of this setting is false.
+/// By default (when unset), the launcher will either launch the url in a browser (when the
+/// url is not a universal link), or launch the respective native app content (when
+/// the url is a universal link). When set to true, the launcher will only launch
+/// the content if the url is a universal link and the respective app for the universal
+/// link is installed on the user's device; otherwise throw a [PlatformException].
 ///
 /// [forceWebView] is an Android only setting. If null or false, the URL is
 /// always launched with the default browser on device. If set to true, the URL
-/// is launched in a webview. Unlike iOS, browser context is shared across
+/// is launched in a WebView. Unlike iOS, browser context is shared across
 /// WebViews.
-/// [enableJavaScript] is an Android only setting. If true, webview enable
+/// [enableJavaScript] is an Android only setting. If true, WebView enable
 /// javascript.
 ///
 /// Note that if any of the above are set to true but the URL is not a web URL,
@@ -37,12 +48,16 @@ const MethodChannel _channel = MethodChannel('plugins.flutter.io/url_launcher');
 ///
 /// [statusBarBrightness] Sets the status bar brightness of the application
 /// after opening a link on iOS. Does nothing if no value is passed. This does
-/// not handle reseting the previous status bar style.
-Future<void> launch(
+/// not handle resetting the previous status bar style.
+///
+/// Returns true if launch url is successful; false is only returned when [universalLinksOnly]
+/// is set to true and the universal link failed to launch.
+Future<bool> launch(
   String urlString, {
   bool forceSafariVC,
   bool forceWebView,
   bool enableJavaScript,
+  bool universalLinksOnly,
   Brightness statusBarBrightness,
 }) {
   assert(urlString != null);
@@ -74,6 +89,7 @@ Future<void> launch(
       'useSafariVC': forceSafariVC ?? isWebURL,
       'useWebView': forceWebView ?? false,
       'enableJavaScript': enableJavaScript ?? false,
+      'universalLinksOnly': universalLinksOnly ?? false,
     },
   ).then((void _) {
     if (statusBarBrightness != null) {
@@ -102,9 +118,13 @@ Future<bool> canLaunch(String urlString) async {
 ///
 /// If [launch] was never called, then this call will not have any effect.
 ///
-/// On Android systems, if [launch] was called without `forceWebView` being set to
-/// `true`, this call will not do anything either, simply because there is no
-/// WebView available to be closed.
+/// On Android systems, if [launch] was called without `forceWebView` being set to `true`
+/// Or on IOS systems, if [launch] was called without `forceSafariVC` being set to `true`,
+/// this call will not do anything either, simply because there is no
+/// WebView/SafariViewController available to be closed.
+///
+/// SafariViewController is only available on IOS version >= 9.0, this method does not do anything
+/// on IOS version below 9.0
 Future<void> closeWebView() async {
   // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
   // https://github.com/flutter/flutter/issues/26431
diff --git a/packages/url_launcher/pubspec.yaml b/packages/url_launcher/pubspec.yaml
index e07d3dca9523..b0acf0a667ef 100644
--- a/packages/url_launcher/pubspec.yaml
+++ b/packages/url_launcher/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher
-version: 4.0.3
+version: 4.1.0
 
 flutter:
   plugin:
diff --git a/packages/url_launcher/test/url_launcher_test.dart b/packages/url_launcher/test/url_launcher_test.dart
index a007ded205c8..0a6acc59b951 100644
--- a/packages/url_launcher/test/url_launcher_test.dart
+++ b/packages/url_launcher/test/url_launcher_test.dart
@@ -40,6 +40,7 @@ void main() {
           'useSafariVC': true,
           'useWebView': false,
           'enableJavaScript': false,
+          'universalLinksOnly': false,
         })
       ],
     );
@@ -55,6 +56,24 @@ void main() {
           'useSafariVC': true,
           'useWebView': false,
           'enableJavaScript': false,
+          'universalLinksOnly': false,
+        })
+      ],
+    );
+  });
+
+  test('launch universal links only', () async {
+    await launch('http://example.com/',
+        forceSafariVC: false, universalLinksOnly: true);
+    expect(
+      log,
+      <Matcher>[
+        isMethodCall('launch', arguments: <String, Object>{
+          'url': 'http://example.com/',
+          'useSafariVC': false,
+          'useWebView': false,
+          'enableJavaScript': false,
+          'universalLinksOnly': true,
         })
       ],
     );
@@ -70,6 +89,7 @@ void main() {
           'useSafariVC': true,
           'useWebView': true,
           'enableJavaScript': false,
+          'universalLinksOnly': false,
         })
       ],
     );
@@ -86,6 +106,7 @@ void main() {
           'useSafariVC': true,
           'useWebView': true,
           'enableJavaScript': true,
+          'universalLinksOnly': false,
         })
       ],
     );
@@ -101,6 +122,7 @@ void main() {
           'useSafariVC': false,
           'useWebView': false,
           'enableJavaScript': false,
+          'universalLinksOnly': false,
         })
       ],
     );

From 85f75f88335dce3b65ecbd5080e28be0b7238bb7 Mon Sep 17 00:00:00 2001
From: Greg Spencer <gspencergoog@users.noreply.github.com>
Date: Wed, 16 Jan 2019 09:56:13 -0800
Subject: [PATCH 064/410] Enable compute credits for commits, and for macOS PRs
 (#1086)

---
 .cirrus.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index bc5cd4f1125f..8eb725983d03 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,4 +1,5 @@
 task:
+  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
   container:
     image: cirrusci/flutter:latest
     cpu: 4
@@ -43,6 +44,7 @@ task:
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
 
 task:
+  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   name: build-ipas
   osx_instance:
     image: high-sierra-xcode-9.4.1

From 82bab678d76c69e56456f97879452eebd4ea66da Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Wed, 16 Jan 2019 15:02:30 -0800
Subject: [PATCH 065/410] add deprecated_member_use_from_same_package to pass
 analyzer (#1088)

Add deprecated_member_use_from_same_package to pass analyzer.

The deprecated fields are required not to be deleted to work with the platform side (Java/OBJC).
---
 packages/firebase_admob/lib/firebase_admob.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/firebase_admob/lib/firebase_admob.dart b/packages/firebase_admob/lib/firebase_admob.dart
index a0d4f84059b4..4bb00f99c80a 100644
--- a/packages/firebase_admob/lib/firebase_admob.dart
+++ b/packages/firebase_admob/lib/firebase_admob.dart
@@ -1,4 +1,4 @@
-// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

From 8fb9a0789ff73e69e127ee2aa44201cac77ea2b1 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Thu, 17 Jan 2019 15:35:04 -0800
Subject: [PATCH 066/410] cirrues update to mojave-xcode-10.1 (#1087)

update to Mojave Xcode 10 to support IOS 12 apis
---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8eb725983d03..9c68886f95e7 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -47,7 +47,7 @@ task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   name: build-ipas
   osx_instance:
-    image: high-sierra-xcode-9.4.1
+    image: mojave-xcode-10.1
   env:
     PATH: $PATH:/usr/local/bin
     matrix:

From f3bbb904d5ca3d66b584cf3eeb441e3726bbe570 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Fri, 18 Jan 2019 09:45:53 -0800
Subject: [PATCH 067/410] Fix a crash when selecting downloaded images on
 certain devices (#1089)

Some devices use different path for downloaded images. Those devices will crash when trying the access the public_download URI.
Directly use default downloaded image URI instead of hard coding the string fixes the crash.
---
 packages/image_picker/CHANGELOG.md                            | 4 ++++
 .../main/java/io/flutter/plugins/imagepicker/FileUtils.java   | 2 +-
 packages/image_picker/pubspec.yaml                            | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 083eab595441..841522383775 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.12+1
+
+* Fix a crash when selecting downloaded images from image picker on certain devices.
+
 ## 0.4.12
 
 * Fix a crash when user tap the image mutiple times.
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
index d1a509ad223a..25287c78ea12 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
@@ -65,7 +65,7 @@ private String getPathFromLocalUri(final Context context, final Uri uri) {
           try {
             final Uri contentUri =
                 ContentUris.withAppendedId(
-                    Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+                    Uri.parse(Environment.DIRECTORY_DOWNLOADS), Long.valueOf(id));
             return getDataColumn(context, contentUri, null, null);
           } catch (NumberFormatException e) {
             return null;
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 615c46f5c1f5..c08e5a0f8ded 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.4.12
+version: 0.4.12+1
 
 flutter:
   plugin:

From 909cf1c20bb6241812c577ea59a7e0332ff0c756 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Fri, 18 Jan 2019 12:55:56 -0800
Subject: [PATCH 068/410] [IAP] Fetch SkuDetails from Google Play (#1084)

Adds the `queryProductsAsync` API and associated classes to
`billing_client_wrappers/`.

flutter/flutter#26325
---
 .../inapppurchase/InAppPurchasePlugin.java    |  49 +++++-
 .../plugins/inapppurchase/Translator.java     |  47 ++++++
 .../example/android/app/build.gradle          |   1 +
 .../InAppPurchasePluginTest.java              | 101 +++++++++++
 .../plugins/inapppurchase/TranslatorTest.java |  67 ++++++++
 .../lib/billing_client_wrappers.dart          |   1 +
 .../billing_client_wrapper.dart               |  57 ++++++-
 .../sku_details_wrapper.dart                  | 157 ++++++++++++++++++
 .../billing_client_wrapper_test.dart          |  36 ++++
 .../sku_details_wrapper_test.dart             |  93 +++++++++++
 10 files changed, 606 insertions(+), 3 deletions(-)
 create mode 100644 packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
 create mode 100644 packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java
 create mode 100644 packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
 create mode 100644 packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart

diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
index 86edf2a3b5fc..6ed2ab7c282a 100644
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
@@ -4,6 +4,8 @@
 
 package io.flutter.plugins.inapppurchase;
 
+import static io.flutter.plugins.inapppurchase.Translator.fromSkuDetailsList;
+
 import android.content.Context;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
@@ -11,6 +13,9 @@
 import com.android.billingclient.api.BillingClientStateListener;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.PurchasesUpdatedListener;
+import com.android.billingclient.api.SkuDetails;
+import com.android.billingclient.api.SkuDetailsParams;
+import com.android.billingclient.api.SkuDetailsResponseListener;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -51,6 +56,10 @@ public void onMethodCall(MethodCall call, Result result) {
       case "BillingClient#endConnection()":
         endConnection(result);
         break;
+      case "BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)":
+        querySkuDetailsAsync(
+            (String) call.argument("skuType"), (List<String>) call.argument("skusList"), result);
+        break;
       default:
         result.notImplemented();
     }
@@ -87,15 +96,51 @@ public void onBillingServiceDisconnected() {
   }
 
   private void endConnection(final Result result) {
-    billingClient.endConnection();
-    billingClient = null;
+    if (billingClient != null) {
+      billingClient.endConnection();
+      billingClient = null;
+    }
     result.success(null);
   }
 
   private void isReady(Result result) {
+    if (billingClientError(result)) {
+      return;
+    }
+
     result.success(billingClient.isReady());
   }
 
+  private void querySkuDetailsAsync(
+      final String skuType, final List<String> skusList, final Result result) {
+    if (billingClientError(result)) {
+      return;
+    }
+
+    SkuDetailsParams params =
+        SkuDetailsParams.newBuilder().setType(skuType).setSkusList(skusList).build();
+    billingClient.querySkuDetailsAsync(
+        params,
+        new SkuDetailsResponseListener() {
+          public void onSkuDetailsResponse(
+              int responseCode, @Nullable List<SkuDetails> skuDetailsList) {
+            final Map<String, Object> skuDetailsResponse = new HashMap<>();
+            skuDetailsResponse.put("responseCode", responseCode);
+            skuDetailsResponse.put("skuDetailsList", fromSkuDetailsList(skuDetailsList));
+            result.success(skuDetailsResponse);
+          }
+        });
+  }
+
+  private boolean billingClientError(Result result) {
+    if (billingClient != null) {
+      return false;
+    }
+
+    result.error("UNAVAILABLE", "BillingClient is unset. Try reconnecting.", null);
+    return true;
+  }
+
   private static BillingClient buildBillingClient(Context context) {
     return BillingClient.newBuilder(context)
         .setListener(
diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
new file mode 100644
index 000000000000..c93d82b79815
--- /dev/null
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
@@ -0,0 +1,47 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package io.flutter.plugins.inapppurchase;
+
+import android.support.annotation.Nullable;
+import com.android.billingclient.api.SkuDetails;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+/** Handles serialization of {@link com.android.billingclient.api.BillingClient} related objects. */
+/*package*/ class Translator {
+  static HashMap<String, Object> fromSkuDetail(SkuDetails detail) {
+    HashMap<String, Object> info = new HashMap<>();
+    info.put("title", detail.getTitle());
+    info.put("description", detail.getDescription());
+    info.put("freeTrialPeriod", detail.getFreeTrialPeriod());
+    info.put("introductoryPrice", detail.getIntroductoryPrice());
+    info.put("introductoryPriceAmountMicros", detail.getIntroductoryPriceAmountMicros());
+    info.put("introductoryPriceCycles", detail.getIntroductoryPriceCycles());
+    info.put("introductoryPricePeriod", detail.getIntroductoryPricePeriod());
+    info.put("price", detail.getPrice());
+    info.put("priceAmountMicros", detail.getPriceAmountMicros());
+    info.put("priceCurrencyCode", detail.getPriceCurrencyCode());
+    info.put("sku", detail.getSku());
+    info.put("type", detail.getType());
+    info.put("isRewarded", detail.isRewarded());
+    info.put("subscriptionPeriod", detail.getSubscriptionPeriod());
+    return info;
+  }
+
+  static List<HashMap<String, Object>> fromSkuDetailsList(
+      @Nullable List<SkuDetails> skuDetailsList) {
+    if (skuDetailsList == null) {
+      return Collections.emptyList();
+    }
+
+    ArrayList<HashMap<String, Object>> output = new ArrayList<>();
+    for (SkuDetails detail : skuDetailsList) {
+      output.add(fromSkuDetail(detail));
+    }
+    return output;
+  }
+}
diff --git a/packages/in_app_purchase/example/android/app/build.gradle b/packages/in_app_purchase/example/android/app/build.gradle
index f059f885383a..a523382b58d8 100644
--- a/packages/in_app_purchase/example/android/app/build.gradle
+++ b/packages/in_app_purchase/example/android/app/build.gradle
@@ -111,6 +111,7 @@ dependencies {
     implementation 'com.android.billingclient:billing:1.2'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.17.0'
+    testImplementation 'org.json:json:20180813'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
index a49109387bc5..a1a9bb5bcc8a 100644
--- a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
+++ b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
@@ -1,6 +1,9 @@
 package io.flutter.plugins.inapppurchase;
 
+import static io.flutter.plugins.inapppurchase.Translator.fromSkuDetailsList;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.contains;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -8,12 +11,18 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.support.annotation.Nullable;
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClientStateListener;
+import com.android.billingclient.api.SkuDetails;
+import com.android.billingclient.api.SkuDetailsParams;
+import com.android.billingclient.api.SkuDetailsResponseListener;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.Result;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
@@ -57,6 +66,18 @@ public void isReady_false() {
     verify(result).success(false);
   }
 
+  @Test
+  public void isReady_clientDisconnected() {
+    MethodCall disconnectCall = new MethodCall("BillingClient#endConnection()", null);
+    plugin.onMethodCall(disconnectCall, mock(Result.class));
+    MethodCall isReadyCall = new MethodCall("BillingClient#isReady()", null);
+
+    plugin.onMethodCall(isReadyCall, result);
+
+    verify(result).error(contains("UNAVAILABLE"), contains("BillingClient"), any());
+    verify(result, never()).success(any());
+  }
+
   @Test
   public void startConnection() {
     Map<String, Integer> arguments = new HashMap<>();
@@ -102,4 +123,84 @@ public void endConnection() {
         .invokeMethod(
             "BillingClientStateListener#onBillingServiceDisconnected()", expectedInvocation);
   }
+
+  @Test
+  public void querySkuDetailsAsync() {
+    // Connect a billing client and set up the SKU query listeners
+    establishConnectedBillingClient(/*arguments=*/ null, /*result=*/ null);
+    String skuType = BillingClient.SkuType.INAPP;
+    List<String> skusList = Arrays.asList("id1", "id2");
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("skuType", skuType);
+    arguments.put("skusList", skusList);
+    MethodCall queryCall =
+        new MethodCall(
+            "BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)",
+            arguments);
+
+    // Query for SKU details
+    plugin.onMethodCall(queryCall, result);
+
+    // Assert the arguments were forwarded correctly to BillingClient
+    ArgumentCaptor<SkuDetailsParams> paramCaptor = ArgumentCaptor.forClass(SkuDetailsParams.class);
+    ArgumentCaptor<SkuDetailsResponseListener> listenerCaptor =
+        ArgumentCaptor.forClass(SkuDetailsResponseListener.class);
+    verify(mockBillingClient).querySkuDetailsAsync(paramCaptor.capture(), listenerCaptor.capture());
+    assertEquals(paramCaptor.getValue().getSkuType(), skuType);
+    assertEquals(paramCaptor.getValue().getSkusList(), skusList);
+
+    // Assert that we handed result BillingClient's response
+    int responseCode = 200;
+    List<SkuDetails> skuDetailsResponse = Arrays.asList(buildSkuDetails());
+    listenerCaptor.getValue().onSkuDetailsResponse(responseCode, skuDetailsResponse);
+    ArgumentCaptor<HashMap<String, Object>> resultCaptor = ArgumentCaptor.forClass(HashMap.class);
+    verify(result).success(resultCaptor.capture());
+    HashMap<String, Object> resultData = resultCaptor.getValue();
+    assertEquals(resultData.get("responseCode"), responseCode);
+    assertEquals(resultData.get("skuDetailsList"), fromSkuDetailsList(skuDetailsResponse));
+  }
+
+  @Test
+  public void querySkuDetailsAsync_clientDisconnected() {
+    // Disconnect the Billing client and prepare a querySkuDetails call
+    MethodCall disconnectCall = new MethodCall("BillingClient#endConnection()", null);
+    plugin.onMethodCall(disconnectCall, mock(Result.class));
+    String skuType = BillingClient.SkuType.INAPP;
+    List<String> skusList = Arrays.asList("id1", "id2");
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("skuType", skuType);
+    arguments.put("skusList", skusList);
+    MethodCall queryCall =
+        new MethodCall(
+            "BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)",
+            arguments);
+
+    // Query for SKU details
+    plugin.onMethodCall(queryCall, result);
+
+    // Assert that we sent an error back.
+    verify(result).error(contains("UNAVAILABLE"), contains("BillingClient"), any());
+    verify(result, never()).success(any());
+  }
+
+  private void establishConnectedBillingClient(
+      @Nullable Map<String, Integer> arguments, @Nullable Result result) {
+    if (arguments == null) {
+      arguments = new HashMap<>();
+      arguments.put("handle", 1);
+    }
+    if (result == null) {
+      result = mock(Result.class);
+    }
+
+    MethodCall connectCall =
+        new MethodCall("BillingClient#startConnection(BillingClientStateListener)", arguments);
+    plugin.onMethodCall(connectCall, result);
+  }
+
+  private SkuDetails buildSkuDetails() {
+    SkuDetails details = mock(SkuDetails.class);
+    when(details.getSku()).thenReturn("foo");
+    return details;
+  }
 }
diff --git a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java
new file mode 100644
index 000000000000..0322a749f3cb
--- /dev/null
+++ b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java
@@ -0,0 +1,67 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package io.flutter.plugins.inapppurchase;
+
+import static org.junit.Assert.assertEquals;
+
+import com.android.billingclient.api.SkuDetails;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.json.JSONException;
+import org.junit.Test;
+
+public class TranslatorTest {
+  private static final String SKU_DETAIL_EXAMPLE_JSON =
+      "{\"productId\":\"example\",\"type\":\"inapp\",\"price\":\"$0.99\",\"price_amount_micros\":990000,\"price_currency_code\":\"USD\",\"title\":\"Example title\",\"description\":\"Example description.\"}";
+
+  @Test
+  public void fromSkuDetail() throws JSONException {
+    final SkuDetails expected = new SkuDetails(SKU_DETAIL_EXAMPLE_JSON);
+
+    Map<String, Object> serialized = Translator.fromSkuDetail(expected);
+
+    assertSerialized(expected, serialized);
+  }
+
+  @Test
+  public void fromSkuDetailsList() throws JSONException {
+    final String SKU_DETAIL_EXAMPLE_2_JSON =
+        "{\"productId\":\"example2\",\"type\":\"inapp\",\"price\":\"$0.99\",\"price_amount_micros\":990000,\"price_currency_code\":\"USD\",\"title\":\"Example title\",\"description\":\"Example description.\"}";
+    final List<SkuDetails> expected =
+        Arrays.asList(
+            new SkuDetails(SKU_DETAIL_EXAMPLE_JSON), new SkuDetails(SKU_DETAIL_EXAMPLE_2_JSON));
+
+    final List<HashMap<String, Object>> serialized = Translator.fromSkuDetailsList(expected);
+
+    assertEquals(expected.size(), serialized.size());
+    assertSerialized(expected.get(0), serialized.get(0));
+    assertSerialized(expected.get(1), serialized.get(1));
+  }
+
+  @Test
+  public void fromSkuDetailsList_null() {
+    assertEquals(0, Translator.fromSkuDetailsList(null).size());
+  }
+
+  private void assertSerialized(SkuDetails expected, Map<String, Object> serialized) {
+    assertEquals(expected.getDescription(), serialized.get("description"));
+    assertEquals(expected.getFreeTrialPeriod(), serialized.get("freeTrialPeriod"));
+    assertEquals(expected.getIntroductoryPrice(), serialized.get("introductoryPrice"));
+    assertEquals(
+        expected.getIntroductoryPriceAmountMicros(),
+        serialized.get("introductoryPriceAmountMicros"));
+    assertEquals(expected.getIntroductoryPriceCycles(), serialized.get("introductoryPriceCycles"));
+    assertEquals(expected.getIntroductoryPricePeriod(), serialized.get("introductoryPricePeriod"));
+    assertEquals(expected.getPrice(), serialized.get("price"));
+    assertEquals(expected.getPriceAmountMicros(), serialized.get("priceAmountMicros"));
+    assertEquals(expected.getPriceCurrencyCode(), serialized.get("priceCurrencyCode"));
+    assertEquals(expected.getSku(), serialized.get("sku"));
+    assertEquals(expected.getSubscriptionPeriod(), serialized.get("subscriptionPeriod"));
+    assertEquals(expected.getTitle(), serialized.get("title"));
+    assertEquals(expected.getType(), serialized.get("type"));
+  }
+}
diff --git a/packages/in_app_purchase/lib/billing_client_wrappers.dart b/packages/in_app_purchase/lib/billing_client_wrappers.dart
index f9f28eb01a65..e65225983642 100644
--- a/packages/in_app_purchase/lib/billing_client_wrappers.dart
+++ b/packages/in_app_purchase/lib/billing_client_wrappers.dart
@@ -3,3 +3,4 @@
 // found in the LICENSE file.
 
 export 'src/billing_client_wrappers/billing_client_wrapper.dart';
+export 'src/billing_client_wrappers/sku_details_wrapper.dart';
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
index fd6f5d67aa33..3ed495a07065 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
@@ -6,6 +6,7 @@ import 'dart:async';
 import 'package:flutter/services.dart';
 import 'package:flutter/foundation.dart';
 import '../channel.dart';
+import 'sku_details_wrapper.dart';
 
 /// This class can be used directly instead of [InAppPurchaseConnection] to call
 /// Play-specific billing APIs.
@@ -73,6 +74,27 @@ class BillingClient {
     return channel.invokeMethod("BillingClient#endConnection()", null);
   }
 
+  /// Returns a list of [SkuDetailsWrapper]s that have [SkuDetailsWrapper.sku]
+  /// in `skusList`, and [SkuDetailsWrapper.type] matching `skuType`.
+  ///
+  /// Calls through to [`BillingClient#querySkuDetailsAsync(SkuDetailsParams,
+  /// SkuDetailsResponseListener)`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient#querySkuDetailsAsync(com.android.billingclient.api.SkuDetailsParams,%20com.android.billingclient.api.SkuDetailsResponseListener))
+  /// Instead of taking a callback parameter, it returns a Future
+  /// [SkuDetailsResponseWrapper]. It also takes the values of
+  /// `SkuDetailsParams` as direct arguments instead of requiring it constructed
+  /// and passed in as a class.
+  Future<SkuDetailsResponseWrapper> querySkuDetails(
+      {@required SkuType skuType, @required List<String> skusList}) async {
+    final Map<String, dynamic> arguments = <String, dynamic>{
+      'skuType': skuType.toString(),
+      'skusList': skusList
+    };
+    return SkuDetailsResponseWrapper.fromMap(await channel.invokeMapMethod<
+            String, dynamic>(
+        'BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)',
+        arguments));
+  }
+
   Future<void> _callHandler(MethodCall call) async {
     switch (call.method) {
       case 'BillingClientStateListener#onBillingServiceDisconnected()':
@@ -84,6 +106,8 @@ class BillingClient {
   }
 }
 
+/// Callback triggered when the [BillingClientWrapper] is disconnected.
+///
 /// Wraps
 /// [`com.android.billingclient.api.BillingClientStateListener.onServiceDisconnected()`](https://developer.android.com/reference/com/android/billingclient/api/BillingClientStateListener.html#onBillingServiceDisconnected())
 /// to call back on `BillingClient` disconnect.
@@ -96,11 +120,12 @@ typedef void OnBillingServiceDisconnected();
 /// See the `BillingResponse` docs for an explanation of the different constants.
 class BillingResponse {
   const BillingResponse._(this._code);
+  static BillingResponse fromInt(int code) => BillingResponse._(code);
   final int _code;
   @override
   String toString() => _code.toString();
   @override
-  int get hashCode => _code;
+  int get hashCode => _code.hashCode;
   @override
   bool operator ==(dynamic other) =>
       other is BillingResponse && other._code == _code;
@@ -116,3 +141,33 @@ class BillingResponse {
   static const BillingResponse ITEM_ALREADY_OWNED = BillingResponse._(7);
   static const BillingResponse ITEM_NOT_OWNED = BillingResponse._(8);
 }
+
+/// Enum representing potential [SkuDetailsWrapper.type]s.
+///
+/// Wraps
+/// [`BillingClient.SkuType`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.SkuType)
+/// See the linked documentation for an explanation of the different constants.
+class SkuType {
+  const SkuType._(this._type);
+  static SkuType fromString(String type) {
+    final SkuType skuType = SkuType._(type);
+    if (skuType != INAPP && skuType != SUBS) {
+      return null;
+    }
+    return skuType;
+  }
+
+  final String _type;
+  @override
+  String toString() => _type;
+  @override
+  int get hashCode => _type.hashCode;
+  @override
+  bool operator ==(dynamic other) => other is SkuType && other._type == _type;
+
+  /// A one time product. Acquired in a single transaction.
+  static const SkuType INAPP = SkuType._("inapp");
+
+  /// A product requiring a recurring charge over time.
+  static const SkuType SUBS = SkuType._("subs");
+}
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
new file mode 100644
index 000000000000..68c751a92a71
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
@@ -0,0 +1,157 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+import 'dart:ui' show hashValues;
+import 'package:flutter/foundation.dart';
+import 'billing_client_wrapper.dart';
+
+/// Dart wrapper around [`com.android.billingclient.api.SkuDetails`](https://developer.android.com/reference/com/android/billingclient/api/SkuDetails).
+///
+/// Contains the details of an available product in Google Play Billing.
+class SkuDetailsWrapper {
+  @visibleForTesting
+  SkuDetailsWrapper({
+    @required this.description,
+    @required this.freeTrialPeriod,
+    @required this.introductoryPrice,
+    @required this.introductoryPriceMicros,
+    @required this.introductoryPriceCycles,
+    @required this.introductoryPricePeriod,
+    @required this.price,
+    @required this.priceAmountMicros,
+    @required this.priceCurrencyCode,
+    @required this.sku,
+    @required this.subscriptionPeriod,
+    @required this.title,
+    @required this.type,
+    @required this.isRewarded,
+  });
+
+  /// Constructs an instance of this from a key value map of data.
+  ///
+  /// The map needs to have named string keys with values matching the names and
+  /// types of all of the members on this class.
+  @visibleForTesting
+  SkuDetailsWrapper.fromMap(Map<dynamic, dynamic> map)
+      : description = map['description'],
+        freeTrialPeriod = map['freeTrialPeriod'],
+        introductoryPrice = map['introductoryPrice'],
+        introductoryPriceMicros = map['introductoryPriceMicros'],
+        introductoryPriceCycles = map['introductoryPriceCycles'],
+        introductoryPricePeriod = map['introductoryPricePeriod'],
+        price = map['price'],
+        priceAmountMicros = map['priceAmountMicros'],
+        priceCurrencyCode = map['priceCurrencyCode'],
+        sku = map['sku'],
+        subscriptionPeriod = map['subscriptionPeriod'],
+        title = map['title'],
+        type = SkuType.fromString(map['type']),
+        isRewarded = map['isRewarded'];
+
+  final String description;
+
+  /// Trial period in ISO 8601 format.
+  final String freeTrialPeriod;
+
+  /// Introductory price, only applies to [SkuType.SUBS]. Formatted ("$0.99").
+  final String introductoryPrice;
+
+  /// [introductoryPrice] in micro-units 990000
+  final String introductoryPriceMicros;
+
+  /// The number of billing perios that [introductoryPrice] is valid for ("2").
+  final String introductoryPriceCycles;
+
+  /// The billing period of [introductoryPrice], in ISO 8601 format.
+  final String introductoryPricePeriod;
+
+  /// Formatted with currency symbol ("$0.99").
+  final String price;
+
+  /// [price] in micro-units ("990000").
+  final int priceAmountMicros;
+
+  /// [price] ISO 4217 currency code.
+  final String priceCurrencyCode;
+
+  /// The product ID in Google Play Console.
+  final String sku;
+
+  /// Applies to [SkuType.SUBS], formatted in ISO 8601.
+  final String subscriptionPeriod;
+  final String title;
+
+  /// The [SkuType] of the product.
+  final SkuType type;
+
+  /// False if the product is paid.
+  final bool isRewarded;
+
+  @override
+  bool operator ==(dynamic other) {
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final SkuDetailsWrapper typedOther = other;
+    return typedOther is SkuDetailsWrapper &&
+        typedOther.description == description &&
+        typedOther.freeTrialPeriod == freeTrialPeriod &&
+        typedOther.introductoryPrice == introductoryPrice &&
+        typedOther.introductoryPriceMicros == introductoryPriceMicros &&
+        typedOther.introductoryPriceCycles == introductoryPriceCycles &&
+        typedOther.introductoryPricePeriod == introductoryPricePeriod &&
+        typedOther.price == price &&
+        typedOther.priceAmountMicros == priceAmountMicros &&
+        typedOther.sku == sku &&
+        typedOther.subscriptionPeriod == subscriptionPeriod &&
+        typedOther.title == title &&
+        typedOther.type == type &&
+        typedOther.isRewarded == isRewarded;
+  }
+
+  @override
+  int get hashCode {
+    return hashValues(
+        description.hashCode,
+        freeTrialPeriod.hashCode,
+        introductoryPrice.hashCode,
+        introductoryPriceMicros.hashCode,
+        introductoryPriceCycles.hashCode,
+        introductoryPricePeriod.hashCode,
+        price.hashCode,
+        priceAmountMicros.hashCode,
+        sku.hashCode,
+        subscriptionPeriod.hashCode,
+        title.hashCode,
+        type.hashCode,
+        isRewarded.hashCode);
+  }
+}
+
+/// Translation of [`com.android.billingclient.api.SkuDetailsResponseListener`](https://developer.android.com/reference/com/android/billingclient/api/SkuDetailsResponseListener.html).
+///
+/// Returned by [BillingClient.querySkuDetails].
+class SkuDetailsResponseWrapper {
+  @visibleForTesting
+  SkuDetailsResponseWrapper({@required this.responseCode, this.skuDetailsList});
+
+  /// Constructs an instance of this from a key value map of data.
+  ///
+  /// The map needs to have named string keys with values matching the names and
+  /// types of all of the members on this class.
+  SkuDetailsResponseWrapper.fromMap(Map<dynamic, dynamic> map)
+      : responseCode = BillingResponse.fromInt(map['responseCode']),
+        skuDetailsList =
+            List.castFrom<dynamic, Map<dynamic, dynamic>>(map['skuDetailsList'])
+                .map((Map<dynamic, dynamic> entry) =>
+                    SkuDetailsWrapper.fromMap(entry))
+                .toList();
+
+  /// The final status of the [BillingClient.querySkuDetails] call.
+  final BillingResponse responseCode;
+
+  /// A list of [SkuDetailsWrapper] matching the query to [BillingClient.querySkuDetails].
+  final List<SkuDetailsWrapper> skuDetailsList;
+}
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
index 03e7d033912e..4b88a0487036 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
@@ -8,6 +8,7 @@ import 'package:flutter/services.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/src/channel.dart';
 import '../stub_in_app_purchase_platform.dart';
+import 'sku_details_wrapper_test.dart';
 
 void main() {
   final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
@@ -61,4 +62,39 @@ void main() {
     await billingClient.endConnection();
     expect(stubPlatform.countPreviousCalls(endConnectionName), equals(1));
   });
+
+  group('querySkuDetails', () {
+    final String queryMethodName =
+        'BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)';
+
+    test('handles empty skuDetails', () async {
+      final BillingResponse responseCode = BillingResponse.DEVELOPER_ERROR;
+      stubPlatform.addResponse(name: queryMethodName, value: <dynamic, dynamic>{
+        'responseCode': int.parse(responseCode.toString()),
+        'skuDetailsList': <Map<String, dynamic>>[]
+      });
+
+      final SkuDetailsResponseWrapper response = await billingClient
+          .querySkuDetails(
+              skuType: SkuType.INAPP, skusList: <String>['invalid']);
+
+      expect(response.responseCode, equals(responseCode));
+      expect(response.skuDetailsList, isEmpty);
+    });
+
+    test('returns SkuDetailsResponseWrapper', () async {
+      final BillingResponse responseCode = BillingResponse.OK;
+      stubPlatform.addResponse(name: queryMethodName, value: <String, dynamic>{
+        'responseCode': int.parse(responseCode.toString()),
+        'skuDetailsList': <Map<String, dynamic>>[buildSkuMap(dummyWrapper)]
+      });
+
+      final SkuDetailsResponseWrapper response = await billingClient
+          .querySkuDetails(
+              skuType: SkuType.INAPP, skusList: <String>['invalid']);
+
+      expect(response.responseCode, equals(responseCode));
+      expect(response.skuDetailsList, contains(dummyWrapper));
+    });
+  });
 }
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
new file mode 100644
index 000000000000..c22181bfa11c
--- /dev/null
+++ b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
@@ -0,0 +1,93 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+import 'package:test/test.dart';
+import 'package:in_app_purchase/billing_client_wrappers.dart';
+
+final SkuDetailsWrapper dummyWrapper = SkuDetailsWrapper(
+  description: 'description',
+  freeTrialPeriod: 'freeTrialPeriod',
+  introductoryPrice: 'introductoryPrice',
+  introductoryPriceMicros: 'introductoryPriceMicros',
+  introductoryPriceCycles: 'introductoryPriceCycles',
+  introductoryPricePeriod: 'introductoryPricePeriod',
+  price: 'price',
+  priceAmountMicros: 1000,
+  priceCurrencyCode: 'priceCurrencyCode',
+  sku: 'sku',
+  subscriptionPeriod: 'subscriptionPeriod',
+  title: 'title',
+  type: SkuType.INAPP,
+  isRewarded: true,
+);
+
+void main() {
+  group('SkuDetailsWrapper', () {
+    test('converts from map', () {
+      final SkuDetailsWrapper expected = dummyWrapper;
+      final SkuDetailsWrapper parsed =
+          SkuDetailsWrapper.fromMap(buildSkuMap(expected));
+
+      expect(parsed, equals(expected));
+    });
+  });
+
+  group('SkuDetailsResponseWrapper', () {
+    test('parsed from map', () {
+      final BillingResponse responseCode = BillingResponse.OK;
+      final List<SkuDetailsWrapper> skusDetails = <SkuDetailsWrapper>[
+        dummyWrapper,
+        dummyWrapper
+      ];
+      final SkuDetailsResponseWrapper expected = SkuDetailsResponseWrapper(
+          responseCode: responseCode, skuDetailsList: skusDetails);
+
+      final SkuDetailsResponseWrapper parsed =
+          SkuDetailsResponseWrapper.fromMap(<String, dynamic>{
+        'responseCode': int.parse(responseCode.toString()),
+        'skuDetailsList': <Map<String, dynamic>>[
+          buildSkuMap(dummyWrapper),
+          buildSkuMap(dummyWrapper)
+        ]
+      });
+
+      expect(parsed.responseCode, equals(expected.responseCode));
+      expect(parsed.skuDetailsList, containsAll(expected.skuDetailsList));
+    });
+
+    test('handles empty list of skuDetails', () {
+      final BillingResponse responseCode = BillingResponse.ERROR;
+      final List<SkuDetailsWrapper> skusDetails = <SkuDetailsWrapper>[];
+      final SkuDetailsResponseWrapper expected = SkuDetailsResponseWrapper(
+          responseCode: responseCode, skuDetailsList: skusDetails);
+
+      final SkuDetailsResponseWrapper parsed =
+          SkuDetailsResponseWrapper.fromMap(<String, dynamic>{
+        'responseCode': int.parse(responseCode.toString()),
+        'skuDetailsList': <Map<String, dynamic>>[]
+      });
+
+      expect(parsed.responseCode, equals(expected.responseCode));
+      expect(parsed.skuDetailsList, containsAll(expected.skuDetailsList));
+    });
+  });
+}
+
+Map<String, dynamic> buildSkuMap(SkuDetailsWrapper original) =>
+    <String, dynamic>{
+      'description': original.description,
+      'freeTrialPeriod': original.freeTrialPeriod,
+      'introductoryPrice': original.introductoryPrice,
+      'introductoryPriceMicros': original.introductoryPriceMicros,
+      'introductoryPriceCycles': original.introductoryPriceCycles,
+      'introductoryPricePeriod': original.introductoryPricePeriod,
+      'price': original.price,
+      'priceAmountMicros': original.priceAmountMicros,
+      'priceCurrencyCode': original.priceCurrencyCode,
+      'sku': original.sku,
+      'subscriptionPeriod': original.subscriptionPeriod,
+      'title': original.title,
+      'type': original.type.toString(),
+      'isRewarded': original.isRewarded,
+    };

From 13c87f828312a5baf87a4fbb51b1f95a63974431 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Tue, 22 Jan 2019 17:53:24 -0800
Subject: [PATCH 069/410] cleanup (#1102)

---
 packages/url_launcher/CHANGELOG.md | 4 ++++
 packages/url_launcher/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/url_launcher/CHANGELOG.md b/packages/url_launcher/CHANGELOG.md
index 699278fae1c0..96b89b03ff0c 100644
--- a/packages/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.1.0+1
+
+* Clean up.
+
 ## 4.1.0
 
 * Added `universalLinksOnly` setting.
diff --git a/packages/url_launcher/pubspec.yaml b/packages/url_launcher/pubspec.yaml
index b0acf0a667ef..5ee1dc700ffe 100644
--- a/packages/url_launcher/pubspec.yaml
+++ b/packages/url_launcher/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher
-version: 4.1.0
+version: 4.1.0+1
 
 flutter:
   plugin:

From f87865928ccdd84b4a50ba96ab01ccc29c529493 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Wed, 23 Jan 2019 09:03:26 -0800
Subject: [PATCH 070/410] Include Android SDK 27 in the docker image and accept
 licenses (#1104)

This was ripped off #1091.
CI was failing on multiple packages when trying to build apks with:
```
A problem occurred evaluating root project 'android'.
> A problem occurred configuring project ':app'.
   > Failed to install the following Android SDK packages as some licences have not been accepted.
        platforms;android-27 Android SDK Platform 27
     To build this project, accept the SDK license agreements and install the missing components using the Android Studio SDK Manager.
     Alternatively, to transfer the license agreements from one workstation to another, see http://d.android.com/r/studio-ui/export-licenses.html
     Using Android SDK: /opt/android-sdk-linux
```

This tweaks the docker file to also install Android SDK 27 accept licenses for it, which fixes the CI failure.

The patch was authored by @dnfield I just split part of it out of #1091.
---
 .ci/Dockerfile | 8 ++++++++
 .cirrus.yml    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 .ci/Dockerfile

diff --git a/.ci/Dockerfile b/.ci/Dockerfile
new file mode 100644
index 000000000000..49c34ca7c7fe
--- /dev/null
+++ b/.ci/Dockerfile
@@ -0,0 +1,8 @@
+
+FROM cirrusci/flutter:latest
+
+RUN yes | sdkmanager \
+    "platforms;android-27" \
+    "build-tools;27.0.3" \
+    "extras;google;m2repository" \
+    "extras;android;m2repository"
diff --git a/.cirrus.yml b/.cirrus.yml
index 9c68886f95e7..3f184c763f45 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,7 +1,7 @@
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
   container:
-    image: cirrusci/flutter:latest
+    dockerfile: .ci/Dockerfile
     cpu: 4
     memory: 8G
   upgrade_script:

From 4a09aaf5766d1afbd76435fa819d337dd909b9f2 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Wed, 23 Jan 2019 10:24:48 -0800
Subject: [PATCH 071/410] [firebase_ml_vision] Set minimum iOS to 8 (#1106)

This is the lowest version of iOS supported by Flutter. Supporting lower
versions was causing build failures in CI.
---
 .../ios/Runner.xcodeproj/project.pbxproj       | 18 ++++++++----------
 .../xcshareddata/IDEWorkspaceChecks.plist      |  8 ++++++++
 .../xcshareddata/xcschemes/Runner.xcscheme     |  4 +---
 3 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 packages/firebase_ml_vision/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

diff --git a/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/project.pbxproj b/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/project.pbxproj
index 5ed511a52444..cfc76d9316be 100644
--- a/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/project.pbxproj
@@ -8,15 +8,12 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		8FDA56F920D046020020E776 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8FDA56F820D046020020E776 /* GoogleService-Info.plist */; };
 		9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
 		9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
-		9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
 		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
 		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -43,7 +40,6 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		47511359F254D1FA05DF3B06 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -87,7 +83,6 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
@@ -181,7 +176,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0910;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = "The Chromium Authors";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -214,11 +209,8 @@
 			files = (
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				8FDA56F920D046020020E776 /* GoogleService-Info.plist in Resources */,
-				9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -247,7 +239,7 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
+				"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -359,12 +351,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -413,12 +407,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -459,6 +455,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -482,6 +479,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000000..18d981003d68
--- /dev/null
+++ b/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 1263ac84b105..ba1a98224109 100644
--- a/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

From 6ae526e1c05c71db20f3b5392b3450789a719de4 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Wed, 23 Jan 2019 11:00:26 -0800
Subject: [PATCH 072/410] update changelog for url launcher (#1105)

---
 packages/url_launcher/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/url_launcher/CHANGELOG.md b/packages/url_launcher/CHANGELOG.md
index 96b89b03ff0c..1f69cdfc1e72 100644
--- a/packages/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 4.1.0+1
 
-* Clean up.
+* This is just a version bump to republish as 4.1.0 was published with some dirty local state.
 
 ## 4.1.0
 

From a027ccd639fc24da9b9bb3e886f711e4d82f5aa3 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Wed, 23 Jan 2019 11:01:09 -0800
Subject: [PATCH 073/410] [IAP] Generate boilerplate serializers (#1090)

Brings in `json_serializable` as a build step to generate the Dart
platform channel parsing boilerplate. This dependency is still very
experimental and may be abandoned if the extra build step ends up being
a maintenance burden greater than maintaining the boilerplate. At this
point I expect it to be worth the trouble given the sheer amount of data
classes and deserialization that's going to happen in this plugin.

Also converts `SkuType` and `BillingResponse` to enums.
---
 packages/in_app_purchase/README.md            | 12 ++-
 .../in_app_purchase/analysis_options.yaml     |  3 +
 packages/in_app_purchase/build.yaml           |  8 ++
 .../billing_client_wrapper.dart               | 97 ++++++++++---------
 .../enum_converters.dart                      | 41 ++++++++
 .../enum_converters.g.dart                    | 44 +++++++++
 .../sku_details_wrapper.dart                  | 56 ++++++-----
 .../sku_details_wrapper.g.dart                | 34 +++++++
 packages/in_app_purchase/pubspec.yaml         |  7 +-
 .../billing_client_wrapper_test.dart          | 20 ++--
 .../sku_details_wrapper_test.dart             | 52 +++++-----
 .../google_play_connection_test.dart          |  3 +-
 12 files changed, 267 insertions(+), 110 deletions(-)
 create mode 100644 packages/in_app_purchase/analysis_options.yaml
 create mode 100644 packages/in_app_purchase/build.yaml
 create mode 100644 packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.dart
 create mode 100644 packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart
 create mode 100644 packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart

diff --git a/packages/in_app_purchase/README.md b/packages/in_app_purchase/README.md
index 1622bd10e301..adcf34492247 100644
--- a/packages/in_app_purchase/README.md
+++ b/packages/in_app_purchase/README.md
@@ -15,7 +15,15 @@ Play and the App Store require developers to configure an app with in-app items
 for purchase to call their in-app-purchase APIs. You can check out the [example
 app](example/README.md) for an example on configuring both.
 
-## Design
+## Development
+
+This plugin uses
+[json_serializable](https://pub.dartlang.org/packages/json_serializable) for the
+many data structs passed between the underlying platform layers and Dart. After
+editing any of the serialized data structs, rebuild the serializers by running
+`flutter packages pub run build_runner run`.
+
+### Design
 
 The API surface is stacked into 2 main layers.
 
@@ -32,4 +40,4 @@ The API surface is stacked into 2 main layers.
    [store_kit_wrappers.dart](lib/src/store_kit_wrappers.dart) and
    [billing_client_wrappers.dart](lib/src/billing_client_wrappers.dart). These
    API surfaces should expose all the platform-specific behavior and allow for
-   more fine-tuned control when needed.
+   more fine-tuned control when needed.
\ No newline at end of file
diff --git a/packages/in_app_purchase/analysis_options.yaml b/packages/in_app_purchase/analysis_options.yaml
new file mode 100644
index 000000000000..afa04c8cb084
--- /dev/null
+++ b/packages/in_app_purchase/analysis_options.yaml
@@ -0,0 +1,3 @@
+analyzer:
+  exclude:
+    - lib/**/*.g.dart # Ignore generated files
\ No newline at end of file
diff --git a/packages/in_app_purchase/build.yaml b/packages/in_app_purchase/build.yaml
new file mode 100644
index 000000000000..3ee298a9c25f
--- /dev/null
+++ b/packages/in_app_purchase/build.yaml
@@ -0,0 +1,8 @@
+targets:
+  $default:
+    builders:
+      json_serializable:
+        options:
+          any_map: true
+          create_to_json: false
+          nullable: false
\ No newline at end of file
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
index 3ed495a07065..9d1999961c2c 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
@@ -5,8 +5,10 @@
 import 'dart:async';
 import 'package:flutter/services.dart';
 import 'package:flutter/foundation.dart';
+import 'package:json_annotation/json_annotation.dart';
 import '../channel.dart';
 import 'sku_details_wrapper.dart';
+import 'enum_converters.dart';
 
 /// This class can be used directly instead of [InAppPurchaseConnection] to call
 /// Play-specific billing APIs.
@@ -58,7 +60,7 @@ class BillingClient {
       'OnBillingServiceDisconnected': onBillingServiceDisconnected,
     };
     _callbacks.add(callbacks);
-    return BillingResponse._(await channel.invokeMethod(
+    return BillingResponseConverter().fromJson(await channel.invokeMethod(
         "BillingClient#startConnection(BillingClientStateListener)",
         <String, dynamic>{'handle': _callbacks.length - 1}));
   }
@@ -89,7 +91,7 @@ class BillingClient {
       'skuType': skuType.toString(),
       'skusList': skusList
     };
-    return SkuDetailsResponseWrapper.fromMap(await channel.invokeMapMethod<
+    return SkuDetailsResponseWrapper.fromJson(await channel.invokeMapMethod<
             String, dynamic>(
         'BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)',
         arguments));
@@ -113,33 +115,45 @@ class BillingClient {
 /// to call back on `BillingClient` disconnect.
 typedef void OnBillingServiceDisconnected();
 
-/// Wraps
-/// [`BillingClient.BillingResponse`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.BillingResponse),
-/// possible status codes.
+/// Possible `BillingClient` response statuses.
 ///
-/// See the `BillingResponse` docs for an explanation of the different constants.
-class BillingResponse {
-  const BillingResponse._(this._code);
-  static BillingResponse fromInt(int code) => BillingResponse._(code);
-  final int _code;
-  @override
-  String toString() => _code.toString();
-  @override
-  int get hashCode => _code.hashCode;
-  @override
-  bool operator ==(dynamic other) =>
-      other is BillingResponse && other._code == _code;
-
-  static const BillingResponse FEATURE_NOT_SUPPORTED = BillingResponse._(-2);
-  static const BillingResponse OK = BillingResponse._(0);
-  static const BillingResponse USER_CANCELED = BillingResponse._(1);
-  static const BillingResponse SERVICE_UNAVAILABLE = BillingResponse._(2);
-  static const BillingResponse BILLING_UNAVAILABLE = BillingResponse._(3);
-  static const BillingResponse ITEM_UNAVAILABLE = BillingResponse._(4);
-  static const BillingResponse DEVELOPER_ERROR = BillingResponse._(5);
-  static const BillingResponse ERROR = BillingResponse._(6);
-  static const BillingResponse ITEM_ALREADY_OWNED = BillingResponse._(7);
-  static const BillingResponse ITEM_NOT_OWNED = BillingResponse._(8);
+/// Wraps
+/// [`BillingClient.BillingResponse`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.BillingResponse).
+/// See the `BillingResponse` docs for more explanation of the different
+/// constants.
+enum BillingResponse {
+  // WARNING: Changes to this class need to be reflected in our generated code.
+  // Run `flutter packages pub run build_runner watch` to rebuild and watch for
+  // further changes.
+  @JsonValue(-2)
+  featureNotSupported,
+
+  @JsonValue(0)
+  ok,
+
+  @JsonValue(1)
+  userCanceled,
+
+  @JsonValue(2)
+  serviceUnavailable,
+
+  @JsonValue(3)
+  billingUnavailable,
+
+  @JsonValue(4)
+  itemUnavailable,
+
+  @JsonValue(5)
+  developerError,
+
+  @JsonValue(6)
+  error,
+
+  @JsonValue(7)
+  itemAlreadyOwned,
+
+  @JsonValue(8)
+  itemNotOwned,
 }
 
 /// Enum representing potential [SkuDetailsWrapper.type]s.
@@ -147,27 +161,16 @@ class BillingResponse {
 /// Wraps
 /// [`BillingClient.SkuType`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.SkuType)
 /// See the linked documentation for an explanation of the different constants.
-class SkuType {
-  const SkuType._(this._type);
-  static SkuType fromString(String type) {
-    final SkuType skuType = SkuType._(type);
-    if (skuType != INAPP && skuType != SUBS) {
-      return null;
-    }
-    return skuType;
-  }
-
-  final String _type;
-  @override
-  String toString() => _type;
-  @override
-  int get hashCode => _type.hashCode;
-  @override
-  bool operator ==(dynamic other) => other is SkuType && other._type == _type;
+enum SkuType {
+  // WARNING: Changes to this class need to be reflected in our generated code.
+  // Run `flutter packages pub run build_runner watch` to rebuild and watch for
+  // further changes.
 
   /// A one time product. Acquired in a single transaction.
-  static const SkuType INAPP = SkuType._("inapp");
+  @JsonValue('inapp')
+  inapp,
 
   /// A product requiring a recurring charge over time.
-  static const SkuType SUBS = SkuType._("subs");
+  @JsonValue('subs')
+  subs,
 }
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.dart
new file mode 100644
index 000000000000..ac22623100e1
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.dart
@@ -0,0 +1,41 @@
+import 'package:in_app_purchase/billing_client_wrappers.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'enum_converters.g.dart';
+
+/// Serializer for [BillingResponse].
+///
+/// Use these in `@JsonSerializable()` classes by annotating them with
+/// `@BillingResponseConverter()`.
+class BillingResponseConverter implements JsonConverter<BillingResponse, int> {
+  const BillingResponseConverter();
+
+  @override
+  BillingResponse fromJson(int json) => _$enumDecode<BillingResponse>(
+      _$BillingResponseEnumMap.cast<BillingResponse, dynamic>(), json);
+
+  @override
+  int toJson(BillingResponse object) => _$BillingResponseEnumMap[object];
+}
+
+/// Serializer for [SkuType].
+///
+/// Use these in `@JsonSerializable()` classes by annotating them with
+/// `@SkuTypeConverter()`.
+class SkuTypeConverter implements JsonConverter<SkuType, String> {
+  const SkuTypeConverter();
+
+  @override
+  SkuType fromJson(String json) =>
+      _$enumDecode<SkuType>(_$SkuTypeEnumMap.cast<SkuType, dynamic>(), json);
+
+  @override
+  String toJson(SkuType object) => _$SkuTypeEnumMap[object];
+}
+
+// Define a class so we generate serializer helper methods for the enums
+@JsonSerializable()
+class _SerializedEnums {
+  BillingResponse response;
+  SkuType type;
+}
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart
new file mode 100644
index 000000000000..c8fd5024ba22
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart
@@ -0,0 +1,44 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'enum_converters.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_SerializedEnums _$_SerializedEnumsFromJson(Map json) {
+  return _SerializedEnums()
+    ..response = _$enumDecode(_$BillingResponseEnumMap, json['response'])
+    ..type = _$enumDecode(_$SkuTypeEnumMap, json['type']);
+}
+
+T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    throw ArgumentError('A value must be provided. Supported values: '
+        '${enumValues.values.join(', ')}');
+  }
+  return enumValues.entries
+      .singleWhere((e) => e.value == source,
+          orElse: () => throw ArgumentError(
+              '`$source` is not one of the supported values: '
+              '${enumValues.values.join(', ')}'))
+      .key;
+}
+
+const _$BillingResponseEnumMap = <BillingResponse, dynamic>{
+  BillingResponse.featureNotSupported: -2,
+  BillingResponse.ok: 0,
+  BillingResponse.userCanceled: 1,
+  BillingResponse.serviceUnavailable: 2,
+  BillingResponse.billingUnavailable: 3,
+  BillingResponse.itemUnavailable: 4,
+  BillingResponse.developerError: 5,
+  BillingResponse.error: 6,
+  BillingResponse.itemAlreadyOwned: 7,
+  BillingResponse.itemNotOwned: 8
+};
+
+const _$SkuTypeEnumMap = <SkuType, dynamic>{
+  SkuType.inapp: 'inapp',
+  SkuType.subs: 'subs'
+};
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
index 68c751a92a71..670bf5125491 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
@@ -4,11 +4,20 @@
 
 import 'dart:ui' show hashValues;
 import 'package:flutter/foundation.dart';
+import 'package:json_annotation/json_annotation.dart';
 import 'billing_client_wrapper.dart';
+import 'enum_converters.dart';
+
+// WARNING: Changes to `@JsonSerializable` classes need to be reflected in the
+// below generated file. Run `flutter packages pub run build_runner watch` to
+// rebuild and watch for further changes.
+part 'sku_details_wrapper.g.dart';
 
 /// Dart wrapper around [`com.android.billingclient.api.SkuDetails`](https://developer.android.com/reference/com/android/billingclient/api/SkuDetails).
 ///
 /// Contains the details of an available product in Google Play Billing.
+@JsonSerializable()
+@SkuTypeConverter()
 class SkuDetailsWrapper {
   @visibleForTesting
   SkuDetailsWrapper({
@@ -33,28 +42,15 @@ class SkuDetailsWrapper {
   /// The map needs to have named string keys with values matching the names and
   /// types of all of the members on this class.
   @visibleForTesting
-  SkuDetailsWrapper.fromMap(Map<dynamic, dynamic> map)
-      : description = map['description'],
-        freeTrialPeriod = map['freeTrialPeriod'],
-        introductoryPrice = map['introductoryPrice'],
-        introductoryPriceMicros = map['introductoryPriceMicros'],
-        introductoryPriceCycles = map['introductoryPriceCycles'],
-        introductoryPricePeriod = map['introductoryPricePeriod'],
-        price = map['price'],
-        priceAmountMicros = map['priceAmountMicros'],
-        priceCurrencyCode = map['priceCurrencyCode'],
-        sku = map['sku'],
-        subscriptionPeriod = map['subscriptionPeriod'],
-        title = map['title'],
-        type = SkuType.fromString(map['type']),
-        isRewarded = map['isRewarded'];
+  factory SkuDetailsWrapper.fromJson(Map map) =>
+      _$SkuDetailsWrapperFromJson(map);
 
   final String description;
 
   /// Trial period in ISO 8601 format.
   final String freeTrialPeriod;
 
-  /// Introductory price, only applies to [SkuType.SUBS]. Formatted ("$0.99").
+  /// Introductory price, only applies to [SkuType.subs]. Formatted ("$0.99").
   final String introductoryPrice;
 
   /// [introductoryPrice] in micro-units 990000
@@ -78,7 +74,7 @@ class SkuDetailsWrapper {
   /// The product ID in Google Play Console.
   final String sku;
 
-  /// Applies to [SkuType.SUBS], formatted in ISO 8601.
+  /// Applies to [SkuType.subs], formatted in ISO 8601.
   final String subscriptionPeriod;
   final String title;
 
@@ -133,6 +129,8 @@ class SkuDetailsWrapper {
 /// Translation of [`com.android.billingclient.api.SkuDetailsResponseListener`](https://developer.android.com/reference/com/android/billingclient/api/SkuDetailsResponseListener.html).
 ///
 /// Returned by [BillingClient.querySkuDetails].
+@JsonSerializable()
+@BillingResponseConverter()
 class SkuDetailsResponseWrapper {
   @visibleForTesting
   SkuDetailsResponseWrapper({@required this.responseCode, this.skuDetailsList});
@@ -141,17 +139,27 @@ class SkuDetailsResponseWrapper {
   ///
   /// The map needs to have named string keys with values matching the names and
   /// types of all of the members on this class.
-  SkuDetailsResponseWrapper.fromMap(Map<dynamic, dynamic> map)
-      : responseCode = BillingResponse.fromInt(map['responseCode']),
-        skuDetailsList =
-            List.castFrom<dynamic, Map<dynamic, dynamic>>(map['skuDetailsList'])
-                .map((Map<dynamic, dynamic> entry) =>
-                    SkuDetailsWrapper.fromMap(entry))
-                .toList();
+  factory SkuDetailsResponseWrapper.fromJson(Map<String, dynamic> map) =>
+      _$SkuDetailsResponseWrapperFromJson(map);
 
   /// The final status of the [BillingClient.querySkuDetails] call.
   final BillingResponse responseCode;
 
   /// A list of [SkuDetailsWrapper] matching the query to [BillingClient.querySkuDetails].
   final List<SkuDetailsWrapper> skuDetailsList;
+
+  @override
+  bool operator ==(dynamic other) {
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final SkuDetailsResponseWrapper typedOther = other;
+    return typedOther is SkuDetailsResponseWrapper &&
+        typedOther.responseCode == responseCode &&
+        typedOther.skuDetailsList == skuDetailsList;
+  }
+
+  @override
+  int get hashCode => hashValues(responseCode, skuDetailsList);
 }
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
new file mode 100644
index 000000000000..631cd15c22e1
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
@@ -0,0 +1,34 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'sku_details_wrapper.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SkuDetailsWrapper _$SkuDetailsWrapperFromJson(Map json) {
+  return SkuDetailsWrapper(
+      description: json['description'] as String,
+      freeTrialPeriod: json['freeTrialPeriod'] as String,
+      introductoryPrice: json['introductoryPrice'] as String,
+      introductoryPriceMicros: json['introductoryPriceMicros'] as String,
+      introductoryPriceCycles: json['introductoryPriceCycles'] as String,
+      introductoryPricePeriod: json['introductoryPricePeriod'] as String,
+      price: json['price'] as String,
+      priceAmountMicros: json['priceAmountMicros'] as int,
+      priceCurrencyCode: json['priceCurrencyCode'] as String,
+      sku: json['sku'] as String,
+      subscriptionPeriod: json['subscriptionPeriod'] as String,
+      title: json['title'] as String,
+      type: const SkuTypeConverter().fromJson(json['type'] as String),
+      isRewarded: json['isRewarded'] as bool);
+}
+
+SkuDetailsResponseWrapper _$SkuDetailsResponseWrapperFromJson(Map json) {
+  return SkuDetailsResponseWrapper(
+      responseCode: const BillingResponseConverter()
+          .fromJson(json['responseCode'] as int),
+      skuDetailsList: (json['skuDetailsList'] as List)
+          .map((e) => SkuDetailsWrapper.fromJson(e as Map))
+          .toList());
+}
diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml
index 67baf782c062..3c4eaa0c896b 100644
--- a/packages/in_app_purchase/pubspec.yaml
+++ b/packages/in_app_purchase/pubspec.yaml
@@ -5,19 +5,22 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/in_app_purchas
 version: 0.0.2
 
 dependencies:
+  async: ^2.0.8
   flutter:
     sdk: flutter
-  async: ^2.0.8
+  json_annotation: ^2.0.0
   meta: ^1.1.6
 
 dev_dependencies:
+  build_runner: ^1.0.0
+  json_serializable: ^2.0.0
   flutter_test:
     sdk: flutter
-  test: 1.5.1
   flutter_driver:
     sdk: flutter
   in_app_purchase_example:
     path: example/
+  test: 1.5.1
 
 flutter:
   plugin:
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
index 4b88a0487036..b991faa33017 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
@@ -6,6 +6,7 @@ import 'package:test/test.dart';
 import 'package:flutter/services.dart';
 
 import 'package:in_app_purchase/billing_client_wrappers.dart';
+import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
 import 'package:in_app_purchase/src/channel.dart';
 import '../stub_in_app_purchase_platform.dart';
 import 'sku_details_wrapper_test.dart';
@@ -37,18 +38,19 @@ void main() {
     test('returns BillingResponse', () async {
       stubPlatform.addResponse(
           name: 'BillingClient#startConnection(BillingClientStateListener)',
-          value: int.parse(BillingResponse.OK.toString()));
+          value: BillingResponseConverter().toJson(BillingResponse.ok));
       expect(
           await billingClient.startConnection(
               onBillingServiceDisconnected: () {}),
-          equals(BillingResponse.OK));
+          equals(BillingResponse.ok));
     });
 
     test('passes handle to onBillingServiceDisconnected', () async {
       final String methodName =
           'BillingClient#startConnection(BillingClientStateListener)';
       stubPlatform.addResponse(
-          name: methodName, value: int.parse(BillingResponse.OK.toString()));
+          name: methodName,
+          value: BillingResponseConverter().toJson(BillingResponse.ok));
       await billingClient.startConnection(onBillingServiceDisconnected: () {});
       final MethodCall call = stubPlatform.previousCallMatching(methodName);
       expect(call.arguments, equals(<dynamic, dynamic>{'handle': 0}));
@@ -68,30 +70,30 @@ void main() {
         'BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)';
 
     test('handles empty skuDetails', () async {
-      final BillingResponse responseCode = BillingResponse.DEVELOPER_ERROR;
+      final BillingResponse responseCode = BillingResponse.developerError;
       stubPlatform.addResponse(name: queryMethodName, value: <dynamic, dynamic>{
-        'responseCode': int.parse(responseCode.toString()),
+        'responseCode': BillingResponseConverter().toJson(responseCode),
         'skuDetailsList': <Map<String, dynamic>>[]
       });
 
       final SkuDetailsResponseWrapper response = await billingClient
           .querySkuDetails(
-              skuType: SkuType.INAPP, skusList: <String>['invalid']);
+              skuType: SkuType.inapp, skusList: <String>['invalid']);
 
       expect(response.responseCode, equals(responseCode));
       expect(response.skuDetailsList, isEmpty);
     });
 
     test('returns SkuDetailsResponseWrapper', () async {
-      final BillingResponse responseCode = BillingResponse.OK;
+      final BillingResponse responseCode = BillingResponse.ok;
       stubPlatform.addResponse(name: queryMethodName, value: <String, dynamic>{
-        'responseCode': int.parse(responseCode.toString()),
+        'responseCode': BillingResponseConverter().toJson(responseCode),
         'skuDetailsList': <Map<String, dynamic>>[buildSkuMap(dummyWrapper)]
       });
 
       final SkuDetailsResponseWrapper response = await billingClient
           .querySkuDetails(
-              skuType: SkuType.INAPP, skusList: <String>['invalid']);
+              skuType: SkuType.inapp, skusList: <String>['invalid']);
 
       expect(response.responseCode, equals(responseCode));
       expect(response.skuDetailsList, contains(dummyWrapper));
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
index c22181bfa11c..0e4503ff44b4 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
@@ -4,6 +4,7 @@
 
 import 'package:test/test.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
+import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
 
 final SkuDetailsWrapper dummyWrapper = SkuDetailsWrapper(
   description: 'description',
@@ -18,7 +19,7 @@ final SkuDetailsWrapper dummyWrapper = SkuDetailsWrapper(
   sku: 'sku',
   subscriptionPeriod: 'subscriptionPeriod',
   title: 'title',
-  type: SkuType.INAPP,
+  type: SkuType.inapp,
   isRewarded: true,
 );
 
@@ -27,7 +28,7 @@ void main() {
     test('converts from map', () {
       final SkuDetailsWrapper expected = dummyWrapper;
       final SkuDetailsWrapper parsed =
-          SkuDetailsWrapper.fromMap(buildSkuMap(expected));
+          SkuDetailsWrapper.fromJson(buildSkuMap(expected));
 
       expect(parsed, equals(expected));
     });
@@ -35,7 +36,7 @@ void main() {
 
   group('SkuDetailsResponseWrapper', () {
     test('parsed from map', () {
-      final BillingResponse responseCode = BillingResponse.OK;
+      final BillingResponse responseCode = BillingResponse.ok;
       final List<SkuDetailsWrapper> skusDetails = <SkuDetailsWrapper>[
         dummyWrapper,
         dummyWrapper
@@ -44,8 +45,8 @@ void main() {
           responseCode: responseCode, skuDetailsList: skusDetails);
 
       final SkuDetailsResponseWrapper parsed =
-          SkuDetailsResponseWrapper.fromMap(<String, dynamic>{
-        'responseCode': int.parse(responseCode.toString()),
+          SkuDetailsResponseWrapper.fromJson(<String, dynamic>{
+        'responseCode': BillingResponseConverter().toJson(responseCode),
         'skuDetailsList': <Map<String, dynamic>>[
           buildSkuMap(dummyWrapper),
           buildSkuMap(dummyWrapper)
@@ -57,14 +58,14 @@ void main() {
     });
 
     test('handles empty list of skuDetails', () {
-      final BillingResponse responseCode = BillingResponse.ERROR;
+      final BillingResponse responseCode = BillingResponse.error;
       final List<SkuDetailsWrapper> skusDetails = <SkuDetailsWrapper>[];
       final SkuDetailsResponseWrapper expected = SkuDetailsResponseWrapper(
           responseCode: responseCode, skuDetailsList: skusDetails);
 
       final SkuDetailsResponseWrapper parsed =
-          SkuDetailsResponseWrapper.fromMap(<String, dynamic>{
-        'responseCode': int.parse(responseCode.toString()),
+          SkuDetailsResponseWrapper.fromJson(<String, dynamic>{
+        'responseCode': BillingResponseConverter().toJson(responseCode),
         'skuDetailsList': <Map<String, dynamic>>[]
       });
 
@@ -74,20 +75,21 @@ void main() {
   });
 }
 
-Map<String, dynamic> buildSkuMap(SkuDetailsWrapper original) =>
-    <String, dynamic>{
-      'description': original.description,
-      'freeTrialPeriod': original.freeTrialPeriod,
-      'introductoryPrice': original.introductoryPrice,
-      'introductoryPriceMicros': original.introductoryPriceMicros,
-      'introductoryPriceCycles': original.introductoryPriceCycles,
-      'introductoryPricePeriod': original.introductoryPricePeriod,
-      'price': original.price,
-      'priceAmountMicros': original.priceAmountMicros,
-      'priceCurrencyCode': original.priceCurrencyCode,
-      'sku': original.sku,
-      'subscriptionPeriod': original.subscriptionPeriod,
-      'title': original.title,
-      'type': original.type.toString(),
-      'isRewarded': original.isRewarded,
-    };
+Map<String, dynamic> buildSkuMap(SkuDetailsWrapper original) {
+  return <String, dynamic>{
+    'description': original.description,
+    'freeTrialPeriod': original.freeTrialPeriod,
+    'introductoryPrice': original.introductoryPrice,
+    'introductoryPriceMicros': original.introductoryPriceMicros,
+    'introductoryPriceCycles': original.introductoryPriceCycles,
+    'introductoryPricePeriod': original.introductoryPricePeriod,
+    'price': original.price,
+    'priceAmountMicros': original.priceAmountMicros,
+    'priceCurrencyCode': original.priceCurrencyCode,
+    'sku': original.sku,
+    'subscriptionPeriod': original.subscriptionPeriod,
+    'title': original.title,
+    'type': original.type.toString().substring(8),
+    'isRewarded': original.isRewarded,
+  };
+}
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index 8c9262b4d279..2c9201d4538e 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -6,6 +6,7 @@ import 'package:test/test.dart';
 
 import 'package:flutter/widgets.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
+import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/google_play_connection.dart';
 import 'package:in_app_purchase/src/channel.dart';
 import '../stub_in_app_purchase_platform.dart';
@@ -24,7 +25,7 @@ void main() {
     WidgetsFlutterBinding.ensureInitialized();
     stubPlatform.addResponse(
         name: startConnectionCall,
-        value: int.parse(BillingResponse.OK.toString()));
+        value: BillingResponseConverter().toJson(BillingResponse.ok));
     stubPlatform.addResponse(name: endConnectionCall, value: null);
     connection = GooglePlayConnection.instance;
   });

From 7a6dd46135efbe4b0eb144a8e1054f6ba0324491 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Wed, 23 Jan 2019 14:22:59 -0800
Subject: [PATCH 074/410] Update all plugins to minimum iOS 8.0 (#1109)

---
 .../ios/Runner.xcodeproj/project.pbxproj      |  6 +---
 .../xcshareddata/IDEWorkspaceChecks.plist     |  8 +++++
 .../ios/cloud_firestore.podspec               |  2 +-
 .../ios/Runner.xcodeproj/project.pbxproj      | 31 +++++--------------
 .../ios/firebase_analytics.podspec            |  2 +-
 .../ios/Runner.xcodeproj/project.pbxproj      |  9 +-----
 .../firebase_auth/ios/firebase_auth.podspec   |  2 +-
 .../ios/Runner.xcodeproj/project.pbxproj      | 22 +------------
 .../ios/firebase_database.podspec             |  2 +-
 .../ios/Runner.xcodeproj/project.pbxproj      |  2 +-
 .../ios/Runner.xcodeproj/project.pbxproj      | 25 +--------------
 .../ios/firebase_remote_config.podspec        |  2 +-
 .../ios/Runner.xcodeproj/project.pbxproj      |  6 +---
 .../ios/firebase_storage.podspec              |  2 +-
 14 files changed, 27 insertions(+), 94 deletions(-)
 mode change 100755 => 100644 packages/cloud_firestore/example/ios/Runner.xcodeproj/project.pbxproj
 create mode 100644 packages/cloud_firestore/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 mode change 100755 => 100644 packages/firebase_analytics/example/ios/Runner.xcodeproj/project.pbxproj
 mode change 100755 => 100644 packages/firebase_database/example/ios/Runner.xcodeproj/project.pbxproj

diff --git a/packages/cloud_firestore/example/ios/Runner.xcodeproj/project.pbxproj b/packages/cloud_firestore/example/ios/Runner.xcodeproj/project.pbxproj
old mode 100755
new mode 100644
index 007adf7850f6..80980c30cd85
--- a/packages/cloud_firestore/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/cloud_firestore/example/ios/Runner.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -41,7 +40,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		5C6F5A6F1EC3CCCC008D64B5 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
@@ -88,7 +86,6 @@
 			children = (
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -216,7 +213,6 @@
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
@@ -265,7 +261,7 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework",
+				"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
diff --git a/packages/cloud_firestore/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/cloud_firestore/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000000..18d981003d68
--- /dev/null
+++ b/packages/cloud_firestore/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/packages/cloud_firestore/ios/cloud_firestore.podspec b/packages/cloud_firestore/ios/cloud_firestore.podspec
index 95bf456861ef..fe753037602e 100755
--- a/packages/cloud_firestore/ios/cloud_firestore.podspec
+++ b/packages/cloud_firestore/ios/cloud_firestore.podspec
@@ -14,7 +14,7 @@ Firestore plugin for Flutter.
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
-  s.ios.deployment_target = '6.0'
+  s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
   s.dependency 'Firebase/Database'
   s.dependency 'Firebase/Core'
diff --git a/packages/firebase_analytics/example/ios/Runner.xcodeproj/project.pbxproj b/packages/firebase_analytics/example/ios/Runner.xcodeproj/project.pbxproj
old mode 100755
new mode 100644
index 7f76c28d52d3..5d3acaf85694
--- a/packages/firebase_analytics/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/firebase_analytics/example/ios/Runner.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		5C6F5A6B1EC3AF0E008D64B5 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C6F5A6A1EC3AF0E008D64B5 /* GeneratedPluginRegistrant.m */; };
@@ -40,7 +39,6 @@
 
 /* Begin PBXFileReference section */
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		4D558BB7489B1C82B42A9097 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5C6F5A691EC3AF0E008D64B5 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
@@ -86,7 +84,6 @@
 			children = (
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -161,7 +158,6 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				95BB15E9E1769C0D146AA592 /* [CP] Embed Pods Frameworks */,
-				532EA9D341340B1DCD08293D /* [CP] Copy Pods Resources */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 			);
 			buildRules = (
@@ -184,7 +180,6 @@
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
-						DevelopmentTeam = 3GRKCVVJ22;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -215,7 +210,6 @@
 				B43DDBB51EA0304000A48ABE /* GoogleService-Info.plist in Resources */,
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
@@ -238,30 +232,18 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
 		};
-		532EA9D341340B1DCD08293D /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		95BB15E9E1769C0D146AA592 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -288,13 +270,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -428,7 +413,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = 3GRKCVVJ22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -453,7 +437,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = 3GRKCVVJ22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/packages/firebase_analytics/ios/firebase_analytics.podspec b/packages/firebase_analytics/ios/firebase_analytics.podspec
index 1be5f0dd6df9..9f59d1d01207 100755
--- a/packages/firebase_analytics/ios/firebase_analytics.podspec
+++ b/packages/firebase_analytics/ios/firebase_analytics.podspec
@@ -14,7 +14,7 @@ Firebase Analytics plugin for Flutter.
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
-  s.ios.deployment_target = '6.0'
+  s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
   s.dependency 'Firebase/Core'
   s.static_framework = true
diff --git a/packages/firebase_auth/example/ios/Runner.xcodeproj/project.pbxproj b/packages/firebase_auth/example/ios/Runner.xcodeproj/project.pbxproj
index db497a45aa5b..c143be24864c 100644
--- a/packages/firebase_auth/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/firebase_auth/example/ios/Runner.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		0690AA46E879ED4CF7B7AEB4 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A6A0D603F1BEC33B95572EC3 /* libPods-Runner.a */; };
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -41,7 +40,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		5C97AA4E1EC3F2C300D441D1 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
@@ -88,7 +86,6 @@
 			children = (
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -186,7 +183,6 @@
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
-						DevelopmentTeam = 3GRKCVVJ22;
 					};
 				};
 			};
@@ -217,7 +213,6 @@
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
@@ -268,7 +263,7 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
+				"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -442,7 +437,6 @@
 			buildSettings = {
 				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 3GRKCVVJ22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -465,7 +459,6 @@
 			buildSettings = {
 				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 3GRKCVVJ22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/packages/firebase_auth/ios/firebase_auth.podspec b/packages/firebase_auth/ios/firebase_auth.podspec
index ec9823077aa7..09b13032641b 100755
--- a/packages/firebase_auth/ios/firebase_auth.podspec
+++ b/packages/firebase_auth/ios/firebase_auth.podspec
@@ -14,7 +14,7 @@ Firebase Auth plugin for Flutter.
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
-  s.ios.deployment_target = '6.0'
+  s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
   s.dependency 'Firebase/Auth'
   s.dependency 'Firebase/Core'
diff --git a/packages/firebase_database/example/ios/Runner.xcodeproj/project.pbxproj b/packages/firebase_database/example/ios/Runner.xcodeproj/project.pbxproj
old mode 100755
new mode 100644
index 885a07935071..9ad834907b41
--- a/packages/firebase_database/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/firebase_database/example/ios/Runner.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -41,7 +40,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		5C6F5A6F1EC3CCCC008D64B5 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
@@ -88,7 +86,6 @@
 			children = (
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -163,7 +160,6 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				95BB15E9E1769C0D146AA592 /* [CP] Embed Pods Frameworks */,
-				532EA9D341340B1DCD08293D /* [CP] Copy Pods Resources */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 			);
 			buildRules = (
@@ -216,7 +212,6 @@
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
@@ -240,21 +235,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
 		};
-		532EA9D341340B1DCD08293D /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		95BB15E9E1769C0D146AA592 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -262,7 +242,7 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework",
+				"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
diff --git a/packages/firebase_database/ios/firebase_database.podspec b/packages/firebase_database/ios/firebase_database.podspec
index 8459b4fb3d98..8383674ae1a2 100755
--- a/packages/firebase_database/ios/firebase_database.podspec
+++ b/packages/firebase_database/ios/firebase_database.podspec
@@ -14,7 +14,7 @@ Firebase Database plugin for Flutter.
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
-  s.ios.deployment_target = '6.0'
+  s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
   s.dependency 'Firebase/Database'
   s.static_framework = true
diff --git a/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/project.pbxproj b/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/project.pbxproj
index cfc76d9316be..826fc6e9146c 100644
--- a/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/firebase_ml_vision/example/ios/Runner.xcodeproj/project.pbxproj
@@ -239,7 +239,7 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
+				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
diff --git a/packages/firebase_remote_config/example/ios/Runner.xcodeproj/project.pbxproj b/packages/firebase_remote_config/example/ios/Runner.xcodeproj/project.pbxproj
index 97234f87b516..1d083180dd16 100644
--- a/packages/firebase_remote_config/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/firebase_remote_config/example/ios/Runner.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		2D6D2766E14E657030745966 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9305D2E097F7C3459489ECC /* libPods-Runner.a */; };
 		32F83A89202CD0EF00F9ABDD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 32F83A88202CD0EF00F9ABDD /* GoogleService-Info.plist */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
@@ -43,7 +42,6 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		32F83A88202CD0EF00F9ABDD /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
@@ -87,7 +85,6 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
@@ -164,7 +161,6 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				5CC7800A6771FA590AF8C939 /* [CP] Embed Pods Frameworks */,
-				22D87B3C43DE5EE12908FE1E /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -186,7 +182,6 @@
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
-						DevelopmentTeam = EQHXZ8M8AV;
 					};
 				};
 			};
@@ -219,7 +214,6 @@
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -227,21 +221,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		22D87B3C43DE5EE12908FE1E /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -263,7 +242,7 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../../../../../../../../../opt/flutter/bin/cache/artifacts/engine/ios/Flutter.framework",
+				"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -449,7 +428,6 @@
 			buildSettings = {
 				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = EQHXZ8M8AV;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -472,7 +450,6 @@
 			buildSettings = {
 				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = EQHXZ8M8AV;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/packages/firebase_remote_config/ios/firebase_remote_config.podspec b/packages/firebase_remote_config/ios/firebase_remote_config.podspec
index 080667bc54f0..27255137ac2c 100644
--- a/packages/firebase_remote_config/ios/firebase_remote_config.podspec
+++ b/packages/firebase_remote_config/ios/firebase_remote_config.podspec
@@ -14,7 +14,7 @@ Firebase Remote Config plugin for Flutter.
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
-  s.ios.deployment_target = '6.0'
+  s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
   s.dependency 'Firebase/RemoteConfig'
   s.static_framework = true
diff --git a/packages/firebase_storage/example/ios/Runner.xcodeproj/project.pbxproj b/packages/firebase_storage/example/ios/Runner.xcodeproj/project.pbxproj
index b11fdb33a364..54e5e34c25f9 100644
--- a/packages/firebase_storage/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/firebase_storage/example/ios/Runner.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -41,7 +40,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		5C6F5A6F1EC3CCCC008D64B5 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
@@ -88,7 +86,6 @@
 			children = (
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -215,7 +212,6 @@
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
@@ -246,7 +242,7 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework",
+				"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
diff --git a/packages/firebase_storage/ios/firebase_storage.podspec b/packages/firebase_storage/ios/firebase_storage.podspec
index 608603ab9e4b..1b0617b7fb72 100755
--- a/packages/firebase_storage/ios/firebase_storage.podspec
+++ b/packages/firebase_storage/ios/firebase_storage.podspec
@@ -14,7 +14,7 @@ Firebase Storage plugin for Flutter.
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
-  s.ios.deployment_target = '6.0'
+  s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
   s.dependency 'Firebase/Storage'
   s.static_framework = true

From 014e37363114a79122aa369a2a10661535336749 Mon Sep 17 00:00:00 2001
From: Rodrigo Castro <recastrodiaz@gmail.com>
Date: Thu, 24 Jan 2019 10:52:43 -0600
Subject: [PATCH 075/410] [video_player] Fix aspect ratio (#690)

* * Added access to the video rotation in degrees (rotationDegrees). Possible values are: 0, 90, 180 and 270.
* Updated the aspectRatio getter to use the video rotation.
* Fixed the aspect ratio of videos in the video_player plugin example. It now properly displays 'rotated' videos.
* Ensure videos are not upside down nor streteched when using the video_player plugin on iOS devices. The fix sets the videoComposition of the respective AVPlayerItem to use the preferredTransform of the video (the rotation matrix for the video)

* - Bump video_player version to 0.9.0
- Move play/pause logic within setState closure in video_player example
---
 packages/image_picker/example/lib/main.dart   |   3 +-
 packages/video_player/CHANGELOG.md            |   5 +
 packages/video_player/README.md               |  28 +--
 .../videoplayer/VideoPlayerPlugin.java        |  17 +-
 packages/video_player/example/lib/main.dart   |   4 +-
 .../ios/Classes/VideoPlayerPlugin.m           | 188 ++++++++++++++----
 packages/video_player/lib/video_player.dart   |   3 +-
 packages/video_player/pubspec.yaml            |   2 +-
 8 files changed, 192 insertions(+), 58 deletions(-)

diff --git a/packages/image_picker/example/lib/main.dart b/packages/image_picker/example/lib/main.dart
index 4dceb56e4ff2..79ceb35a61f6 100755
--- a/packages/image_picker/example/lib/main.dart
+++ b/packages/image_picker/example/lib/main.dart
@@ -226,10 +226,9 @@ class AspectRatioVideoState extends State<AspectRatioVideo> {
   @override
   Widget build(BuildContext context) {
     if (initialized) {
-      final Size size = controller.value.size;
       return Center(
         child: AspectRatio(
-          aspectRatio: size.width / size.height,
+          aspectRatio: controller.value?.aspectRatio,
           child: VideoPlayer(controller),
         ),
       );
diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md
index 3ce24012c30e..338fb22395ef 100644
--- a/packages/video_player/CHANGELOG.md
+++ b/packages/video_player/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.9.0
+
+* Fixed the aspect ratio and orientation of videos. Videos are now properly displayed when recorded 
+ in portrait mode both in iOS and Android.
+
 ## 0.8.0
 
 * Android: Upgrade ExoPlayer to 2.9.1
diff --git a/packages/video_player/README.md b/packages/video_player/README.md
index 3a2a399724f9..fe9a8accff65 100644
--- a/packages/video_player/README.md
+++ b/packages/video_player/README.md
@@ -55,22 +55,12 @@ class VideoApp extends StatefulWidget {
 
 class _VideoAppState extends State<VideoApp> {
   VideoPlayerController _controller;
-  bool _isPlaying = false;
 
   @override
   void initState() {
     super.initState();
     _controller = VideoPlayerController.network(
-      'http://www.sample-videos.com/video/mp4/720/big_buck_bunny_720p_20mb.mp4',
-    )
-      ..addListener(() {
-        final bool isPlaying = _controller.value.isPlaying;
-        if (isPlaying != _isPlaying) {
-          setState(() {
-            _isPlaying = isPlaying;
-          });
-        }
-      })
+        'http://www.sample-videos.com/video123/mp4/720/big_buck_bunny_720p_20mb.mp4')
       ..initialize().then((_) {
         // Ensure the first frame is shown after the video is initialized, even before the play button has been pressed.
         setState(() {});
@@ -91,9 +81,13 @@ class _VideoAppState extends State<VideoApp> {
               : Container(),
         ),
         floatingActionButton: FloatingActionButton(
-          onPressed: _controller.value.isPlaying
-              ? _controller.pause
-              : _controller.play,
+          onPressed: () {
+            setState(() {
+              _controller.value.isPlaying
+                  ? _controller.pause()
+                  : _controller.play();
+            });
+          },
           child: Icon(
             _controller.value.isPlaying ? Icons.pause : Icons.play_arrow,
           ),
@@ -101,5 +95,11 @@ class _VideoAppState extends State<VideoApp> {
       ),
     );
   }
+
+  @override
+  void dispose() {
+    super.dispose();
+    _controller.dispose();
+  }
 }
 ```
diff --git a/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java b/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
index 2b730214068d..de4f44cdb567 100644
--- a/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
+++ b/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
@@ -15,6 +15,7 @@
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Player.DefaultEventListener;
 import com.google.android.exoplayer2.SimpleExoPlayer;
@@ -51,6 +52,8 @@
 
 public class VideoPlayerPlugin implements MethodCallHandler {
 
+  private static final String TAG = "VideoPlayerPlugin";
+
   private static class VideoPlayer {
 
     private SimpleExoPlayer exoPlayer;
@@ -220,9 +223,19 @@ private void sendInitialized() {
         Map<String, Object> event = new HashMap<>();
         event.put("event", "initialized");
         event.put("duration", exoPlayer.getDuration());
+
         if (exoPlayer.getVideoFormat() != null) {
-          event.put("width", exoPlayer.getVideoFormat().width);
-          event.put("height", exoPlayer.getVideoFormat().height);
+          Format videoFormat = exoPlayer.getVideoFormat();
+          int width = videoFormat.width;
+          int height = videoFormat.height;
+          int rotationDegrees = videoFormat.rotationDegrees;
+          // Switch the width/height if video was taken in portrait mode
+          if (rotationDegrees == 90 || rotationDegrees == 270) {
+            width = exoPlayer.getVideoFormat().height;
+            height = exoPlayer.getVideoFormat().width;
+          }
+          event.put("width", width);
+          event.put("height", height);
         }
         eventSink.success(event);
       }
diff --git a/packages/video_player/example/lib/main.dart b/packages/video_player/example/lib/main.dart
index d1cec7fcc68a..696373b0a5b3 100644
--- a/packages/video_player/example/lib/main.dart
+++ b/packages/video_player/example/lib/main.dart
@@ -380,7 +380,7 @@ void main() {
               Column(
                 children: <Widget>[
                   NetworkPlayerLifeCycle(
-                    'http://www.sample-videos.com/video/mp4/720/big_buck_bunny_720p_20mb.mp4',
+                    'http://www.sample-videos.com/video123/mp4/720/big_buck_bunny_720p_20mb.mp4',
                     (BuildContext context, VideoPlayerController controller) =>
                         AspectRatioVideo(controller),
                   ),
@@ -395,7 +395,7 @@ void main() {
                 ],
               ),
               NetworkPlayerLifeCycle(
-                'http://www.sample-videos.com/video/mp4/720/big_buck_bunny_720p_20mb.mp4',
+                'http://www.sample-videos.com/video123/mp4/720/big_buck_bunny_720p_20mb.mp4',
                 (BuildContext context, VideoPlayerController controller) =>
                     AspectRatioVideo(controller),
               ),
diff --git a/packages/video_player/ios/Classes/VideoPlayerPlugin.m b/packages/video_player/ios/Classes/VideoPlayerPlugin.m
index aeec622ce7b6..16110a5e4e47 100644
--- a/packages/video_player/ios/Classes/VideoPlayerPlugin.m
+++ b/packages/video_player/ios/Classes/VideoPlayerPlugin.m
@@ -4,6 +4,7 @@
 
 #import "VideoPlayerPlugin.h"
 #import <AVFoundation/AVFoundation.h>
+#import <GLKit/GLKit.h>
 
 int64_t FLTCMTimeToMillis(CMTime time) { return time.value * 1000 / time.timescale; }
 
@@ -32,6 +33,7 @@ @interface FLTVideoPlayer : NSObject <FlutterTexture, FlutterStreamHandler>
 @property(readonly, nonatomic) CADisplayLink* displayLink;
 @property(nonatomic) FlutterEventChannel* eventChannel;
 @property(nonatomic) FlutterEventSink eventSink;
+@property(nonatomic) CGAffineTransform preferredTransform;
 @property(nonatomic, readonly) bool disposed;
 @property(nonatomic, readonly) bool isPlaying;
 @property(nonatomic, readonly) bool isLooping;
@@ -55,14 +57,7 @@ - (instancetype)initWithAsset:(NSString*)asset frameUpdater:(FLTFrameUpdater*)fr
   return [self initWithURL:[NSURL fileURLWithPath:path] frameUpdater:frameUpdater];
 }
 
-- (instancetype)initWithURL:(NSURL*)url frameUpdater:(FLTFrameUpdater*)frameUpdater {
-  self = [super init];
-  NSAssert(self, @"super init cannot be nil");
-  _isInitialized = false;
-  _isPlaying = false;
-  _disposed = false;
-
-  AVPlayerItem* item = [AVPlayerItem playerItemWithURL:url];
+- (void)addObservers:(AVPlayerItem*)item {
   [item addObserver:self
          forKeyPath:@"loadedTimeRanges"
             options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew
@@ -84,8 +79,6 @@ - (instancetype)initWithURL:(NSURL*)url frameUpdater:(FLTFrameUpdater*)frameUpda
             options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew
             context:playbackBufferFullContext];
 
-  _player = [AVPlayer playerWithPlayerItem:item];
-  _player.actionAtItemEnd = AVPlayerActionAtItemEndNone;
   [[NSNotificationCenter defaultCenter] addObserverForName:AVPlayerItemDidPlayToEndTimeNotification
                                                     object:[_player currentItem]
                                                      queue:[NSOperationQueue mainQueue]
@@ -99,12 +92,89 @@ - (instancetype)initWithURL:(NSURL*)url frameUpdater:(FLTFrameUpdater*)frameUpda
                                                     }
                                                   }
                                                 }];
+}
+
+- (AVMutableVideoComposition*)getVideoCompositionWithTransform:(CGAffineTransform)transform
+                                                     withAsset:(AVAsset*)asset
+                                                withVideoTrack:(AVAssetTrack*)videoTrack {
+  AVMutableVideoCompositionInstruction* instruction =
+      [AVMutableVideoCompositionInstruction videoCompositionInstruction];
+  instruction.timeRange = CMTimeRangeMake(kCMTimeZero, [asset duration]);
+  AVMutableVideoCompositionLayerInstruction* layerInstruction =
+      [AVMutableVideoCompositionLayerInstruction
+          videoCompositionLayerInstructionWithAssetTrack:videoTrack];
+  [layerInstruction setTransform:_preferredTransform atTime:kCMTimeZero];
+
+  AVMutableVideoComposition* videoComposition = [AVMutableVideoComposition videoComposition];
+  instruction.layerInstructions = @[ layerInstruction ];
+  videoComposition.instructions = @[ instruction ];
+
+  // If in portrait mode, switch the width and height of the video
+  float width = videoTrack.naturalSize.width;
+  float height = videoTrack.naturalSize.height;
+  NSInteger rotationDegrees =
+      (NSInteger)round(radiansToDegrees(atan2(_preferredTransform.b, _preferredTransform.a)));
+  if (rotationDegrees == 90 || rotationDegrees == 270) {
+    width = videoTrack.naturalSize.height;
+    height = videoTrack.naturalSize.width;
+  }
+  videoComposition.renderSize = CGSizeMake(width, height);
+
+  // TODO(@recastrodiaz): should we use videoTrack.nominalFrameRate ?
+  // Currently set at a constant 30 FPS
+  videoComposition.frameDuration = CMTimeMake(1, 30);
+
+  return videoComposition;
+}
+
+- (void)createVideoOutputAndDisplayLink:(FLTFrameUpdater*)frameUpdater {
   NSDictionary* pixBuffAttributes = @{
     (id)kCVPixelBufferPixelFormatTypeKey : @(kCVPixelFormatType_32BGRA),
     (id)kCVPixelBufferIOSurfacePropertiesKey : @{}
   };
   _videoOutput = [[AVPlayerItemVideoOutput alloc] initWithPixelBufferAttributes:pixBuffAttributes];
 
+  _displayLink = [CADisplayLink displayLinkWithTarget:frameUpdater
+                                             selector:@selector(onDisplayLink:)];
+  [_displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
+  _displayLink.paused = YES;
+}
+
+- (instancetype)initWithURL:(NSURL*)url frameUpdater:(FLTFrameUpdater*)frameUpdater {
+  AVPlayerItem* item = [AVPlayerItem playerItemWithURL:url];
+  return [self initWithPlayerItem:item frameUpdater:frameUpdater];
+}
+
+- (CGAffineTransform)fixTransform:(AVAssetTrack*)videoTrack {
+  CGAffineTransform transform = videoTrack.preferredTransform;
+  // TODO(@recastrodiaz): why do we need to do this? Why is the preferredTransform incorrect?
+  // At least 2 user videos show a black screen when in portrait mode if we directly use the
+  // videoTrack.preferredTransform Setting tx to the height of the video instead of 0, properly
+  // displays the video https://github.com/flutter/flutter/issues/17606#issuecomment-413473181
+  if (transform.tx == 0 && transform.ty == 0) {
+    NSInteger rotationDegrees = (NSInteger)round(radiansToDegrees(atan2(transform.b, transform.a)));
+    NSLog(@"TX and TY are 0. Rotation: %d. Natural width,height: %f, %f", rotationDegrees,
+          videoTrack.naturalSize.width, videoTrack.naturalSize.height);
+    if (rotationDegrees == 90) {
+      NSLog(@"Setting transform tx");
+      transform.tx = videoTrack.naturalSize.height;
+      transform.ty = 0;
+    } else if (rotationDegrees == 270) {
+      NSLog(@"Setting transform ty");
+      transform.tx = 0;
+      transform.ty = videoTrack.naturalSize.width;
+    }
+  }
+  return transform;
+}
+
+- (instancetype)initWithPlayerItem:(AVPlayerItem*)item frameUpdater:(FLTFrameUpdater*)frameUpdater {
+  self = [super init];
+  NSAssert(self, @"super init cannot be nil");
+  _isInitialized = false;
+  _isPlaying = false;
+  _disposed = false;
+
   AVAsset* asset = [item asset];
   void (^assetCompletionHandler)(void) = ^{
     if ([asset statusOfValueForKey:@"tracks" error:nil] == AVKeyValueStatusLoaded) {
@@ -115,9 +185,19 @@ - (instancetype)initWithURL:(NSURL*)url frameUpdater:(FLTFrameUpdater*)frameUpda
           if (_disposed) return;
           if ([videoTrack statusOfValueForKey:@"preferredTransform"
                                         error:nil] == AVKeyValueStatusLoaded) {
-            dispatch_async(dispatch_get_main_queue(), ^{
-              [_player replaceCurrentItemWithPlayerItem:item];
-            });
+            CGSize size = videoTrack.naturalSize;
+
+            // Rotate the video by using a videoComposition and the preferredTransform
+            _preferredTransform = [self fixTransform:videoTrack];
+            // Note:
+            // https://developer.apple.com/documentation/avfoundation/avplayeritem/1388818-videocomposition
+            // Video composition can only be used with file-based media and is not supported for
+            // use with media served using HTTP Live Streaming.
+            AVMutableVideoComposition* videoComposition =
+                [self getVideoCompositionWithTransform:_preferredTransform
+                                             withAsset:asset
+                                        withVideoTrack:videoTrack];
+            item.videoComposition = videoComposition;
           }
         };
         [videoTrack loadValuesAsynchronouslyForKeys:@[ @"preferredTransform" ]
@@ -125,11 +205,18 @@ - (instancetype)initWithURL:(NSURL*)url frameUpdater:(FLTFrameUpdater*)frameUpda
       }
     }
   };
+
+  _player = [AVPlayer playerWithPlayerItem:item];
+  _player.actionAtItemEnd = AVPlayerActionAtItemEndNone;
+
+  CGSize size = item.presentationSize;
+
+  [self createVideoOutputAndDisplayLink:frameUpdater];
+
+  [self addObservers:item];
+
   [asset loadValuesAsynchronouslyForKeys:@[ @"tracks" ] completionHandler:assetCompletionHandler];
-  _displayLink = [CADisplayLink displayLinkWithTarget:frameUpdater
-                                             selector:@selector(onDisplayLink:)];
-  [_displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
-  _displayLink.paused = YES;
+
   return self;
 }
 
@@ -198,14 +285,28 @@ - (void)updatePlayingState {
   _displayLink.paused = !_isPlaying;
 }
 
+static inline CGFloat radiansToDegrees(CGFloat radians) {
+  // Input range [-pi, pi] or [-180, 180]
+  CGFloat degrees = GLKMathRadiansToDegrees(radians);
+  if (degrees < 0) {
+    // Convert -90 to 270 and -180 to 180
+    return degrees + 360;
+  }
+  // Output degrees in between [0, 360[
+  return degrees;
+};
+
 - (void)sendInitialized {
   if (_eventSink && _isInitialized) {
     CGSize size = [self.player currentItem].presentationSize;
+    CGFloat width = size.width;
+    CGFloat height = size.height;
+
     _eventSink(@{
       @"event" : @"initialized",
       @"duration" : @([self duration]),
-      @"width" : @(size.width),
-      @"height" : @(size.height),
+      @"width" : @(width),
+      @"height" : @(height)
     });
   }
 }
@@ -259,6 +360,11 @@ - (FlutterError* _Nullable)onCancelWithArguments:(id _Nullable)arguments {
 - (FlutterError* _Nullable)onListenWithArguments:(id _Nullable)arguments
                                        eventSink:(nonnull FlutterEventSink)events {
   _eventSink = events;
+  // TODO(@recastrodiaz): remove the line below when the race condition is resolved:
+  // https://github.com/flutter/flutter/issues/21483
+  // This line ensures the 'initialized' event is sent when the event
+  // 'AVPlayerItemStatusReadyToPlay' fires before _eventSink is set (this function
+  // onListenWithArguments is called)
   [self sendInitialized];
   return nil;
 }
@@ -313,6 +419,21 @@ - (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
   return self;
 }
 
+- (void)onPlayerSetup:(FLTVideoPlayer*)player
+         frameUpdater:(FLTFrameUpdater*)frameUpdater
+               result:(FlutterResult)result {
+  int64_t textureId = [_registry registerTexture:player];
+  frameUpdater.textureId = textureId;
+  FlutterEventChannel* eventChannel = [FlutterEventChannel
+      eventChannelWithName:[NSString stringWithFormat:@"flutter.io/videoPlayer/videoEvents%lld",
+                                                      textureId]
+           binaryMessenger:_messenger];
+  [eventChannel setStreamHandler:player];
+  player.eventChannel = eventChannel;
+  _players[@(textureId)] = player;
+  result(@{@"textureId" : @(textureId)});
+}
+
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   if ([@"init" isEqualToString:call.method]) {
     // Allow audio playback when the Ring/Silent switch is set to silent
@@ -327,32 +448,27 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   } else if ([@"create" isEqualToString:call.method]) {
     NSDictionary* argsMap = call.arguments;
     FLTFrameUpdater* frameUpdater = [[FLTFrameUpdater alloc] initWithRegistry:_registry];
-    NSString* dataSource = argsMap[@"asset"];
+    NSString* assetArg = argsMap[@"asset"];
+    NSString* uriArg = argsMap[@"uri"];
     FLTVideoPlayer* player;
-    if (dataSource) {
+    if (assetArg) {
       NSString* assetPath;
       NSString* package = argsMap[@"package"];
       if (![package isEqual:[NSNull null]]) {
-        assetPath = [_registrar lookupKeyForAsset:dataSource fromPackage:package];
+        assetPath = [_registrar lookupKeyForAsset:assetArg fromPackage:package];
       } else {
-        assetPath = [_registrar lookupKeyForAsset:dataSource];
+        assetPath = [_registrar lookupKeyForAsset:assetArg];
       }
       player = [[FLTVideoPlayer alloc] initWithAsset:assetPath frameUpdater:frameUpdater];
-    } else {
-      dataSource = argsMap[@"uri"];
-      player = [[FLTVideoPlayer alloc] initWithURL:[NSURL URLWithString:dataSource]
+      [self onPlayerSetup:player frameUpdater:frameUpdater result:result];
+    } else if (uriArg) {
+      player = [[FLTVideoPlayer alloc] initWithURL:[NSURL URLWithString:uriArg]
                                       frameUpdater:frameUpdater];
+      [self onPlayerSetup:player frameUpdater:frameUpdater result:result];
+    } else {
+      result(FlutterMethodNotImplemented);
     }
-    int64_t textureId = [_registry registerTexture:player];
-    frameUpdater.textureId = textureId;
-    FlutterEventChannel* eventChannel = [FlutterEventChannel
-        eventChannelWithName:[NSString stringWithFormat:@"flutter.io/videoPlayer/videoEvents%lld",
-                                                        textureId]
-             binaryMessenger:_messenger];
-    [eventChannel setStreamHandler:player];
-    player.eventChannel = eventChannel;
-    _players[@(textureId)] = player;
-    result(@{@"textureId" : @(textureId)});
+
   } else {
     NSDictionary* argsMap = call.arguments;
     int64_t textureId = ((NSNumber*)argsMap[@"textureId"]).unsignedIntegerValue;
diff --git a/packages/video_player/lib/video_player.dart b/packages/video_player/lib/video_player.dart
index 46477e1e4096..441057de32b6 100644
--- a/packages/video_player/lib/video_player.dart
+++ b/packages/video_player/lib/video_player.dart
@@ -90,7 +90,7 @@ class VideoPlayerValue {
 
   bool get initialized => duration != null;
   bool get hasError => errorDescription != null;
-  double get aspectRatio => size.width / size.height;
+  double get aspectRatio => size != null ? size.width / size.height : 1.0;
 
   VideoPlayerValue copyWith({
     Duration duration,
@@ -616,6 +616,7 @@ class _VideoProgressIndicatorState extends State<VideoProgressIndicator> {
   VoidCallback listener;
 
   VideoPlayerController get controller => widget.controller;
+
   VideoProgressColors get colors => widget.colors;
 
   @override
diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml
index 73d2890bb61b..bdc0da7c0033 100644
--- a/packages/video_player/pubspec.yaml
+++ b/packages/video_player/pubspec.yaml
@@ -2,7 +2,7 @@ name: video_player
 description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
-version: 0.8.0
+version: 0.9.0
 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player
 
 flutter:

From 59e84d85d948252cfc068917caca2c1ed5b70007 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Thu, 24 Jan 2019 13:59:22 -0800
Subject: [PATCH 076/410] Migrate independent plugins to AndroidX (#1103)

The original Android support libraries have been deprecated in favor of
AndroidX. This migration shouldn't affect behavior in a user noticeable
way, but does require plugin users to also migrate their app. See
[migrating to AndroidX](https://developer.android.com/jetpack/androidx/migrate).

Migrates all of our plugins without pub interdepencies to use the new
AndroidX support libraries. At least one followup PR will be required to
update the remaining plugins that depend on these after this is pushed
to pub.

- android_intent
- battery
- connectivity
- device_info
- firebase_auth
- firebase_core
- google_maps_flutter
- google_sign_in
- image_picker
- in_app_purchase
- local_auth
- location_background
- package_info
- path_provider
- quick_actions
- sensors
- share
- shared_preferences
- url_launcher
- video_player
- webview_flutter
---
 packages/android_intent/CHANGELOG.md                 |  8 ++++++++
 packages/android_intent/android/build.gradle         |  6 +++---
 packages/android_intent/android/gradle.properties    |  2 ++
 .../android/gradle/wrapper/gradle-wrapper.properties |  5 +++++
 .../android_intent/example/android/app/build.gradle  | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/android_intent/example/android/build.gradle |  2 +-
 packages/android_intent/pubspec.yaml                 |  2 +-
 packages/battery/CHANGELOG.md                        |  8 ++++++++
 packages/battery/android/build.gradle                |  8 ++++----
 .../android/gradle/wrapper/gradle-wrapper.properties |  5 +++++
 packages/battery/example/android/app/build.gradle    | 10 +++++-----
 .../battery/example/android/app/gradle.properties    |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/battery/example/android/build.gradle        |  2 +-
 packages/battery/pubspec.yaml                        |  2 +-
 packages/connectivity/CHANGELOG.md                   |  8 ++++++++
 packages/connectivity/android/build.gradle           |  8 ++++----
 .../connectivity/example/android/app/build.gradle    | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/connectivity/example/android/build.gradle   |  2 +-
 packages/connectivity/pubspec.yaml                   |  2 +-
 packages/device_info/CHANGELOG.md                    |  8 ++++++++
 packages/device_info/android/build.gradle            |  6 +++---
 .../device_info/example/android/app/build.gradle     | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/device_info/example/android/build.gradle    |  2 +-
 packages/device_info/pubspec.yaml                    |  2 +-
 packages/firebase_auth/CHANGELOG.md                  |  8 ++++++++
 packages/firebase_auth/android/build.gradle          |  6 +++---
 .../plugins/firebaseauth/FirebaseAuthPlugin.java     |  4 ++--
 .../firebase_auth/example/android/app/build.gradle   | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/firebase_auth/example/android/build.gradle  |  2 +-
 packages/firebase_auth/pubspec.yaml                  |  2 +-
 packages/firebase_core/CHANGELOG.md                  |  8 ++++++++
 packages/firebase_core/android/build.gradle          |  6 +++---
 .../firebase_core/example/android/app/build.gradle   | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/firebase_core/example/android/build.gradle  |  2 +-
 packages/firebase_core/pubspec.yaml                  |  2 +-
 packages/google_maps_flutter/CHANGELOG.md            |  8 ++++++++
 packages/google_maps_flutter/android/build.gradle    |  6 +++---
 .../example/android/app/build.gradle                 | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 .../google_maps_flutter/example/android/build.gradle |  2 +-
 packages/google_maps_flutter/pubspec.yaml            |  2 +-
 packages/google_sign_in/CHANGELOG.md                 |  8 ++++++++
 packages/google_sign_in/android/build.gradle         |  6 +++---
 .../google_sign_in/example/android/app/build.gradle  |  6 +++---
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/google_sign_in/example/android/build.gradle |  2 +-
 packages/google_sign_in/pubspec.yaml                 |  2 +-
 packages/image_picker/CHANGELOG.md                   |  8 ++++++++
 packages/image_picker/android/build.gradle           |  8 ++++----
 .../plugins/imagepicker/ImagePickerDelegate.java     |  6 +++---
 .../plugins/imagepicker/ImagePickerFileProvider.java |  2 +-
 .../plugins/imagepicker/ImagePickerPlugin.java       |  2 +-
 .../image_picker/example/android/app/build.gradle    | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/image_picker/example/android/build.gradle   |  2 +-
 packages/image_picker/pubspec.yaml                   |  2 +-
 packages/in_app_purchase/android/build.gradle        |  8 ++++----
 .../plugins/inapppurchase/InAppPurchasePlugin.java   |  4 ++--
 .../io/flutter/plugins/inapppurchase/Translator.java |  2 +-
 .../in_app_purchase/example/android/app/build.gradle | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 .../inapppurchase/InAppPurchasePluginTest.java       |  2 +-
 .../in_app_purchase/example/android/build.gradle     |  2 +-
 packages/local_auth/CHANGELOG.md                     |  8 ++++++++
 packages/local_auth/android/build.gradle             |  8 ++++----
 .../plugins/localauth/AuthenticationHelper.java      |  6 +++---
 .../flutter/plugins/localauth/LocalAuthPlugin.java   |  2 +-
 packages/local_auth/example/android/app/build.gradle | 10 +++++-----
 .../local_auth/example/android/app/gradle.properties |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/local_auth/example/android/build.gradle     |  2 +-
 packages/local_auth/pubspec.yaml                     |  2 +-
 packages/location_background/CHANGELOG.md            |  8 ++++++++
 packages/location_background/android/build.gradle    |  6 +++---
 .../example/android/app/build.gradle                 | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 .../location_background/example/android/build.gradle |  2 +-
 packages/location_background/pubspec.yaml            |  4 ++--
 packages/package_info/CHANGELOG.md                   |  8 ++++++++
 packages/package_info/android/build.gradle           |  6 +++---
 .../package_info/example/android/app/build.gradle    | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/package_info/example/android/build.gradle   |  2 +-
 packages/package_info/pubspec.yaml                   |  2 +-
 packages/path_provider/CHANGELOG.md                  |  8 ++++++++
 packages/path_provider/android/build.gradle          |  8 ++++----
 .../path_provider/example/android/app/build.gradle   | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/path_provider/example/android/build.gradle  |  2 +-
 packages/path_provider/pubspec.yaml                  |  2 +-
 packages/quick_actions/CHANGELOG.md                  |  8 ++++++++
 packages/quick_actions/android/build.gradle          |  6 +++---
 .../quick_actions/example/android/app/build.gradle   | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/quick_actions/example/android/build.gradle  |  2 +-
 packages/quick_actions/pubspec.yaml                  |  2 +-
 packages/sensors/CHANGELOG.md                        |  8 ++++++++
 packages/sensors/android/build.gradle                |  8 ++++----
 packages/sensors/example/android/app/build.gradle    | 10 +++++-----
 .../sensors/example/android/app/gradle.properties    |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/sensors/example/android/build.gradle        |  2 +-
 packages/sensors/pubspec.yaml                        |  2 +-
 packages/share/CHANGELOG.md                          |  8 ++++++++
 packages/share/android/build.gradle                  |  6 +++---
 packages/share/example/android/app/build.gradle      | 10 +++++-----
 packages/share/example/android/app/gradle.properties |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/share/example/android/build.gradle          |  2 +-
 packages/share/pubspec.yaml                          |  2 +-
 packages/shared_preferences/CHANGELOG.md             |  8 ++++++++
 packages/shared_preferences/android/build.gradle     |  8 ++++----
 .../example/android/app/build.gradle                 | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 .../shared_preferences/example/android/build.gradle  |  2 +-
 packages/shared_preferences/pubspec.yaml             |  2 +-
 packages/url_launcher/CHANGELOG.md                   |  8 ++++++++
 packages/url_launcher/android/build.gradle           |  8 ++++----
 .../url_launcher/example/android/app/build.gradle    | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/url_launcher/example/android/build.gradle   |  2 +-
 packages/url_launcher/pubspec.yaml                   |  2 +-
 packages/video_player/CHANGELOG.md                   | 12 ++++++++++--
 packages/video_player/android/build.gradle           |  4 ++--
 .../video_player/example/android/app/build.gradle    |  6 +++---
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 packages/video_player/example/android/build.gradle   |  2 +-
 packages/video_player/pubspec.yaml                   |  2 +-
 packages/webview_flutter/CHANGELOG.md                | 10 +++++++++-
 packages/webview_flutter/android/build.gradle        |  6 +++---
 .../android/src/main/AndroidManifest.xml             |  4 +---
 .../webview_flutter/example/android/app/build.gradle | 10 +++++-----
 .../example/android/app/gradle.properties            |  2 ++
 .../app/gradle/wrapper/gradle-wrapper.properties     |  5 +++++
 .../webview_flutter/example/android/build.gradle     |  2 +-
 packages/webview_flutter/pubspec.yaml                |  2 +-
 158 files changed, 552 insertions(+), 235 deletions(-)
 create mode 100644 packages/android_intent/android/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/android_intent/example/android/app/gradle.properties
 create mode 100644 packages/android_intent/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/battery/android/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/battery/example/android/app/gradle.properties
 create mode 100644 packages/battery/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/connectivity/example/android/app/gradle.properties
 create mode 100644 packages/connectivity/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/device_info/example/android/app/gradle.properties
 create mode 100644 packages/device_info/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_auth/example/android/app/gradle.properties
 create mode 100644 packages/firebase_auth/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_core/example/android/app/gradle.properties
 create mode 100644 packages/firebase_core/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/google_maps_flutter/example/android/app/gradle.properties
 create mode 100644 packages/google_maps_flutter/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/google_sign_in/example/android/app/gradle.properties
 create mode 100644 packages/google_sign_in/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/image_picker/example/android/app/gradle.properties
 create mode 100644 packages/image_picker/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/in_app_purchase/example/android/app/gradle.properties
 create mode 100644 packages/in_app_purchase/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/local_auth/example/android/app/gradle.properties
 create mode 100644 packages/local_auth/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/location_background/example/android/app/gradle.properties
 create mode 100644 packages/location_background/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/package_info/example/android/app/gradle.properties
 create mode 100644 packages/package_info/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/path_provider/example/android/app/gradle.properties
 create mode 100644 packages/path_provider/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/quick_actions/example/android/app/gradle.properties
 create mode 100644 packages/quick_actions/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/sensors/example/android/app/gradle.properties
 create mode 100644 packages/sensors/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/share/example/android/app/gradle.properties
 create mode 100644 packages/share/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/shared_preferences/example/android/app/gradle.properties
 create mode 100644 packages/shared_preferences/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/url_launcher/example/android/app/gradle.properties
 create mode 100644 packages/url_launcher/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/video_player/example/android/app/gradle.properties
 create mode 100644 packages/video_player/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/webview_flutter/example/android/app/gradle.properties
 create mode 100644 packages/webview_flutter/example/android/app/gradle/wrapper/gradle-wrapper.properties

diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md
index 823dd344b2cf..b9df1dcc2166 100644
--- a/packages/android_intent/CHANGELOG.md
+++ b/packages/android_intent/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.3.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.2.1
 
 * Updated Gradle tooling to match Android Studio 3.1.2.
diff --git a/packages/android_intent/android/build.gradle b/packages/android_intent/android/build.gradle
index 93da542e09d3..5bbedab51aa1 100644
--- a/packages/android_intent/android/build.gradle
+++ b/packages/android_intent/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/android_intent/android/gradle.properties b/packages/android_intent/android/gradle.properties
index 8bd86f680510..53ae0ae470eb 100644
--- a/packages/android_intent/android/gradle.properties
+++ b/packages/android_intent/android/gradle.properties
@@ -1 +1,3 @@
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M
diff --git a/packages/android_intent/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_intent/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/android_intent/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/android_intent/example/android/app/build.gradle b/packages/android_intent/example/android/app/build.gradle
index e79f43f221e4..48178f2be030 100644
--- a/packages/android_intent/example/android/app/build.gradle
+++ b/packages/android_intent/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.androidintentexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/android_intent/example/android/app/gradle.properties b/packages/android_intent/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/android_intent/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/android_intent/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/android_intent/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/android_intent/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/android_intent/example/android/build.gradle b/packages/android_intent/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/android_intent/example/android/build.gradle
+++ b/packages/android_intent/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/android_intent/pubspec.yaml b/packages/android_intent/pubspec.yaml
index 50e7e8dbca45..1991d5217c78 100644
--- a/packages/android_intent/pubspec.yaml
+++ b/packages/android_intent/pubspec.yaml
@@ -2,7 +2,7 @@ name: android_intent
 description: Flutter plugin for launching Android Intents. Not supported on iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent
-version: 0.2.1
+version: 0.3.0
 
 flutter:
   plugin:
diff --git a/packages/battery/CHANGELOG.md b/packages/battery/CHANGELOG.md
index 334c98532101..e93ac1a9b599 100644
--- a/packages/battery/CHANGELOG.md
+++ b/packages/battery/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.3.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.2.3
 
 * Updated mockito dependency to 3.0.0 to get Dart 2 support.
diff --git a/packages/battery/android/build.gradle b/packages/battery/android/build.gradle
index 25824cc4a08b..ff485fbc6b29 100644
--- a/packages/battery/android/build.gradle
+++ b/packages/battery/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    
+    compileSdkVersion 28
+
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/battery/android/gradle/wrapper/gradle-wrapper.properties b/packages/battery/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/battery/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/battery/example/android/app/build.gradle b/packages/battery/example/android/app/build.gradle
index 9c8a8dcc7c2e..e84c2c45889d 100644
--- a/packages/battery/example/android/app/build.gradle
+++ b/packages/battery/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.batteryexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/battery/example/android/app/gradle.properties b/packages/battery/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/battery/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/battery/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/battery/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/battery/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/battery/example/android/build.gradle b/packages/battery/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/battery/example/android/build.gradle
+++ b/packages/battery/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/battery/pubspec.yaml b/packages/battery/pubspec.yaml
index 3a79803c2e5d..56f80bc28cc3 100644
--- a/packages/battery/pubspec.yaml
+++ b/packages/battery/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for accessing information about the battery state
   (full, charging, discharging) on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/battery
-version: 0.2.3
+version: 0.3.0
 
 flutter:
   plugin:
diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md
index 147a11dec1fc..b74aee57df70 100644
--- a/packages/connectivity/CHANGELOG.md
+++ b/packages/connectivity/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.4.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.3.2
 
 * Adding getWifiName() to obtain current wifi network's SSID.
diff --git a/packages/connectivity/android/build.gradle b/packages/connectivity/android/build.gradle
index f673936bbd84..b9b147b29b77 100644
--- a/packages/connectivity/android/build.gradle
+++ b/packages/connectivity/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    
+    compileSdkVersion 28
+
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/connectivity/example/android/app/build.gradle b/packages/connectivity/example/android/app/build.gradle
index 71806a978283..5d1f138bfe1a 100644
--- a/packages/connectivity/example/android/app/build.gradle
+++ b/packages/connectivity/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.connectivityexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -53,6 +53,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/connectivity/example/android/app/gradle.properties b/packages/connectivity/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/connectivity/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/connectivity/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/connectivity/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/connectivity/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/connectivity/example/android/build.gradle b/packages/connectivity/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/connectivity/example/android/build.gradle
+++ b/packages/connectivity/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml
index f0c957cae73d..1711b24d052a 100644
--- a/packages/connectivity/pubspec.yaml
+++ b/packages/connectivity/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi &
   mobile/cellular) connectivity on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
-version: 0.3.2
+version: 0.4.0
 
 flutter:
   plugin:
diff --git a/packages/device_info/CHANGELOG.md b/packages/device_info/CHANGELOG.md
index 73f00e8c66e8..2028425f57b8 100644
--- a/packages/device_info/CHANGELOG.md
+++ b/packages/device_info/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.4.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.3.0
 
 * Added ability to get Android ID for Android devices
diff --git a/packages/device_info/android/build.gradle b/packages/device_info/android/build.gradle
index ebc950d182d6..92dc70f6ed72 100644
--- a/packages/device_info/android/build.gradle
+++ b/packages/device_info/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/device_info/example/android/app/build.gradle b/packages/device_info/example/android/app/build.gradle
index a039c3abd2cf..43d6d0a1a8c5 100644
--- a/packages/device_info/example/android/app/build.gradle
+++ b/packages/device_info/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.deviceinfoexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/device_info/example/android/app/gradle.properties b/packages/device_info/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/device_info/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/device_info/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/device_info/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/device_info/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/device_info/example/android/build.gradle b/packages/device_info/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/device_info/example/android/build.gradle
+++ b/packages/device_info/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/device_info/pubspec.yaml b/packages/device_info/pubspec.yaml
index fd4dd437bb25..81c059d6ffe2 100644
--- a/packages/device_info/pubspec.yaml
+++ b/packages/device_info/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin providing detailed information about the device
   (make, model, etc.), and Android or iOS version the app is running on.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/device_info
-version: 0.3.0
+version: 0.4.0
 
 flutter:
   plugin:
diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index ab3894449584..4c55b01c33d4 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.8.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.7.0
 
 * Introduce third-party auth provider classes that generate `AuthCredential`s
diff --git a/packages/firebase_auth/android/build.gradle b/packages/firebase_auth/android/build.gradle
index 7f96901337ba..d45757f3cdd0 100755
--- a/packages/firebase_auth/android/build.gradle
+++ b/packages/firebase_auth/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
index 9bf2032da72f..e8fe96212726 100755
--- a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
+++ b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
@@ -5,9 +5,9 @@
 package io.flutter.plugins.firebaseauth;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.SparseArray;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApiNotAvailableException;
diff --git a/packages/firebase_auth/example/android/app/build.gradle b/packages/firebase_auth/example/android/app/build.gradle
index 3aa166262333..d31dce7a99f4 100755
--- a/packages/firebase_auth/example/android/app/build.gradle
+++ b/packages/firebase_auth/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebaseauthexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/firebase_auth/example/android/app/gradle.properties b/packages/firebase_auth/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_auth/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_auth/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_auth/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_auth/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_auth/example/android/build.gradle b/packages/firebase_auth/example/android/build.gradle
index 83f45572c5a3..6ca85f908e0b 100755
--- a/packages/firebase_auth/example/android/build.gradle
+++ b/packages/firebase_auth/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 04ab6acfffac..02ef94337b04 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: 0.7.0
+version: 0.8.0
 
 flutter:
   plugin:
diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md
index c1f7cae51c86..377b4a330e32 100644
--- a/packages/firebase_core/CHANGELOG.md
+++ b/packages/firebase_core/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.3.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.2.5+1
 
 * Bump Android dependencies to latest.
diff --git a/packages/firebase_core/android/build.gradle b/packages/firebase_core/android/build.gradle
index 2c8f3ebd1508..568a19d644a1 100644
--- a/packages/firebase_core/android/build.gradle
+++ b/packages/firebase_core/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_core/example/android/app/build.gradle b/packages/firebase_core/example/android/app/build.gradle
index 36268e4b9323..bcd12c9f12cf 100644
--- a/packages/firebase_core/example/android/app/build.gradle
+++ b/packages/firebase_core/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebasecoreexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/firebase_core/example/android/app/gradle.properties b/packages/firebase_core/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_core/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_core/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_core/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_core/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_core/example/android/build.gradle b/packages/firebase_core/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/firebase_core/example/android/build.gradle
+++ b/packages/firebase_core/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml
index 4514ccc33aac..0efe671c0041 100644
--- a/packages/firebase_core/pubspec.yaml
+++ b/packages/firebase_core/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Core, enabling connecting to multiple
   Firebase apps.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_core
-version: 0.2.5+1
+version: 0.3.0
 
 flutter:
   plugin:
diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index c703bc1b4fbb..48a9093528ac 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.2.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.1.0
 
 * Move the map options from the GoogleMapOptions class to GoogleMap widget parameters.
diff --git a/packages/google_maps_flutter/android/build.gradle b/packages/google_maps_flutter/android/build.gradle
index f6793450b8e1..74ef7d1e292e 100644
--- a/packages/google_maps_flutter/android/build.gradle
+++ b/packages/google_maps_flutter/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/google_maps_flutter/example/android/app/build.gradle b/packages/google_maps_flutter/example/android/app/build.gradle
index 04314837d767..0e30acb1d954 100644
--- a/packages/google_maps_flutter/example/android/app/build.gradle
+++ b/packages/google_maps_flutter/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.googlemapsexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/google_maps_flutter/example/android/app/gradle.properties b/packages/google_maps_flutter/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/google_maps_flutter/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/google_maps_flutter/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/google_maps_flutter/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/google_maps_flutter/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/google_maps_flutter/example/android/build.gradle b/packages/google_maps_flutter/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/google_maps_flutter/example/android/build.gradle
+++ b/packages/google_maps_flutter/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index b4c73f988050..a581265191bd 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.1.0
+version: 0.2.0
 
 dependencies:
   flutter:
diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md
index e28e6870c123..42722b7c762c 100644
--- a/packages/google_sign_in/CHANGELOG.md
+++ b/packages/google_sign_in/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 3.3.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 3.2.4
 
 * Increase play-services-auth version to 16.0.1
diff --git a/packages/google_sign_in/android/build.gradle b/packages/google_sign_in/android/build.gradle
index 08d1f8e3588e..f51d723219ff 100755
--- a/packages/google_sign_in/android/build.gradle
+++ b/packages/google_sign_in/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/google_sign_in/example/android/app/build.gradle b/packages/google_sign_in/example/android/app/build.gradle
index 0f5f615f762d..5b1c5699d48d 100755
--- a/packages/google_sign_in/example/android/app/build.gradle
+++ b/packages/google_sign_in/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.googlesigninexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
diff --git a/packages/google_sign_in/example/android/app/gradle.properties b/packages/google_sign_in/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/google_sign_in/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/google_sign_in/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/google_sign_in/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/google_sign_in/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/google_sign_in/example/android/build.gradle b/packages/google_sign_in/example/android/build.gradle
index bb8a303898ca..541636cc492a 100755
--- a/packages/google_sign_in/example/android/build.gradle
+++ b/packages/google_sign_in/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml
index d78daa153b9c..5681d23c213d 100755
--- a/packages/google_sign_in/pubspec.yaml
+++ b/packages/google_sign_in/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in
-version: 3.2.4
+version: 3.3.0
 
 flutter:
   plugin:
diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 841522383775..40be3eb73977 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.5.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.4.12+1
 
 * Fix a crash when selecting downloaded images from image picker on certain devices.
diff --git a/packages/image_picker/android/build.gradle b/packages/image_picker/android/build.gradle
index b6ac95b63619..f9a579843d40 100755
--- a/packages/image_picker/android/build.gradle
+++ b/packages/image_picker/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -25,11 +25,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
@@ -37,5 +37,5 @@ android {
 }
 
 dependencies {
-    api 'com.android.support:support-v4:27.1.1'
+    api 'androidx.legacy:legacy-support-v4:1.0.0'
 }
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
index c4a7d7ecfa53..3c6dab51da28 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
@@ -12,9 +12,9 @@
 import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.provider.MediaStore;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.FileProvider;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerFileProvider.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerFileProvider.java
index 92ec194e5027..74fe0020f211 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerFileProvider.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerFileProvider.java
@@ -1,6 +1,6 @@
 package io.flutter.plugins.imagepicker;
 
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 /**
  * Providing a custom {@code FileProvider} prevents manifest {@code <provider>} name collisions.
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
index 3e658a670bef..36b44fc7e745 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
@@ -5,7 +5,7 @@
 package io.flutter.plugins.imagepicker;
 
 import android.os.Environment;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
diff --git a/packages/image_picker/example/android/app/build.gradle b/packages/image_picker/example/android/app/build.gradle
index af38db3ebd06..800e3e836a97 100755
--- a/packages/image_picker/example/android/app/build.gradle
+++ b/packages/image_picker/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.imagepicker.example"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -60,6 +60,6 @@ flutter {
 dependencies {
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.17.0'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/image_picker/example/android/app/gradle.properties b/packages/image_picker/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/image_picker/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/image_picker/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/image_picker/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/image_picker/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/image_picker/example/android/build.gradle b/packages/image_picker/example/android/build.gradle
index bb8a303898ca..541636cc492a 100755
--- a/packages/image_picker/example/android/build.gradle
+++ b/packages/image_picker/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index c08e5a0f8ded..895bad4929fa 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.4.12+1
+version: 0.5.0
 
 flutter:
   plugin:
diff --git a/packages/in_app_purchase/android/build.gradle b/packages/in_app_purchase/android/build.gradle
index 82cd6b8bbb35..c30115927f91 100644
--- a/packages/in_app_purchase/android/build.gradle
+++ b/packages/in_app_purchase/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -26,7 +26,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
@@ -37,6 +37,6 @@ dependencies {
     implementation 'com.android.billingclient:billing:1.2'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.17.0'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
index 6ed2ab7c282a..38479f50b751 100644
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
@@ -7,8 +7,8 @@
 import static io.flutter.plugins.inapppurchase.Translator.fromSkuDetailsList;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClientStateListener;
 import com.android.billingclient.api.Purchase;
diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
index c93d82b79815..89c96a0665b7 100644
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
@@ -4,7 +4,7 @@
 
 package io.flutter.plugins.inapppurchase;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.android.billingclient.api.SkuDetails;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/packages/in_app_purchase/example/android/app/build.gradle b/packages/in_app_purchase/example/android/app/build.gradle
index a523382b58d8..969da0095eb8 100644
--- a/packages/in_app_purchase/example/android/app/build.gradle
+++ b/packages/in_app_purchase/example/android/app/build.gradle
@@ -69,7 +69,7 @@ android {
         }
     }
 
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -78,10 +78,10 @@ android {
     defaultConfig {
         applicationId project.APP_ID
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -112,6 +112,6 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.17.0'
     testImplementation 'org.json:json:20180813'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/in_app_purchase/example/android/app/gradle.properties b/packages/in_app_purchase/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/in_app_purchase/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/in_app_purchase/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/in_app_purchase/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/in_app_purchase/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
index a1a9bb5bcc8a..e35f0ad45a4d 100644
--- a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
+++ b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
@@ -11,7 +11,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClientStateListener;
 import com.android.billingclient.api.SkuDetails;
diff --git a/packages/in_app_purchase/example/android/build.gradle b/packages/in_app_purchase/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/in_app_purchase/example/android/build.gradle
+++ b/packages/in_app_purchase/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/local_auth/CHANGELOG.md b/packages/local_auth/CHANGELOG.md
index 2710912b3faa..843ae0df45ca 100644
--- a/packages/local_auth/CHANGELOG.md
+++ b/packages/local_auth/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.4.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.3.1
 * Fix crash on Android versions earlier than 24.
 
diff --git a/packages/local_auth/android/build.gradle b/packages/local_auth/android/build.gradle
index e03b533d68a3..0cea02c1b04b 100644
--- a/packages/local_auth/android/build.gradle
+++ b/packages/local_auth/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
@@ -34,5 +34,5 @@ android {
 }
 
 dependencies {
-    api "com.android.support:support-compat:27.1.1"
+    api "androidx.core:core:1.1.0-alpha03"
 }
diff --git a/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/AuthenticationHelper.java b/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/AuthenticationHelper.java
index e5e84350854b..9c2ed5474e75 100644
--- a/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/AuthenticationHelper.java
+++ b/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/AuthenticationHelper.java
@@ -17,14 +17,14 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.hardware.fingerprint.FingerprintManagerCompat;
-import android.support.v4.os.CancellationSignal;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.core.content.ContextCompat;
+import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
+import androidx.core.os.CancellationSignal;
 import io.flutter.plugin.common.MethodCall;
 
 /**
diff --git a/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java b/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java
index 4d986d39e9f4..f2d14e7a67ef 100644
--- a/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java
+++ b/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java
@@ -5,7 +5,7 @@
 package io.flutter.plugins.localauth;
 
 import android.app.Activity;
-import android.support.v4.hardware.fingerprint.FingerprintManagerCompat;
+import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
diff --git a/packages/local_auth/example/android/app/build.gradle b/packages/local_auth/example/android/app/build.gradle
index 2fa5a8b02831..eaccbe3cd9f9 100644
--- a/packages/local_auth/example/android/app/build.gradle
+++ b/packages/local_auth/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.localauthexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -53,6 +53,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/local_auth/example/android/app/gradle.properties b/packages/local_auth/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/local_auth/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/local_auth/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/local_auth/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/local_auth/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/local_auth/example/android/build.gradle b/packages/local_auth/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/local_auth/example/android/build.gradle
+++ b/packages/local_auth/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/local_auth/pubspec.yaml b/packages/local_auth/pubspec.yaml
index 33e2a807ab35..f238b034a75a 100644
--- a/packages/local_auth/pubspec.yaml
+++ b/packages/local_auth/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Android and iOS device authentication sensors
   such as Fingerprint Reader and Touch ID.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/local_auth
-version: 0.3.1
+version: 0.4.0
 
 flutter:
   plugin:
diff --git a/packages/location_background/CHANGELOG.md b/packages/location_background/CHANGELOG.md
index 371102aba2fe..50934f5f77e7 100644
--- a/packages/location_background/CHANGELOG.md
+++ b/packages/location_background/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.1.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.0.2
 
 * Added missing flutter_test package dependency.
diff --git a/packages/location_background/android/build.gradle b/packages/location_background/android/build.gradle
index 68b6ad1f1a48..a8f26894aced 100644
--- a/packages/location_background/android/build.gradle
+++ b/packages/location_background/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/location_background/example/android/app/build.gradle b/packages/location_background/example/android/app/build.gradle
index c38cbc852959..cde213b0cc17 100644
--- a/packages/location_background/example/android/app/build.gradle
+++ b/packages/location_background/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "com.flutter.example.locationbackgroundpluginexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/location_background/example/android/app/gradle.properties b/packages/location_background/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/location_background/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/location_background/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/location_background/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/location_background/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/location_background/example/android/build.gradle b/packages/location_background/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/location_background/example/android/build.gradle
+++ b/packages/location_background/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/location_background/pubspec.yaml b/packages/location_background/pubspec.yaml
index 3b8e2a255d12..c838a834440b 100644
--- a/packages/location_background/pubspec.yaml
+++ b/packages/location_background/pubspec.yaml
@@ -2,7 +2,7 @@ name: location_background_plugin
 description: A new flutter plugin project.
 author:  Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/location_background
-version: 0.0.2
+version: 0.1.0
 
 dependencies:
   flutter:
@@ -16,7 +16,7 @@ flutter:
   plugin:
     androidPackage: com.flutter.example.locationbackgroundplugin
     pluginClass: LocationBackgroundPlugin
-    
+
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
   flutter: ">=0.4.4 <2.0.0"
diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md
index f12333d15071..5060c31123b0 100644
--- a/packages/package_info/CHANGELOG.md
+++ b/packages/package_info/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.4.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.3.2+1
 
 * Fixed a crash on IOS when some of the package infos are not available.
diff --git a/packages/package_info/android/build.gradle b/packages/package_info/android/build.gradle
index 0ecc58a5705f..d05fa363d3c1 100644
--- a/packages/package_info/android/build.gradle
+++ b/packages/package_info/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/package_info/example/android/app/build.gradle b/packages/package_info/example/android/app/build.gradle
index d550a2e3f40c..c24eba0fe81d 100644
--- a/packages/package_info/example/android/app/build.gradle
+++ b/packages/package_info/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.packageinfoexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -54,6 +54,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/package_info/example/android/app/gradle.properties b/packages/package_info/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/package_info/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/package_info/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/package_info/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/package_info/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/package_info/example/android/build.gradle b/packages/package_info/example/android/build.gradle
index 759b28648eed..d5e73b13a253 100644
--- a/packages/package_info/example/android/build.gradle
+++ b/packages/package_info/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml
index 3fe19af8f6bc..c91cb523fb9c 100644
--- a/packages/package_info/pubspec.yaml
+++ b/packages/package_info/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for querying information about the application
   package, such as CFBundleVersion on iOS or versionCode on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/package_info
-version: 0.3.2+1
+version: 0.4.0
 
 flutter:
   plugin:
diff --git a/packages/path_provider/CHANGELOG.md b/packages/path_provider/CHANGELOG.md
index 537480b23d8c..8a0499493851 100644
--- a/packages/path_provider/CHANGELOG.md
+++ b/packages/path_provider/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.5.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.4.1
 
 * Updated Gradle tooling to match Android Studio 3.1.2.
diff --git a/packages/path_provider/android/build.gradle b/packages/path_provider/android/build.gradle
index 04beea282922..a52b24f66378 100644
--- a/packages/path_provider/android/build.gradle
+++ b/packages/path_provider/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    
+    compileSdkVersion 28
+
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/path_provider/example/android/app/build.gradle b/packages/path_provider/example/android/app/build.gradle
index cec0f33c8e1d..2ca6a7a4add3 100644
--- a/packages/path_provider/example/android/app/build.gradle
+++ b/packages/path_provider/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.pathproviderexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/path_provider/example/android/app/gradle.properties b/packages/path_provider/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/path_provider/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/path_provider/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/path_provider/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/path_provider/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/path_provider/example/android/build.gradle b/packages/path_provider/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/path_provider/example/android/build.gradle
+++ b/packages/path_provider/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/path_provider/pubspec.yaml b/packages/path_provider/pubspec.yaml
index 564bbf81a74a..9156895d3f48 100644
--- a/packages/path_provider/pubspec.yaml
+++ b/packages/path_provider/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for getting commonly used locations on the Android &
   iOS file systems, such as the temp and app data directories.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider
-version: 0.4.1
+version: 0.5.0
 
 flutter:
   plugin:
diff --git a/packages/quick_actions/CHANGELOG.md b/packages/quick_actions/CHANGELOG.md
index 7632ba7710f8..93a4c233fa70 100644
--- a/packages/quick_actions/CHANGELOG.md
+++ b/packages/quick_actions/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.3.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.2.2
 
 * Allow to register more than once.
diff --git a/packages/quick_actions/android/build.gradle b/packages/quick_actions/android/build.gradle
index d53a96deaa90..648b654dbfcd 100644
--- a/packages/quick_actions/android/build.gradle
+++ b/packages/quick_actions/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/quick_actions/example/android/app/build.gradle b/packages/quick_actions/example/android/app/build.gradle
index 6f8004f74c38..b8ca2db446f8 100644
--- a/packages/quick_actions/example/android/app/build.gradle
+++ b/packages/quick_actions/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.quickactionsexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -53,6 +53,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/quick_actions/example/android/app/gradle.properties b/packages/quick_actions/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/quick_actions/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/quick_actions/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/quick_actions/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/quick_actions/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/quick_actions/example/android/build.gradle b/packages/quick_actions/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/quick_actions/example/android/build.gradle
+++ b/packages/quick_actions/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/quick_actions/pubspec.yaml b/packages/quick_actions/pubspec.yaml
index cb4f1c8b5c74..779a5f7731c9 100644
--- a/packages/quick_actions/pubspec.yaml
+++ b/packages/quick_actions/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for creating shortcuts on home screen, also known as
   Quick Actions on iOS and App Shortcuts on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/quick_actions
-version: 0.2.2
+version: 0.3.0
 
 flutter:
   plugin:
diff --git a/packages/sensors/CHANGELOG.md b/packages/sensors/CHANGELOG.md
index 861dd4bbeeeb..9fccf527bbf5 100644
--- a/packages/sensors/CHANGELOG.md
+++ b/packages/sensors/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.4.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.3.5
 
 * Added missing test package dependency.
diff --git a/packages/sensors/android/build.gradle b/packages/sensors/android/build.gradle
index 41cef0e71bde..c42795200e62 100644
--- a/packages/sensors/android/build.gradle
+++ b/packages/sensors/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    
+    compileSdkVersion 28
+
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/sensors/example/android/app/build.gradle b/packages/sensors/example/android/app/build.gradle
index 79dcbffb08a8..987def463562 100644
--- a/packages/sensors/example/android/app/build.gradle
+++ b/packages/sensors/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.sensorsexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/sensors/example/android/app/gradle.properties b/packages/sensors/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/sensors/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/sensors/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/sensors/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/sensors/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/sensors/example/android/build.gradle b/packages/sensors/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/sensors/example/android/build.gradle
+++ b/packages/sensors/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/sensors/pubspec.yaml b/packages/sensors/pubspec.yaml
index 9b9ed2477946..d89b15f25d2f 100644
--- a/packages/sensors/pubspec.yaml
+++ b/packages/sensors/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for accessing the Android and iOS accelerometer and
   gyroscope sensors.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/sensors
-version: 0.3.5
+version: 0.4.0
 
 flutter:
   plugin:
diff --git a/packages/share/CHANGELOG.md b/packages/share/CHANGELOG.md
index d620ed091462..b21c925ce3ef 100644
--- a/packages/share/CHANGELOG.md
+++ b/packages/share/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.6.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.5.3
 
 * Added missing test package dependency.
diff --git a/packages/share/android/build.gradle b/packages/share/android/build.gradle
index 4d965af4e153..ff794c1e56d8 100644
--- a/packages/share/android/build.gradle
+++ b/packages/share/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -23,10 +23,10 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 27
-    
+
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/share/example/android/app/build.gradle b/packages/share/example/android/app/build.gradle
index b55eb82d291b..5fca10f77210 100644
--- a/packages/share/example/android/app/build.gradle
+++ b/packages/share/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.shareexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/share/example/android/app/gradle.properties b/packages/share/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/share/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/share/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/share/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/share/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/share/example/android/build.gradle b/packages/share/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/share/example/android/build.gradle
+++ b/packages/share/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/share/pubspec.yaml b/packages/share/pubspec.yaml
index 70dfc88958e8..5954a80994e1 100644
--- a/packages/share/pubspec.yaml
+++ b/packages/share/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for sharing content via the platform share UI, using
   the ACTION_SEND intent on Android and UIActivityViewController on iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/share
-version: 0.5.3
+version: 0.6.0
 
 flutter:
   plugin:
diff --git a/packages/shared_preferences/CHANGELOG.md b/packages/shared_preferences/CHANGELOG.md
index 82ec3defd61a..0e11805b244b 100644
--- a/packages/shared_preferences/CHANGELOG.md
+++ b/packages/shared_preferences/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.5.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.4.3
 
 * Prevent strings that match special prefixes from being saved. This is a bugfix that prevents apps from accidentally setting special values that would be interpreted incorrectly.
diff --git a/packages/shared_preferences/android/build.gradle b/packages/shared_preferences/android/build.gradle
index 22348f48f836..515d7ac12bab 100644
--- a/packages/shared_preferences/android/build.gradle
+++ b/packages/shared_preferences/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -30,11 +30,11 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    
+    compileSdkVersion 28
+
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/shared_preferences/example/android/app/build.gradle b/packages/shared_preferences/example/android/app/build.gradle
index 75fcec6a41c5..7a285ba704ab 100644
--- a/packages/shared_preferences/example/android/app/build.gradle
+++ b/packages/shared_preferences/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.sharedpreferencesexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/shared_preferences/example/android/app/gradle.properties b/packages/shared_preferences/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/shared_preferences/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/shared_preferences/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/shared_preferences/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/shared_preferences/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/shared_preferences/example/android/build.gradle b/packages/shared_preferences/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/shared_preferences/example/android/build.gradle
+++ b/packages/shared_preferences/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/shared_preferences/pubspec.yaml b/packages/shared_preferences/pubspec.yaml
index 69e7e58aa0f2..8794ec6c2827 100644
--- a/packages/shared_preferences/pubspec.yaml
+++ b/packages/shared_preferences/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for reading and writing simple key-value pairs.
   Wraps NSUserDefaults on iOS and SharedPreferences on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences
-version: 0.4.3
+version: 0.5.0
 
 flutter:
   plugin:
diff --git a/packages/url_launcher/CHANGELOG.md b/packages/url_launcher/CHANGELOG.md
index 1f69cdfc1e72..ad04df605355 100644
--- a/packages/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 4.2.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 4.1.0+1
 
 * This is just a version bump to republish as 4.1.0 was published with some dirty local state.
diff --git a/packages/url_launcher/android/build.gradle b/packages/url_launcher/android/build.gradle
index 1c82a15f1d6f..0d3a58d3f292 100644
--- a/packages/url_launcher/android/build.gradle
+++ b/packages/url_launcher/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    
+    compileSdkVersion 28
+
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/url_launcher/example/android/app/build.gradle b/packages/url_launcher/example/android/app/build.gradle
index 6e480a14c034..325396c57235 100644
--- a/packages/url_launcher/example/android/app/build.gradle
+++ b/packages/url_launcher/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.urllauncherexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/url_launcher/example/android/app/gradle.properties b/packages/url_launcher/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/url_launcher/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/url_launcher/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/url_launcher/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/url_launcher/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/url_launcher/example/android/build.gradle b/packages/url_launcher/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/url_launcher/example/android/build.gradle
+++ b/packages/url_launcher/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/url_launcher/pubspec.yaml b/packages/url_launcher/pubspec.yaml
index 5ee1dc700ffe..4e2e259cab02 100644
--- a/packages/url_launcher/pubspec.yaml
+++ b/packages/url_launcher/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher
-version: 4.1.0+1
+version: 4.2.0
 
 flutter:
   plugin:
diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md
index 338fb22395ef..c9696e7c377d 100644
--- a/packages/video_player/CHANGELOG.md
+++ b/packages/video_player/CHANGELOG.md
@@ -1,6 +1,14 @@
+## 0.10.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.9.0
 
-* Fixed the aspect ratio and orientation of videos. Videos are now properly displayed when recorded 
+* Fixed the aspect ratio and orientation of videos. Videos are now properly displayed when recorded
  in portrait mode both in iOS and Android.
 
 ## 0.8.0
@@ -45,7 +53,7 @@
 
 ## 0.6.1
 
-* iOS: add missing observer removals to prevent crashes on deallocation. 
+* iOS: add missing observer removals to prevent crashes on deallocation.
 
 ## 0.6.0
 
diff --git a/packages/video_player/android/build.gradle b/packages/video_player/android/build.gradle
index 1acfee7e4374..a67f98e35a5e 100644
--- a/packages/video_player/android/build.gradle
+++ b/packages/video_player/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -26,7 +26,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/video_player/example/android/app/build.gradle b/packages/video_player/example/android/app/build.gradle
index 5eece97c4f48..47e7214822cc 100644
--- a/packages/video_player/example/android/app/build.gradle
+++ b/packages/video_player/example/android/app/build.gradle
@@ -37,7 +37,7 @@ android {
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     android {
@@ -62,6 +62,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/video_player/example/android/app/gradle.properties b/packages/video_player/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/video_player/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/video_player/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/video_player/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/video_player/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/video_player/example/android/build.gradle b/packages/video_player/example/android/build.gradle
index db728801d8ac..112aa2a87c27 100644
--- a/packages/video_player/example/android/build.gradle
+++ b/packages/video_player/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml
index bdc0da7c0033..a16908070c1c 100644
--- a/packages/video_player/pubspec.yaml
+++ b/packages/video_player/pubspec.yaml
@@ -2,7 +2,7 @@ name: video_player
 description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
-version: 0.9.0
+version: 0.10.0
 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player
 
 flutter:
diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 76506a0d9065..d90be52c5468 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,6 +1,14 @@
+## 0.3.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.2.0
 
-* Added a evaluateJavascript method to WebView controller. 
+* Added a evaluateJavascript method to WebView controller.
 * (BREAKING CHANGE) Renamed the `JavaScriptMode` enum to `JavascriptMode`, and the WebView `javasScriptMode` parameter to `javascriptMode`.
 
 ## 0.1.2
diff --git a/packages/webview_flutter/android/build.gradle b/packages/webview_flutter/android/build.gradle
index 52ed29bf4d6f..460446a90ed2 100644
--- a/packages/webview_flutter/android/build.gradle
+++ b/packages/webview_flutter/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/webview_flutter/android/src/main/AndroidManifest.xml b/packages/webview_flutter/android/src/main/AndroidManifest.xml
index 70d7c7162ee8..a087f2c75c24 100644
--- a/packages/webview_flutter/android/src/main/AndroidManifest.xml
+++ b/packages/webview_flutter/android/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="io.flutter.plugins.webviewflutter">
-    <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="26"/>
+<manifest package="io.flutter.plugins.webviewflutter">
 </manifest>
diff --git a/packages/webview_flutter/example/android/app/build.gradle b/packages/webview_flutter/example/android/app/build.gradle
index ea03f6934c01..79a69ac3e4d7 100644
--- a/packages/webview_flutter/example/android/app/build.gradle
+++ b/packages/webview_flutter/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -35,10 +35,10 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.flutter.plugins.webviewflutterexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -56,6 +56,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/webview_flutter/example/android/app/gradle.properties b/packages/webview_flutter/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/webview_flutter/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/webview_flutter/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/webview_flutter/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/webview_flutter/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/webview_flutter/example/android/build.gradle b/packages/webview_flutter/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/webview_flutter/example/android/build.gradle
+++ b/packages/webview_flutter/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 71d026d49af9..2ed52c97e23a 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.2.0
+version: 0.3.0
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From 9f87cbe54bd6d6507465037e3ce0f4a601f83b95 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Thu, 24 Jan 2019 15:01:48 -0800
Subject: [PATCH 077/410] [IAP] Update README (#1112)

---
 packages/in_app_purchase/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/in_app_purchase/README.md b/packages/in_app_purchase/README.md
index adcf34492247..78cf5efb50f1 100644
--- a/packages/in_app_purchase/README.md
+++ b/packages/in_app_purchase/README.md
@@ -21,7 +21,8 @@ This plugin uses
 [json_serializable](https://pub.dartlang.org/packages/json_serializable) for the
 many data structs passed between the underlying platform layers and Dart. After
 editing any of the serialized data structs, rebuild the serializers by running
-`flutter packages pub run build_runner run`.
+`flutter packages pub run build_runner build`. `flutter packages pub run
+build_runner watch` will watch the filesystem for changes.
 
 ### Design
 

From 0dd23fe0e5c9e4ba9e9f1896e5b76a4240b4640f Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Thu, 24 Jan 2019 17:05:32 -0800
Subject: [PATCH 078/410] [firebase_auth] Update a broken dependency. (#1117)

This was depending on a version of `firebase_core` that was using the
original Android Support libraries instead of AndroidX.
---
 packages/firebase_auth/CHANGELOG.md         | 4 ++++
 packages/firebase_auth/example/pubspec.yaml | 2 +-
 packages/firebase_auth/pubspec.yaml         | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index 4c55b01c33d4..d4d9174a4a83 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.0+1
+
+* Update a broken dependency.
+
 ## 0.8.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/example/pubspec.yaml
index a75a33942493..6537e88a331f 100755
--- a/packages/firebase_auth/example/pubspec.yaml
+++ b/packages/firebase_auth/example/pubspec.yaml
@@ -8,7 +8,7 @@ dependencies:
   firebase_auth:
     path: ../
   google_sign_in: ^3.0.4
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 flutter:
   uses-material-design: true
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 02ef94337b04..84458354470c 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: 0.8.0
+version: "0.8.0+1"
 
 flutter:
   plugin:
@@ -14,7 +14,7 @@ flutter:
 
 dependencies:
   meta: ^1.0.4
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
   flutter:
     sdk: flutter

From 2a1593da072b4d0ee7acef57a4b59ac92da60a6b Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Thu, 24 Jan 2019 17:47:25 -0800
Subject: [PATCH 079/410] [IAP] Update dev deps to match flutter_driver (#1118)

Fixes the red CI.
---
 packages/in_app_purchase/example/pubspec.yaml | 2 +-
 packages/in_app_purchase/pubspec.yaml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/in_app_purchase/example/pubspec.yaml b/packages/in_app_purchase/example/pubspec.yaml
index f6678ec0207b..ccc21beacaec 100644
--- a/packages/in_app_purchase/example/pubspec.yaml
+++ b/packages/in_app_purchase/example/pubspec.yaml
@@ -8,7 +8,7 @@ dependencies:
   cupertino_icons: ^0.1.2
 
 dev_dependencies:
-  test: 1.5.1
+  test: ^1.5.2
   flutter_driver:
     sdk: flutter
   in_app_purchase:
diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml
index 3c4eaa0c896b..5cfdde171170 100644
--- a/packages/in_app_purchase/pubspec.yaml
+++ b/packages/in_app_purchase/pubspec.yaml
@@ -20,7 +20,7 @@ dev_dependencies:
     sdk: flutter
   in_app_purchase_example:
     path: example/
-  test: 1.5.1
+  test: ^1.5.2
 
 flutter:
   plugin:

From 94f432f09820b680e93cbaee2abc6671b5a4030d Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Fri, 25 Jan 2019 09:44:20 -0800
Subject: [PATCH 080/410] Migrate remaining plugins to AndroidX (#1115)

The original Android support libraries have been deprecated in favor of
AndroidX. This migration shouldn't affect behavior in a user noticeable
way, but does require plugin users to also migrate their app. See
[migrating to AndroidX](https://developer.android.com/jetpack/androidx/migrate).

Fixes flutter/flutter#23995.
---
 packages/android_alarm_manager/CHANGELOG.md   |   8 ++
 .../android/build.gradle                      |   6 +-
 .../example/android/app/build.gradle          |  10 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../example/android/gradle.properties         |   2 +
 .../example/pubspec.yaml                      |   4 +-
 packages/android_alarm_manager/pubspec.yaml   |   4 +-
 packages/camera/CHANGELOG.md                  |   7 +
 packages/camera/android/build.gradle          |   8 +-
 .../flutter/plugins/camera/CameraPlugin.java  |   4 +-
 .../camera/example/android/app/build.gradle   |  10 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 packages/camera/example/android/build.gradle  |   2 +-
 packages/camera/example/pubspec.yaml          |   4 +-
 packages/camera/pubspec.yaml                  |   6 +-
 packages/cloud_firestore/CHANGELOG.md         |   7 +
 packages/cloud_firestore/android/build.gradle |   6 +-
 .../cloudfirestore/CloudFirestorePlugin.java  |   4 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 packages/cloud_firestore/example/pubspec.yaml |   2 +-
 packages/cloud_firestore/pubspec.yaml         |   4 +-
 packages/cloud_functions/CHANGELOG.md         |   7 +
 packages/cloud_functions/android/build.gradle |   6 +-
 .../cloudfunctions/CloudFunctionsPlugin.java  |   2 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 packages/cloud_functions/example/pubspec.yaml |   2 +-
 packages/cloud_functions/pubspec.yaml         |   4 +-
 packages/firebase_admob/CHANGELOG.md          |   7 +
 packages/firebase_admob/android/build.gradle  |   6 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 packages/firebase_admob/example/pubspec.yaml  |   2 +-
 packages/firebase_admob/pubspec.yaml          |   4 +-
 packages/firebase_analytics/CHANGELOG.md      |   7 +
 .../firebase_analytics/android/build.gradle   |   6 +-
 .../example/android/app/build.gradle          |   6 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../firebase_analytics/example/pubspec.yaml   |   2 +-
 packages/firebase_analytics/pubspec.yaml      |   4 +-
 packages/firebase_database/CHANGELOG.md       |   7 +
 .../firebase_database/android/build.gradle    |   6 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../firebase_database/example/pubspec.yaml    |   2 +-
 packages/firebase_database/pubspec.yaml       |   4 +-
 packages/firebase_dynamic_links/CHANGELOG.md  |   7 +
 .../android/build.gradle                      |   6 +-
 .../FirebaseDynamicLinksPlugin.java           |   2 +-
 .../example/android/app/build.gradle          |   6 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../example/pubspec.yaml                      |   4 +-
 packages/firebase_dynamic_links/pubspec.yaml  |   6 +-
 packages/firebase_messaging/CHANGELOG.md      |   7 +
 .../firebase_messaging/android/build.gradle   |   6 +-
 .../android/firebase_messaging.iml            | 121 ++++++++++++------
 .../FirebaseMessagingPlugin.java              |   4 +-
 .../FlutterFirebaseInstanceIDService.java     |   2 +-
 .../FlutterFirebaseMessagingService.java      |   2 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../firebase_messaging/example/pubspec.yaml   |   2 +-
 packages/firebase_messaging/pubspec.yaml      |   4 +-
 packages/firebase_ml_vision/CHANGELOG.md      |   7 +
 .../firebase_ml_vision/android/build.gradle   |   6 +-
 .../firebasemlvision/BarcodeDetector.java     |   2 +-
 .../firebasemlvision/CloudLabelDetector.java  |   2 +-
 .../firebasemlvision/FaceDetector.java        |   2 +-
 .../firebasemlvision/LabelDetector.java       |   2 +-
 .../firebasemlvision/TextRecognizer.java      |   2 +-
 .../example/android/app/build.gradle          |   6 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../firebase_ml_vision/example/pubspec.yaml   |   4 +-
 packages/firebase_ml_vision/pubspec.yaml      |   6 +-
 packages/firebase_performance/CHANGELOG.md    |   7 +
 .../firebase_performance/android/build.gradle |   6 +-
 .../example/android/app/build.gradle          |   6 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../firebase_performance/example/pubspec.yaml |   2 +-
 packages/firebase_performance/pubspec.yaml    |   4 +-
 packages/firebase_remote_config/CHANGELOG.md  |   7 +
 .../android/build.gradle                      |   6 +-
 .../FirebaseRemoteConfigPlugin.java           |   2 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../example/pubspec.yaml                      |   2 +-
 packages/firebase_remote_config/pubspec.yaml  |   4 +-
 packages/firebase_storage/CHANGELOG.md        |   7 +
 .../firebase_storage/android/build.gradle     |   6 +-
 .../storage/FirebaseStoragePlugin.java        |   2 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../firebase_storage/example/pubspec.yaml     |   2 +-
 packages/firebase_storage/pubspec.yaml        |   4 +-
 119 files changed, 440 insertions(+), 210 deletions(-)
 create mode 100644 packages/android_alarm_manager/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/camera/example/android/app/gradle.properties
 create mode 100644 packages/camera/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/cloud_firestore/example/android/app/gradle.properties
 create mode 100644 packages/cloud_firestore/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/cloud_functions/example/android/app/gradle.properties
 create mode 100644 packages/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_admob/example/android/app/gradle.properties
 create mode 100644 packages/firebase_admob/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_analytics/example/android/app/gradle.properties
 create mode 100644 packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_database/example/android/app/gradle.properties
 create mode 100644 packages/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_dynamic_links/example/android/app/gradle.properties
 create mode 100644 packages/firebase_dynamic_links/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_messaging/example/android/app/gradle.properties
 create mode 100644 packages/firebase_messaging/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_ml_vision/example/android/app/gradle.properties
 create mode 100644 packages/firebase_ml_vision/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_performance/example/android/app/gradle.properties
 create mode 100644 packages/firebase_performance/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_remote_config/example/android/app/gradle.properties
 create mode 100644 packages/firebase_remote_config/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_storage/example/android/app/gradle.properties
 create mode 100644 packages/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index 3bde2c74055e..d068373f96a9 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.3.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.2.3
 * Move firebase_auth from a dependency to a dev_dependency.
 
diff --git a/packages/android_alarm_manager/android/build.gradle b/packages/android_alarm_manager/android/build.gradle
index 12802bdcda8e..173875c58e40 100644
--- a/packages/android_alarm_manager/android/build.gradle
+++ b/packages/android_alarm_manager/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/android_alarm_manager/example/android/app/build.gradle b/packages/android_alarm_manager/example/android/app/build.gradle
index 4171ac109f80..1beebc3c12bb 100644
--- a/packages/android_alarm_manager/example/android/app/build.gradle
+++ b/packages/android_alarm_manager/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.androidalarmmanagerexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/android_alarm_manager/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/android_alarm_manager/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/android_alarm_manager/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/android_alarm_manager/example/android/build.gradle b/packages/android_alarm_manager/example/android/build.gradle
index 83f45572c5a3..6ca85f908e0b 100644
--- a/packages/android_alarm_manager/example/android/build.gradle
+++ b/packages/android_alarm_manager/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/android_alarm_manager/example/android/gradle.properties b/packages/android_alarm_manager/example/android/gradle.properties
index 8bd86f680510..53ae0ae470eb 100644
--- a/packages/android_alarm_manager/example/android/gradle.properties
+++ b/packages/android_alarm_manager/example/android/gradle.properties
@@ -1 +1,3 @@
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M
diff --git a/packages/android_alarm_manager/example/pubspec.yaml b/packages/android_alarm_manager/example/pubspec.yaml
index 56af4c68eabe..6a5628493d51 100644
--- a/packages/android_alarm_manager/example/pubspec.yaml
+++ b/packages/android_alarm_manager/example/pubspec.yaml
@@ -6,8 +6,8 @@ dependencies:
     sdk: flutter
   android_alarm_manager:
     path: ../
-  firebase_auth: ^0.6.6
-  google_sign_in: ^3.2.4
+  firebase_auth: "^0.8.0+1"
+  google_sign_in: ^3.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index 75bb76b3ba4c..39a7b41e04f1 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -1,7 +1,7 @@
 name: android_alarm_manager
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.2.3
+version: 0.3.0
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 
@@ -10,7 +10,7 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
-  firebase_auth: ^0.6.6
+  firebase_auth: "^0.8.0+1"
 
 flutter:
   plugin:
diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 34cd98e49aaa..c6c3b9a86cb1 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.3.0
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.2.9+1
 
 * Fix a crash when failing to start preview.
diff --git a/packages/camera/android/build.gradle b/packages/camera/android/build.gradle
index 85c9ad242b49..9c6001b0a5c9 100644
--- a/packages/camera/android/build.gradle
+++ b/packages/camera/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,16 +22,16 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 21
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
     }
     dependencies {
-        implementation 'com.android.support:support-annotations:27.1.1'
+        implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index 4764895d0bb3..b4a85f8b3503 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -24,12 +24,12 @@
 import android.media.MediaRecorder;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Size;
 import android.view.Display;
 import android.view.OrientationEventListener;
 import android.view.Surface;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
diff --git a/packages/camera/example/android/app/build.gradle b/packages/camera/example/android/app/build.gradle
index aff850af09d4..39003759e4a3 100644
--- a/packages/camera/example/android/app/build.gradle
+++ b/packages/camera/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.cameraexample"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -58,6 +58,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/camera/example/android/app/gradle.properties b/packages/camera/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/camera/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/camera/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/camera/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/camera/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/camera/example/android/build.gradle b/packages/camera/example/android/build.gradle
index db728801d8ac..112aa2a87c27 100644
--- a/packages/camera/example/android/build.gradle
+++ b/packages/camera/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/camera/example/pubspec.yaml b/packages/camera/example/pubspec.yaml
index d972e3e25fa7..834fe1b98cee 100644
--- a/packages/camera/example/pubspec.yaml
+++ b/packages/camera/example/pubspec.yaml
@@ -5,10 +5,10 @@ author: Flutter Team <flutter-dev@googlegroups.com>
 dependencies:
   camera:
     path: ../
-  path_provider: ^0.4.1
+  path_provider: ^0.5.0
   flutter:
     sdk: flutter
-  video_player: ^0.5.2
+  video_player: ^0.10.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 8679115771ed..cff91c1626c4 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -1,7 +1,7 @@
 name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed and capturing images.
-version: 0.2.9+1
+version: 0.3.0
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>
@@ -16,8 +16,8 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
-  path_provider: ^0.4.1
-  video_player: ^0.5.2
+  path_provider: ^0.5.0
+  video_player: ^0.10.0
 
 flutter:
   plugin:
diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 19c471be70d1..f8b020662c63 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.9.0
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.8.2+3
 
 * Resolved "explicit self reference" and "loses accuracy" compiler warnings.
diff --git a/packages/cloud_firestore/android/build.gradle b/packages/cloud_firestore/android/build.gradle
index 3d95ca18ea32..90e8bd678640 100755
--- a/packages/cloud_firestore/android/build.gradle
+++ b/packages/cloud_firestore/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -24,11 +24,11 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
index 24ffe9a6d3f5..fc73523ff9d7 100644
--- a/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
+++ b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
@@ -5,9 +5,9 @@
 package io.flutter.plugins.firebase.cloudfirestore;
 
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.SparseArray;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
diff --git a/packages/cloud_firestore/example/android/app/build.gradle b/packages/cloud_firestore/example/android/app/build.gradle
index 47645e15ce99..f3327118cfa0 100755
--- a/packages/cloud_firestore/example/android/app/build.gradle
+++ b/packages/cloud_firestore/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId 'io.flutter.plugins.firebase.firestoreexample'
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/cloud_firestore/example/android/app/gradle.properties b/packages/cloud_firestore/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/cloud_firestore/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/cloud_firestore/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/cloud_firestore/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/cloud_firestore/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/cloud_firestore/example/android/build.gradle b/packages/cloud_firestore/example/android/build.gradle
index c9ffd24e9e5f..a144a1922d98 100755
--- a/packages/cloud_firestore/example/android/build.gradle
+++ b/packages/cloud_firestore/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/cloud_firestore/example/pubspec.yaml b/packages/cloud_firestore/example/pubspec.yaml
index 91f3fb8bde19..09f65bbeb5db 100755
--- a/packages/cloud_firestore/example/pubspec.yaml
+++ b/packages/cloud_firestore/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   cloud_firestore:
     path: ../
-  firebase_core: "^0.2.5+1"
+  firebase_core: "^0.3.0"
 
 flutter:
   uses-material-design: true
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index e540b36b9f11..31e02101578e 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.8.2+3
+version: 0.9.0
 
 flutter:
   plugin:
@@ -16,7 +16,7 @@ dependencies:
     sdk: flutter
   meta: "^1.0.5"
   collection: "^1.14.3"
-  firebase_core: "^0.2.5+1"
+  firebase_core: "^0.3.0"
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/cloud_functions/CHANGELOG.md b/packages/cloud_functions/CHANGELOG.md
index e070431c0e9e..a4ff66466c7b 100644
--- a/packages/cloud_functions/CHANGELOG.md
+++ b/packages/cloud_functions/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.1.0
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.0.5
 
 * Set iOS deployment target to 8.0 (minimum supported by both Firebase SDKs and Flutter), fixes compilation errors.
diff --git a/packages/cloud_functions/android/build.gradle b/packages/cloud_functions/android/build.gradle
index e1b3b82560d1..e0c46f39f417 100644
--- a/packages/cloud_functions/android/build.gradle
+++ b/packages/cloud_functions/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/cloudfunctions/cloudfunctions/CloudFunctionsPlugin.java b/packages/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/cloudfunctions/cloudfunctions/CloudFunctionsPlugin.java
index 3de5a3d6ee0e..2851480bfb1a 100644
--- a/packages/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/cloudfunctions/cloudfunctions/CloudFunctionsPlugin.java
+++ b/packages/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/cloudfunctions/cloudfunctions/CloudFunctionsPlugin.java
@@ -4,7 +4,7 @@
 
 package io.flutter.plugins.firebase.cloudfunctions.cloudfunctions;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.functions.FirebaseFunctions;
diff --git a/packages/cloud_functions/example/android/app/build.gradle b/packages/cloud_functions/example/android/app/build.gradle
index b9c5299da262..4b75a0d8eec4 100644
--- a/packages/cloud_functions/example/android/app/build.gradle
+++ b/packages/cloud_functions/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebase.cloudfunctions.cloudfunctionsexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/cloud_functions/example/android/app/gradle.properties b/packages/cloud_functions/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/cloud_functions/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/cloud_functions/example/android/build.gradle b/packages/cloud_functions/example/android/build.gradle
index 83f45572c5a3..6ca85f908e0b 100644
--- a/packages/cloud_functions/example/android/build.gradle
+++ b/packages/cloud_functions/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/cloud_functions/example/pubspec.yaml b/packages/cloud_functions/example/pubspec.yaml
index 520fdd95f73e..8510d72e0704 100644
--- a/packages/cloud_functions/example/pubspec.yaml
+++ b/packages/cloud_functions/example/pubspec.yaml
@@ -9,7 +9,7 @@ dependencies:
   cupertino_icons: ^0.1.2
   cloud_functions:
     path: ..
-  firebase_core: 0.2.5+1
+  firebase_core: 0.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/cloud_functions/pubspec.yaml b/packages/cloud_functions/pubspec.yaml
index 145ae0707d37..40ee9cdc7de6 100644
--- a/packages/cloud_functions/pubspec.yaml
+++ b/packages/cloud_functions/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cloud_functions
 description: Flutter plugin for Cloud Functions.
-version: 0.0.5
+version: 0.1.0
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_functions
 
@@ -17,7 +17,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
diff --git a/packages/firebase_admob/CHANGELOG.md b/packages/firebase_admob/CHANGELOG.md
index 19f6ba17b7d5..5ee94567af8d 100644
--- a/packages/firebase_admob/CHANGELOG.md
+++ b/packages/firebase_admob/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.8.0
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.7.0
 
 * Mark Dart code as deprecated where the newer version AdMob deprecates features (Birthday, Gender, and Family targeting).
diff --git a/packages/firebase_admob/android/build.gradle b/packages/firebase_admob/android/build.gradle
index a4236dea0574..9d3d707cc1b8 100644
--- a/packages/firebase_admob/android/build.gradle
+++ b/packages/firebase_admob/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_admob/example/android/app/build.gradle b/packages/firebase_admob/example/android/app/build.gradle
index 89442bce2b2d..f919f535e16d 100644
--- a/packages/firebase_admob/example/android/app/build.gradle
+++ b/packages/firebase_admob/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebaseadmobexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/firebase_admob/example/android/app/gradle.properties b/packages/firebase_admob/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_admob/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_admob/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_admob/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_admob/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_admob/example/android/build.gradle b/packages/firebase_admob/example/android/build.gradle
index c9ffd24e9e5f..a144a1922d98 100644
--- a/packages/firebase_admob/example/android/build.gradle
+++ b/packages/firebase_admob/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_admob/example/pubspec.yaml b/packages/firebase_admob/example/pubspec.yaml
index 185860c15736..1a359fcc3f18 100644
--- a/packages/firebase_admob/example/pubspec.yaml
+++ b/packages/firebase_admob/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_admob:
     path: ../
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 flutter:
   uses-material-design: true
diff --git a/packages/firebase_admob/pubspec.yaml b/packages/firebase_admob/pubspec.yaml
index aaec81e50357..6cc739a5d42e 100644
--- a/packages/firebase_admob/pubspec.yaml
+++ b/packages/firebase_admob/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_admob
 description: Firebase AdMob plugin for Flutter applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_admob
-version: 0.7.0
+version: 0.8.0
 
 flutter:
   plugin:
@@ -20,7 +20,7 @@ dev_dependencies:
   mockito: ^3.0.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index 3c9df4b7f4c2..065d8442b7e5 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.2.0
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 1.1.0
 
 * Allow user to handle `PlatformException`s caught by `FirebaseAnalyticsObserver._sendScreenView()`.
diff --git a/packages/firebase_analytics/android/build.gradle b/packages/firebase_analytics/android/build.gradle
index b7b560da8aad..7d9e329938a1 100755
--- a/packages/firebase_analytics/android/build.gradle
+++ b/packages/firebase_analytics/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/example/android/app/build.gradle
index c32fd9145f1b..3d617c0045f0 100755
--- a/packages/firebase_analytics/example/android/app/build.gradle
+++ b/packages/firebase_analytics/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebaseanalyticsexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
diff --git a/packages/firebase_analytics/example/android/app/gradle.properties b/packages/firebase_analytics/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_analytics/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_analytics/example/android/build.gradle b/packages/firebase_analytics/example/android/build.gradle
index c9ffd24e9e5f..a144a1922d98 100755
--- a/packages/firebase_analytics/example/android/build.gradle
+++ b/packages/firebase_analytics/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_analytics/example/pubspec.yaml b/packages/firebase_analytics/example/pubspec.yaml
index 4318875d70bd..2139deb04a91 100755
--- a/packages/firebase_analytics/example/pubspec.yaml
+++ b/packages/firebase_analytics/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_analytics:
     path: ../
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index e5bff3148c6b..807a327e6b08 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 1.1.0
+version: 1.2.0
 
 flutter:
   plugin:
@@ -21,7 +21,7 @@ dev_dependencies:
   mockito: 3.0.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
diff --git a/packages/firebase_database/CHANGELOG.md b/packages/firebase_database/CHANGELOG.md
index 9f615928a44e..89015474d4ef 100644
--- a/packages/firebase_database/CHANGELOG.md
+++ b/packages/firebase_database/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.1.0
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 1.0.5
 
 * Bumped Android dependencies to latest.
diff --git a/packages/firebase_database/android/build.gradle b/packages/firebase_database/android/build.gradle
index 0d6f4c18a631..6304130ff5a6 100755
--- a/packages/firebase_database/android/build.gradle
+++ b/packages/firebase_database/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_database/example/android/app/build.gradle b/packages/firebase_database/example/android/app/build.gradle
index d7836d9872ed..fef467aa8a1a 100755
--- a/packages/firebase_database/example/android/app/build.gradle
+++ b/packages/firebase_database/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId 'io.flutter.plugins.firebasedatabaseexample'
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/firebase_database/example/android/app/gradle.properties b/packages/firebase_database/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_database/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_database/example/android/build.gradle b/packages/firebase_database/example/android/build.gradle
index 83f45572c5a3..6ca85f908e0b 100755
--- a/packages/firebase_database/example/android/build.gradle
+++ b/packages/firebase_database/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_database/example/pubspec.yaml b/packages/firebase_database/example/pubspec.yaml
index df25341035fb..2d182410e2e4 100755
--- a/packages/firebase_database/example/pubspec.yaml
+++ b/packages/firebase_database/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_database:
     path: ../
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 flutter:
   uses-material-design: true
diff --git a/packages/firebase_database/pubspec.yaml b/packages/firebase_database/pubspec.yaml
index 5962f25f1daa..c705cd2fea0c 100755
--- a/packages/firebase_database/pubspec.yaml
+++ b/packages/firebase_database/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Database, a cloud-hosted NoSQL database
   with realtime data syncing across Android and iOS clients, and offline access.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_database
-version: 1.0.5
+version: 1.1.0
 
 flutter:
   plugin:
@@ -14,7 +14,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 dev_dependencies:
   test: ^1.3.0
diff --git a/packages/firebase_dynamic_links/CHANGELOG.md b/packages/firebase_dynamic_links/CHANGELOG.md
index 221ada76af8e..4c309de85498 100644
--- a/packages/firebase_dynamic_links/CHANGELOG.md
+++ b/packages/firebase_dynamic_links/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.2.0
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.1.1
 
 * Update example to create a clickable and copyable link.
diff --git a/packages/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/android/build.gradle
index 4174d10547d3..a313a737c6bb 100644
--- a/packages/firebase_dynamic_links/android/build.gradle
+++ b/packages/firebase_dynamic_links/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java b/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
index fce0888aa657..480e132de7d8 100644
--- a/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
+++ b/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
@@ -1,7 +1,7 @@
 package io.flutter.plugins.firebasedynamiclinks;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.dynamiclinks.DynamicLink;
diff --git a/packages/firebase_dynamic_links/example/android/app/build.gradle b/packages/firebase_dynamic_links/example/android/app/build.gradle
index 30d7bdf372dc..75ab78059c1c 100644
--- a/packages/firebase_dynamic_links/example/android/app/build.gradle
+++ b/packages/firebase_dynamic_links/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebasedynamiclinksexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
diff --git a/packages/firebase_dynamic_links/example/android/app/gradle.properties b/packages/firebase_dynamic_links/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_dynamic_links/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_dynamic_links/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_dynamic_links/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_dynamic_links/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_dynamic_links/example/android/build.gradle b/packages/firebase_dynamic_links/example/android/build.gradle
index 02952e08c58c..4e919286ae32 100644
--- a/packages/firebase_dynamic_links/example/android/build.gradle
+++ b/packages/firebase_dynamic_links/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_dynamic_links/example/pubspec.yaml b/packages/firebase_dynamic_links/example/pubspec.yaml
index 6a0ec838f1d6..7756f70e4e47 100644
--- a/packages/firebase_dynamic_links/example/pubspec.yaml
+++ b/packages/firebase_dynamic_links/example/pubspec.yaml
@@ -7,9 +7,9 @@ dependencies:
 
   firebase_dynamic_links:
     path: ../
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
-  url_launcher: ^3.0.3
+  url_launcher: ^4.2.0
 
 flutter:
   uses-material-design: true
diff --git a/packages/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/pubspec.yaml
index ae471344c277..9ba9ef6c1329 100644
--- a/packages/firebase_dynamic_links/pubspec.yaml
+++ b/packages/firebase_dynamic_links/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_dynamic_links
 description: Flutter plugin for Google Dynamic Links for Firebase, an app solution for creating
   and handling links across multiple platforms.
-version: 0.1.1
+version: 0.2.0
 
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_dynamic_links
@@ -13,8 +13,8 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  url_launcher: ^3.0.3
-  firebase_core: ^0.2.5+1
+  url_launcher: ^4.2.0
+  firebase_core: ^0.3.0
 
 flutter:
   plugin:
diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index c014a2c5be5d..0573f7d5fda0 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.2.0
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 2.1.0
 
 * Adding support for deleteInstanceID(), autoInitEnabled() and setAutoInitEnabled().
diff --git a/packages/firebase_messaging/android/build.gradle b/packages/firebase_messaging/android/build.gradle
index 79e757bd1e27..5798cf02ce5f 100644
--- a/packages/firebase_messaging/android/build.gradle
+++ b/packages/firebase_messaging/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_messaging/android/firebase_messaging.iml b/packages/firebase_messaging/android/firebase_messaging.iml
index 9ef7f775f115..1a79db0c9754 100644
--- a/packages/firebase_messaging/android/firebase_messaging.iml
+++ b/packages/firebase_messaging/android/firebase_messaging.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":firebase_messaging" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../example/android" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":firebase_messaging" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../example/android/app" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -23,23 +23,11 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -47,6 +35,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -61,13 +56,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -75,25 +63,84 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
     </content>
     <content url="file://$MODULE_DIR$/../example/build/firebase_messaging">
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/tmp" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/aapt_friendly_merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/check-manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/library_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/lint_jar" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/packaged_res" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/public_res" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/shader_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/outputs" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="flutter" level="project" />
-    <orderEntry type="library" exported="" name="firebase-analytics-10.2.1" level="project" />
-    <orderEntry type="library" exported="" name="firebase-messaging-10.2.4" level="project" />
-    <orderEntry type="library" exported="" name="firebase-iid-10.2.4" level="project" />
-    <orderEntry type="library" exported="" name="firebase-core-10.2.1" level="project" />
-    <orderEntry type="library" exported="" name="firebase-common-10.2.4" level="project" />
-    <orderEntry type="library" exported="" name="firebase-analytics-impl-10.2.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-tasks-10.2.4" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-24.0.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-basement-10.2.4" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-24.0.0" level="project" />
-    <orderEntry type="library" exported="" name="android-android-25" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-measurement-connector-17.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime-2.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/mklim/flutter/bin/cache/artifacts/engine/android-arm/flutter.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.print:print-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks-16.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.customview:customview-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core-2.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-common-16.0.3" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-messaging-17.3.3" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-stats-16.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.media:media-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-16.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base-16.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-2.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-interop-16.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.loader:loader-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime-2.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-17.0.3" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
index 71e76b1951e3..7cfa219d0019 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
@@ -9,9 +9,9 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApp;
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java
index 8d00597aeb7d..71840b8e3c09 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java
@@ -6,7 +6,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.FirebaseInstanceIdService;
 
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java
index 623ea24cf849..cdea8469a42a 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java
@@ -5,7 +5,7 @@
 package io.flutter.plugins.firebasemessaging;
 
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
diff --git a/packages/firebase_messaging/example/android/app/build.gradle b/packages/firebase_messaging/example/android/app/build.gradle
index 7fb33cf1d015..6946c388d840 100644
--- a/packages/firebase_messaging/example/android/app/build.gradle
+++ b/packages/firebase_messaging/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId 'io.flutter.plugins.firebasemessagingexample'
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/firebase_messaging/example/android/app/gradle.properties b/packages/firebase_messaging/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_messaging/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_messaging/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_messaging/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_messaging/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_messaging/example/android/build.gradle b/packages/firebase_messaging/example/android/build.gradle
index 83f45572c5a3..6ca85f908e0b 100644
--- a/packages/firebase_messaging/example/android/build.gradle
+++ b/packages/firebase_messaging/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_messaging/example/pubspec.yaml b/packages/firebase_messaging/example/pubspec.yaml
index ea00962ccbb0..42940ecdd010 100644
--- a/packages/firebase_messaging/example/pubspec.yaml
+++ b/packages/firebase_messaging/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_messaging:
     path: ../
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
index 9917d9d9fb32..7f58f15d5142 100644
--- a/packages/firebase_messaging/pubspec.yaml
+++ b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 2.1.0
+version: 2.2.0
 
 flutter:
   plugin:
@@ -22,7 +22,7 @@ dev_dependencies:
   mockito: ^3.0.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 6632c33013d0..0831c31658e4 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.3.0
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.2.1
 
 * Add capability to create image from bytes.
diff --git a/packages/firebase_ml_vision/android/build.gradle b/packages/firebase_ml_vision/android/build.gradle
index c388da187cd6..d44f30900cf1 100644
--- a/packages/firebase_ml_vision/android/build.gradle
+++ b/packages/firebase_ml_vision/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/BarcodeDetector.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/BarcodeDetector.java
index 261c95a2bfca..31d63b3c47a8 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/BarcodeDetector.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/BarcodeDetector.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Point;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.ml.vision.FirebaseVision;
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/CloudLabelDetector.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/CloudLabelDetector.java
index 03b89df80ba3..e24f6209cd40 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/CloudLabelDetector.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/CloudLabelDetector.java
@@ -1,6 +1,6 @@
 package io.flutter.plugins.firebasemlvision;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.ml.vision.FirebaseVision;
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FaceDetector.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FaceDetector.java
index 9a75090e8ae4..d857c0198b67 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FaceDetector.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FaceDetector.java
@@ -1,6 +1,6 @@
 package io.flutter.plugins.firebasemlvision;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.ml.vision.FirebaseVision;
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/LabelDetector.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/LabelDetector.java
index 2a4ecb05ca70..c3a317ed0a59 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/LabelDetector.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/LabelDetector.java
@@ -1,6 +1,6 @@
 package io.flutter.plugins.firebasemlvision;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.ml.vision.FirebaseVision;
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/TextRecognizer.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/TextRecognizer.java
index ea29ee883afc..ed967ca55f27 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/TextRecognizer.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/TextRecognizer.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Point;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.ml.vision.FirebaseVision;
diff --git a/packages/firebase_ml_vision/example/android/app/build.gradle b/packages/firebase_ml_vision/example/android/app/build.gradle
index 8dba32b0405c..d26768abfccb 100644
--- a/packages/firebase_ml_vision/example/android/app/build.gradle
+++ b/packages/firebase_ml_vision/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebasemlvisionexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
diff --git a/packages/firebase_ml_vision/example/android/app/gradle.properties b/packages/firebase_ml_vision/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_ml_vision/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_ml_vision/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ml_vision/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_ml_vision/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_ml_vision/example/android/build.gradle b/packages/firebase_ml_vision/example/android/build.gradle
index 02952e08c58c..4e919286ae32 100644
--- a/packages/firebase_ml_vision/example/android/build.gradle
+++ b/packages/firebase_ml_vision/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_ml_vision/example/pubspec.yaml b/packages/firebase_ml_vision/example/pubspec.yaml
index 2c52e741895f..026b13a5cdba 100644
--- a/packages/firebase_ml_vision/example/pubspec.yaml
+++ b/packages/firebase_ml_vision/example/pubspec.yaml
@@ -6,11 +6,11 @@ dependencies:
   flutter:
     sdk: flutter
 
-  image_picker: ^0.4.5
+  image_picker: ^0.5.0
   cupertino_icons: ^0.1.2
   firebase_ml_vision:
     path: ../
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 flutter:
   uses-material-design: true
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index 750eb254b2e4..fbfdb78cf652 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -3,17 +3,17 @@ description: Flutter plugin for Google ML Vision for Firebase, an SDK that bring
   learning expertise to Android and iOS apps in a powerful yet easy-to-use package.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.2.1
+version: 0.3.0
 
 dependencies:
   flutter:
     sdk: flutter
 
 dev_dependencies:
-  image_picker: ^0.4.5
+  image_picker: ^0.5.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 flutter:
   plugin:
diff --git a/packages/firebase_performance/CHANGELOG.md b/packages/firebase_performance/CHANGELOG.md
index 42fce0d7b599..08be06d49bdf 100644
--- a/packages/firebase_performance/CHANGELOG.md
+++ b/packages/firebase_performance/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.1.0
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.0.8+1
 
 * Bump Android dependencies to latest.
diff --git a/packages/firebase_performance/android/build.gradle b/packages/firebase_performance/android/build.gradle
index ee34ae51bebe..285bf85093e9 100644
--- a/packages/firebase_performance/android/build.gradle
+++ b/packages/firebase_performance/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_performance/example/android/app/build.gradle b/packages/firebase_performance/example/android/app/build.gradle
index 25a5a634d5c8..994afa5ec9d8 100644
--- a/packages/firebase_performance/example/android/app/build.gradle
+++ b/packages/firebase_performance/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebaseperformanceexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
diff --git a/packages/firebase_performance/example/android/app/gradle.properties b/packages/firebase_performance/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_performance/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_performance/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_performance/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_performance/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_performance/example/android/build.gradle b/packages/firebase_performance/example/android/build.gradle
index c9ffd24e9e5f..a144a1922d98 100644
--- a/packages/firebase_performance/example/android/build.gradle
+++ b/packages/firebase_performance/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_performance/example/pubspec.yaml b/packages/firebase_performance/example/pubspec.yaml
index a07697a2a0ab..b7d250876461 100644
--- a/packages/firebase_performance/example/pubspec.yaml
+++ b/packages/firebase_performance/example/pubspec.yaml
@@ -8,7 +8,7 @@ dependencies:
     sdk: flutter
   firebase_performance:
     path: ../
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/firebase_performance/pubspec.yaml b/packages/firebase_performance/pubspec.yaml
index 1928a2d5b57c..7dfcc0b5b84b 100644
--- a/packages/firebase_performance/pubspec.yaml
+++ b/packages/firebase_performance/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Google Performance Monitoring for Firebase, an a
   iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_performance
-version: 0.0.8+1
+version: 0.1.0
 
 dependencies:
   flutter:
@@ -14,7 +14,7 @@ dev_dependencies:
   http: ^0.12.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 flutter:
   plugin:
diff --git a/packages/firebase_remote_config/CHANGELOG.md b/packages/firebase_remote_config/CHANGELOG.md
index ba98a61925c5..e0f060b83655 100644
--- a/packages/firebase_remote_config/CHANGELOG.md
+++ b/packages/firebase_remote_config/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.1.0
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 0.0.6+1
 
 * Bump Android dependencies to latest.
diff --git a/packages/firebase_remote_config/android/build.gradle b/packages/firebase_remote_config/android/build.gradle
index 32707c033d37..7b1ad93dcdd3 100644
--- a/packages/firebase_remote_config/android/build.gradle
+++ b/packages/firebase_remote_config/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_remote_config/android/src/main/java/io/flutter/plugins/firebase/firebaseremoteconfig/FirebaseRemoteConfigPlugin.java b/packages/firebase_remote_config/android/src/main/java/io/flutter/plugins/firebase/firebaseremoteconfig/FirebaseRemoteConfigPlugin.java
index 1a38595cddab..a480322b6b5d 100644
--- a/packages/firebase_remote_config/android/src/main/java/io/flutter/plugins/firebase/firebaseremoteconfig/FirebaseRemoteConfigPlugin.java
+++ b/packages/firebase_remote_config/android/src/main/java/io/flutter/plugins/firebase/firebaseremoteconfig/FirebaseRemoteConfigPlugin.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
diff --git a/packages/firebase_remote_config/example/android/app/build.gradle b/packages/firebase_remote_config/example/android/app/build.gradle
index 2498d1cc4f98..0912407d96fa 100644
--- a/packages/firebase_remote_config/example/android/app/build.gradle
+++ b/packages/firebase_remote_config/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebase.firebaseremoteconfigexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/packages/firebase_remote_config/example/android/app/gradle.properties b/packages/firebase_remote_config/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_remote_config/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_remote_config/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_remote_config/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_remote_config/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_remote_config/example/android/build.gradle b/packages/firebase_remote_config/example/android/build.gradle
index 83f45572c5a3..6ca85f908e0b 100644
--- a/packages/firebase_remote_config/example/android/build.gradle
+++ b/packages/firebase_remote_config/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_remote_config/example/pubspec.yaml b/packages/firebase_remote_config/example/pubspec.yaml
index 4489bfb495aa..4c4a4e0c5d7a 100644
--- a/packages/firebase_remote_config/example/pubspec.yaml
+++ b/packages/firebase_remote_config/example/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
   cupertino_icons: ^0.1.0
   firebase_remote_config:
     path: ../
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/pubspec.yaml
index 46c7d1557c67..b8aca7f0112e 100644
--- a/packages/firebase_remote_config/pubspec.yaml
+++ b/packages/firebase_remote_config/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Remote Config. Update your application
   re-releasing.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_remote_config
-version: 0.0.6+1
+version: 0.1.0
 
 dependencies:
   flutter:
@@ -12,7 +12,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.2.5+1
+  firebase_core: ^0.3.0
 
 flutter:
   plugin:
diff --git a/packages/firebase_storage/CHANGELOG.md b/packages/firebase_storage/CHANGELOG.md
index 2a67d9b85e3f..204b249ef537 100644
--- a/packages/firebase_storage/CHANGELOG.md
+++ b/packages/firebase_storage/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.1.0
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
 ## 1.0.4
 
 * Bump Android dependencies to latest.
diff --git a/packages/firebase_storage/android/build.gradle b/packages/firebase_storage/android/build.gradle
index c4d5be2af099..c070209cf56d 100755
--- a/packages/firebase_storage/android/build.gradle
+++ b/packages/firebase_storage/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -30,11 +30,11 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java b/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java
index a22b2b578ff8..6cdc58f7fdd9 100755
--- a/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java
+++ b/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java
@@ -5,8 +5,8 @@
 package io.flutter.plugins.firebase.storage;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
 import android.util.SparseArray;
+import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
diff --git a/packages/firebase_storage/example/android/app/build.gradle b/packages/firebase_storage/example/android/app/build.gradle
index 86c9a900ddba..e40ea979a675 100755
--- a/packages/firebase_storage/example/android/app/build.gradle
+++ b/packages/firebase_storage/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId 'io.flutter.plugins.firebasestorageexample'
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/firebase_storage/example/android/app/gradle.properties b/packages/firebase_storage/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_storage/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_storage/example/android/build.gradle b/packages/firebase_storage/example/android/build.gradle
index c9ffd24e9e5f..a144a1922d98 100755
--- a/packages/firebase_storage/example/android/build.gradle
+++ b/packages/firebase_storage/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_storage/example/pubspec.yaml b/packages/firebase_storage/example/pubspec.yaml
index 54e9a1ba1454..35554d1691d2 100755
--- a/packages/firebase_storage/example/pubspec.yaml
+++ b/packages/firebase_storage/example/pubspec.yaml
@@ -7,7 +7,7 @@ dependencies:
     sdk: flutter
   firebase_storage:
     path: ../
-  firebase_core: "^0.2.5+1"
+  firebase_core: "^0.3.0"
   uuid: "^1.0.0"
   http: ^0.12.0
 
diff --git a/packages/firebase_storage/pubspec.yaml b/packages/firebase_storage/pubspec.yaml
index fb1f5e46f289..c3a965900d41 100755
--- a/packages/firebase_storage/pubspec.yaml
+++ b/packages/firebase_storage/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Storage, a powerful, simple, and
   cost-effective object storage service for Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_storage
-version: 1.0.4
+version: 1.1.0
 
 flutter:
   plugin:
@@ -14,7 +14,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_core: ^0.2.3
+  firebase_core: ^0.3.0
 
 dev_dependencies:
   http: ^0.12.0

From 877429ae6070a795d2595955d37280c653999609 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Fri, 25 Jan 2019 12:24:40 -0800
Subject: [PATCH 081/410] Url launcher refactor (#1085)

Refactored url launcher Objective-C and Java code.
---
 packages/url_launcher/CHANGELOG.md            |  4 +
 .../urllauncher/UrlLauncherPlugin.java        | 50 ++++++-----
 .../ios/Classes/UrlLauncherPlugin.m           | 90 ++++++++++++-------
 packages/url_launcher/pubspec.yaml            |  2 +-
 4 files changed, 92 insertions(+), 54 deletions(-)

diff --git a/packages/url_launcher/CHANGELOG.md b/packages/url_launcher/CHANGELOG.md
index ad04df605355..f9613b52a21e 100644
--- a/packages/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.2.0+1
+
+* Refactored the Java and Objective-C code. Replaced instance variables with properties in Objective-C.
+
 ## 4.2.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java b/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
index fc2192c0688f..888d3c34fc2e 100644
--- a/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
+++ b/packages/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
@@ -43,28 +43,9 @@ public void onMethodCall(MethodCall call, Result result) {
     if (call.method.equals("canLaunch")) {
       canLaunch(url, result);
     } else if (call.method.equals("launch")) {
-      Intent launchIntent;
-      boolean useWebView = call.argument("useWebView");
-      boolean enableJavaScript = call.argument("enableJavaScript");
-      Activity activity = mRegistrar.activity();
-      if (activity == null) {
-        result.error("NO_ACTIVITY", "Launching a URL requires a foreground activity.", null);
-        return;
-      }
-      if (useWebView) {
-        launchIntent = new Intent(activity, WebViewActivity.class);
-        launchIntent.putExtra("url", url);
-        launchIntent.putExtra("enableJavaScript", enableJavaScript);
-      } else {
-        launchIntent = new Intent(Intent.ACTION_VIEW);
-        launchIntent.setData(Uri.parse(url));
-      }
-      activity.startActivity(launchIntent);
-      result.success(true);
+      launch(call, result, url);
     } else if (call.method.equals("closeWebView")) {
-      Intent intent = new Intent("close");
-      mRegistrar.context().sendBroadcast(intent);
-      result.success(null);
+      closeWebView(result);
     } else {
       result.notImplemented();
     }
@@ -83,6 +64,33 @@ private void canLaunch(String url, Result result) {
     result.success(canLaunch);
   }
 
+  private void launch(MethodCall call, Result result, String url) {
+    Intent launchIntent;
+    boolean useWebView = call.argument("useWebView");
+    boolean enableJavaScript = call.argument("enableJavaScript");
+    Activity activity = mRegistrar.activity();
+    if (activity == null) {
+      result.error("NO_ACTIVITY", "Launching a URL requires a foreground activity.", null);
+      return;
+    }
+    if (useWebView) {
+      launchIntent = new Intent(activity, WebViewActivity.class);
+      launchIntent.putExtra("url", url);
+      launchIntent.putExtra("enableJavaScript", enableJavaScript);
+    } else {
+      launchIntent = new Intent(Intent.ACTION_VIEW);
+      launchIntent.setData(Uri.parse(url));
+    }
+    activity.startActivity(launchIntent);
+    result.success(true);
+  }
+
+  private void closeWebView(Result result) {
+    Intent intent = new Intent("close");
+    mRegistrar.context().sendBroadcast(intent);
+    result.success(null);
+  }
+
   /*  Launches WebView activity */
   public static class WebViewActivity extends Activity {
     private WebView webview;
diff --git a/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m b/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
index 03a00c7bc5e3..ecd2f15f1a56 100644
--- a/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
+++ b/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
@@ -6,52 +6,66 @@
 
 #import "UrlLauncherPlugin.h"
 
+API_AVAILABLE(ios(9.0))
 @interface FLTUrlLaunchSession : NSObject <SFSafariViewControllerDelegate>
-@property(strong) SFSafariViewController *safari;
+
+@property(copy, nonatomic) FlutterResult flutterResult;
+@property(strong, nonatomic) NSURL *url;
+@property(strong, nonatomic) SFSafariViewController *safari;
+
 @end
 
-@implementation FLTUrlLaunchSession {
-  NSURL *_url;
-  FlutterResult _flutterResult;
-}
+@implementation FLTUrlLaunchSession
 
 - (instancetype)initWithUrl:url withFlutterResult:result {
   self = [super init];
   if (self) {
-    _url = url;
-    _flutterResult = result;
-    _safari = [[SFSafariViewController alloc] initWithURL:url];
-    _safari.delegate = self;
+    self.url = url;
+    self.flutterResult = result;
+    if (@available(iOS 9.0, *)) {
+      self.safari = [[SFSafariViewController alloc] initWithURL:url];
+      self.safari.delegate = self;
+    }
   }
   return self;
 }
 
 - (void)safariViewController:(SFSafariViewController *)controller
-      didCompleteInitialLoad:(BOOL)didLoadSuccessfully {
+      didCompleteInitialLoad:(BOOL)didLoadSuccessfully API_AVAILABLE(ios(9.0)) {
   if (didLoadSuccessfully) {
-    _flutterResult(nil);
+    self.flutterResult(nil);
   } else {
-    _flutterResult([FlutterError
+    self.flutterResult([FlutterError
         errorWithCode:@"Error"
-              message:[NSString stringWithFormat:@"Error while launching %@", _url]
+              message:[NSString stringWithFormat:@"Error while launching %@", self.url]
               details:nil]);
   }
 }
 
-- (void)safariViewControllerDidFinish:(SFSafariViewController *)controller {
+- (void)safariViewControllerDidFinish:(SFSafariViewController *)controller API_AVAILABLE(ios(9.0)) {
   [controller dismissViewControllerAnimated:YES completion:nil];
 }
 
 - (void)close {
-  [self safariViewControllerDidFinish:_safari];
+  [self safariViewControllerDidFinish:self.safari];
 }
 
 @end
 
-@implementation FLTUrlLauncherPlugin {
-  UIViewController *_viewController;
-  FLTUrlLaunchSession *_currentSession;
-}
+API_AVAILABLE(ios(9.0))
+@interface FLTUrlLauncherPlugin ()
+
+@property(strong, nonatomic) FLTUrlLaunchSession *currentSession;
+
+@end
+
+@interface FLTUrlLauncherPlugin ()
+
+@property(strong, nonatomic) UIViewController *viewController;
+
+@end
+
+@implementation FLTUrlLauncherPlugin
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   FlutterMethodChannel *channel =
@@ -67,7 +81,7 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 - (instancetype)initWithViewController:(UIViewController *)viewController {
   self = [super init];
   if (self) {
-    _viewController = viewController;
+    self.viewController = viewController;
   }
   return self;
 }
@@ -79,12 +93,23 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
   } else if ([@"launch" isEqualToString:call.method]) {
     NSNumber *useSafariVC = call.arguments[@"useSafariVC"];
     if (useSafariVC.boolValue) {
-      [self launchURLInVC:url result:result];
+      if (@available(iOS 9.0, *)) {
+        [self launchURLInVC:url result:result];
+      } else {
+        [self launchURL:url call:call result:result];
+      }
     } else {
       [self launchURL:url call:call result:result];
     }
   } else if ([@"closeWebView" isEqualToString:call.method]) {
-    [self closeWebView:url result:result];
+    if (@available(iOS 9.0, *)) {
+      [self closeWebViewWithResult:result];
+    } else {
+      result([FlutterError
+          errorWithCode:@"API_NOT_AVAILABLE"
+                message:@"SafariViewController related api is not availabe for version <= IOS9"
+                details:nil]);
+    }
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -116,19 +141,20 @@ - (void)launchURL:(NSString *)urlString
   }
 }
 
-- (void)launchURLInVC:(NSString *)urlString result:(FlutterResult)result {
+- (void)launchURLInVC:(NSString *)urlString result:(FlutterResult)result API_AVAILABLE(ios(9.0)) {
   NSURL *url = [NSURL URLWithString:urlString];
-  _currentSession = [[FLTUrlLaunchSession alloc] initWithUrl:url withFlutterResult:result];
-  [_viewController presentViewController:_currentSession.safari
-                                animated:YES
-                              completion:^void() {
-                                self->_currentSession = nil;
-                              }];
+  self.currentSession = [[FLTUrlLaunchSession alloc] initWithUrl:url withFlutterResult:result];
+  __weak typeof(self) weakSelf = self;
+  [self.viewController presentViewController:self.currentSession.safari
+                                    animated:YES
+                                  completion:^void() {
+                                    weakSelf.currentSession = nil;
+                                  }];
 }
 
-- (void)closeWebView:(NSString *)urlString result:(FlutterResult)result {
-  if (_currentSession != nil) {
-    [_currentSession close];
+- (void)closeWebViewWithResult:(FlutterResult)result API_AVAILABLE(ios(9.0)) {
+  if (self.currentSession != nil) {
+    [self.currentSession close];
   }
   result(nil);
 }
diff --git a/packages/url_launcher/pubspec.yaml b/packages/url_launcher/pubspec.yaml
index 4e2e259cab02..230e22faaaa4 100644
--- a/packages/url_launcher/pubspec.yaml
+++ b/packages/url_launcher/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher
-version: 4.2.0
+version: 4.2.0+1
 
 flutter:
   plugin:

From 3039a26123384d22c2559ee1c2a8892f763d2831 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Fri, 25 Jan 2019 16:38:03 -0800
Subject: [PATCH 082/410] Iap productlist ios (#1068)

Added SKProductWrapper and a SKRequestMaker.
Added unit test for SKProductWrapper classes and SKRequestMaker.
Added respective objc code for IOS platform functionality, including a FIAPRequestHandler to handle all the SKRequest, only SKProductRequest is handled in this PR.
---
 .../ios/Runner.xcodeproj/project.pbxproj      |  22 +-
 .../xcshareddata/WorkspaceSettings.xcsettings |   8 +
 .../InAppPurchasePluginTest.m                 |  71 +++++
 .../ProductRequestHandlerTest.m               |  55 ++++
 .../ios/in_app_purchase_pluginTests/Stubs.h   |  34 +++
 .../ios/in_app_purchase_pluginTests/Stubs.m   | 131 +++++++++
 .../TranslatorTest.m                          |  72 +++++
 .../in_app_purchase_pluginTests.m             |  36 ---
 .../ios/Classes/FIAObjectTranslator.h         |  34 +++
 .../ios/Classes/FIAObjectTranslator.m         |  85 ++++++
 .../ios/Classes/FIAPRequestHandler.h          |  20 ++
 .../ios/Classes/FIAPRequestHandler.m          |  50 ++++
 .../ios/Classes/InAppPurchasePlugin.h         |   2 +-
 .../ios/Classes/InAppPurchasePlugin.m         |  57 +++-
 .../sk_product_wrapper.dart                   | 265 ++++++++++++++++++
 .../store_kit_wrappers/sk_request_maker.dart  |  40 +++
 .../lib/store_kit_wrappers.dart               |   1 +
 .../store_kit_wrappers/sk_product_test.dart   | 168 +++++++++++
 .../store_kit_wrappers/sk_request_test.dart   |  84 ++++++
 19 files changed, 1182 insertions(+), 53 deletions(-)
 create mode 100644 packages/in_app_purchase/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 create mode 100644 packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
 create mode 100644 packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/ProductRequestHandlerTest.m
 create mode 100644 packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
 create mode 100644 packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
 create mode 100644 packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
 delete mode 100644 packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/in_app_purchase_pluginTests.m
 create mode 100644 packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
 create mode 100644 packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
 create mode 100644 packages/in_app_purchase/ios/Classes/FIAPRequestHandler.h
 create mode 100644 packages/in_app_purchase/ios/Classes/FIAPRequestHandler.m
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart
 create mode 100644 packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
 create mode 100644 packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart

diff --git a/packages/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj b/packages/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj
index c60b5a8e36a2..86949446bb87 100644
--- a/packages/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj
@@ -12,6 +12,9 @@
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		688DE35121F2A5A100EA2684 /* TranslatorTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 688DE35021F2A5A100EA2684 /* TranslatorTest.m */; };
+		6896B34621E9363700D37AEF /* ProductRequestHandlerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6896B34521E9363700D37AEF /* ProductRequestHandlerTest.m */; };
+		6896B34C21EEB4B800D37AEF /* Stubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 6896B34B21EEB4B800D37AEF /* Stubs.m */; };
 		861D0D93B0757D95C8A69620 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2AB6BE1D4E2232AB5D4A002 /* libPods-Runner.a */; };
 		9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
 		9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -21,7 +24,7 @@
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		A5279298219369C600FF69E6 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5279297219369C600FF69E6 /* StoreKit.framework */; };
-		A59001A721E69658004A3E5E /* in_app_purchase_pluginTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A59001A621E69658004A3E5E /* in_app_purchase_pluginTests.m */; };
+		A59001A721E69658004A3E5E /* InAppPurchasePluginTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A59001A621E69658004A3E5E /* InAppPurchasePluginTest.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -55,6 +58,10 @@
 		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
+		688DE35021F2A5A100EA2684 /* TranslatorTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TranslatorTest.m; sourceTree = "<group>"; };
+		6896B34521E9363700D37AEF /* ProductRequestHandlerTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ProductRequestHandlerTest.m; sourceTree = "<group>"; };
+		6896B34A21EEB4B800D37AEF /* Stubs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Stubs.h; sourceTree = "<group>"; };
+		6896B34B21EEB4B800D37AEF /* Stubs.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Stubs.m; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -69,7 +76,7 @@
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A5279297219369C600FF69E6 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 		A59001A421E69658004A3E5E /* in_app_purchase_pluginTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = in_app_purchase_pluginTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		A59001A621E69658004A3E5E /* in_app_purchase_pluginTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = in_app_purchase_pluginTests.m; sourceTree = "<group>"; };
+		A59001A621E69658004A3E5E /* InAppPurchasePluginTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InAppPurchasePluginTest.m; sourceTree = "<group>"; };
 		A59001A821E69658004A3E5E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		B2AB6BE1D4E2232AB5D4A002 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -165,8 +172,12 @@
 		A59001A521E69658004A3E5E /* in_app_purchase_pluginTests */ = {
 			isa = PBXGroup;
 			children = (
-				A59001A621E69658004A3E5E /* in_app_purchase_pluginTests.m */,
+				A59001A621E69658004A3E5E /* InAppPurchasePluginTest.m */,
+				6896B34521E9363700D37AEF /* ProductRequestHandlerTest.m */,
 				A59001A821E69658004A3E5E /* Info.plist */,
+				6896B34A21EEB4B800D37AEF /* Stubs.h */,
+				6896B34B21EEB4B800D37AEF /* Stubs.m */,
+				688DE35021F2A5A100EA2684 /* TranslatorTest.m */,
 			);
 			path = in_app_purchase_pluginTests;
 			sourceTree = "<group>";
@@ -371,7 +382,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A59001A721E69658004A3E5E /* in_app_purchase_pluginTests.m in Sources */,
+				6896B34621E9363700D37AEF /* ProductRequestHandlerTest.m in Sources */,
+				688DE35121F2A5A100EA2684 /* TranslatorTest.m in Sources */,
+				A59001A721E69658004A3E5E /* InAppPurchasePluginTest.m in Sources */,
+				6896B34C21EEB4B800D37AEF /* Stubs.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/packages/in_app_purchase/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/in_app_purchase/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000000..949b67898200
--- /dev/null
+++ b/packages/in_app_purchase/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+</dict>
+</plist>
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
new file mode 100644
index 000000000000..1d841868cefb
--- /dev/null
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
@@ -0,0 +1,71 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <XCTest/XCTest.h>
+#import "InAppPurchasePlugin.h"
+#import "Stubs.h"
+
+@interface InAppPurchasePluginTest : XCTestCase
+
+@end
+
+@implementation InAppPurchasePluginTest
+InAppPurchasePlugin* plugin;
+
+- (void)setUp {
+  plugin = [[InAppPurchasePluginStub alloc] init];
+}
+
+- (void)tearDown {
+}
+
+- (void)testInvalidMethodCall {
+  XCTestExpectation* expectation =
+      [self expectationWithDescription:@"expect result to be not implemented"];
+  FlutterMethodCall* call = [FlutterMethodCall methodCallWithMethodName:@"invalid" arguments:NULL];
+  __block id result;
+  [plugin handleMethodCall:call
+                    result:^(id r) {
+                      [expectation fulfill];
+                      result = r;
+                    }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertEqual(result, FlutterMethodNotImplemented);
+}
+
+- (void)testCanMakePayments {
+  XCTestExpectation* expectation = [self expectationWithDescription:@"expect result to be YES"];
+  FlutterMethodCall* call =
+      [FlutterMethodCall methodCallWithMethodName:@"-[SKPaymentQueue canMakePayments:]"
+                                        arguments:NULL];
+  __block id result;
+  [plugin handleMethodCall:call
+                    result:^(id r) {
+                      [expectation fulfill];
+                      result = r;
+                    }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertEqual(result, [NSNumber numberWithBool:YES]);
+}
+
+- (void)testGetProductResponse {
+  XCTestExpectation* expectation =
+      [self expectationWithDescription:@"expect response contains 1 item"];
+  FlutterMethodCall* call = [FlutterMethodCall
+      methodCallWithMethodName:@"-[InAppPurchasePlugin startProductRequest:result:]"
+                     arguments:@[ @"123" ]];
+  __block id result;
+  [plugin handleMethodCall:call
+                    result:^(id r) {
+                      [expectation fulfill];
+                      result = r;
+                    }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssert([result isKindOfClass:[NSDictionary class]]);
+  NSArray* resultArray = [result objectForKey:@"products"];
+  XCTAssertEqual(resultArray.count, 1);
+  XCTAssertTrue([resultArray.firstObject[@"productIdentifier"] isEqualToString:@"123"]);
+}
+
+@end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/ProductRequestHandlerTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/ProductRequestHandlerTest.m
new file mode 100644
index 000000000000..a0eb4704200b
--- /dev/null
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/ProductRequestHandlerTest.m
@@ -0,0 +1,55 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <XCTest/XCTest.h>
+#import "FIAPRequestHandler.h"
+#import "Stubs.h"
+
+#pragma tests start here
+
+@interface RequestHandlerTest : XCTestCase
+
+@end
+
+@implementation RequestHandlerTest
+
+- (void)testRequestHandlerWithProductRequestSuccess {
+  SKProductRequestStub *request =
+      [[SKProductRequestStub alloc] initWithProductIdentifiers:[NSSet setWithArray:@[ @"123" ]]];
+  FIAPRequestHandler *handler = [[FIAPRequestHandler alloc] initWithRequest:request];
+  XCTestExpectation *expectation =
+      [self expectationWithDescription:@"expect to get response with 1 product"];
+  __block SKProductsResponse *response;
+  [handler
+      startProductRequestWithCompletionHandler:^(SKProductsResponse *_Nullable r, NSError *error) {
+        response = r;
+        [expectation fulfill];
+      }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertNotNil(response);
+  XCTAssertEqual(response.products.count, 1);
+  SKProduct *product = response.products.firstObject;
+  XCTAssertTrue([product.productIdentifier isEqualToString:@"123"]);
+}
+
+- (void)testRequestHandlerWithProductRequestFailure {
+  SKProductRequestStub *request = [[SKProductRequestStub alloc]
+      initWithFailureError:[NSError errorWithDomain:@"test" code:123 userInfo:@{}]];
+  FIAPRequestHandler *handler = [[FIAPRequestHandler alloc] initWithRequest:request];
+  XCTestExpectation *expectation =
+      [self expectationWithDescription:@"expect to get response with 1 product"];
+  __block NSError *error;
+  __block SKProductsResponse *response;
+  [handler startProductRequestWithCompletionHandler:^(SKProductsResponse *_Nullable r, NSError *e) {
+    error = e;
+    response = r;
+    [expectation fulfill];
+  }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertNotNil(error);
+  XCTAssertEqual(error.domain, @"test");
+  XCTAssertNil(response);
+}
+
+@end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
new file mode 100644
index 000000000000..0756ef266f00
--- /dev/null
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
@@ -0,0 +1,34 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <Foundation/Foundation.h>
+#import <StoreKit/StoreKit.h>
+#import "FIAPRequestHandler.h"
+#import "InAppPurchasePlugin.h"
+
+NS_ASSUME_NONNULL_BEGIN
+@interface SKProductSubscriptionPeriodStub : SKProductSubscriptionPeriod
+- (instancetype)initWithMap:(NSDictionary *)map;
+@end
+
+@interface SKProductDiscountStub : SKProductDiscount
+- (instancetype)initWithMap:(NSDictionary *)map;
+@end
+
+@interface SKProductStub : SKProduct
+- (instancetype)initWithMap:(NSDictionary *)map;
+@end
+
+@interface SKProductRequestStub : SKProductsRequest
+- (instancetype)initWithProductIdentifiers:(NSSet<NSString *> *)productIdentifiers;
+- (instancetype)initWithFailureError:(NSError *)error;
+@end
+
+@interface SKProductsResponseStub : SKProductsResponse
+- (instancetype)initWithMap:(NSDictionary *)map;
+@end
+
+@interface InAppPurchasePluginStub : InAppPurchasePlugin
+@end
+NS_ASSUME_NONNULL_END
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
new file mode 100644
index 000000000000..e7a30e11b93f
--- /dev/null
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
@@ -0,0 +1,131 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "Stubs.h"
+
+@implementation SKProductSubscriptionPeriodStub
+
+- (instancetype)initWithMap:(NSDictionary *)map {
+  self = [super init];
+  if (self) {
+    [self setValue:map[@"numberOfUnits"] ?: @(0) forKey:@"numberOfUnits"];
+    [self setValue:map[@"unit"] ?: @(0) forKey:@"unit"];
+  }
+  return self;
+}
+
+@end
+
+@implementation SKProductDiscountStub
+
+- (instancetype)initWithMap:(NSDictionary *)map {
+  self = [super init];
+  if (self) {
+    [self setValue:map[@"price"] ?: [NSNull null] forKey:@"price"];
+    NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"];
+    [self setValue:locale ?: [NSNull null] forKey:@"priceLocale"];
+    [self setValue:map[@"numberOfPeriods"] ?: @(0) forKey:@"numberOfPeriods"];
+    SKProductSubscriptionPeriodStub *subscriptionPeriodSub =
+        [[SKProductSubscriptionPeriodStub alloc] initWithMap:map[@"subscriptionPeriod"]];
+    [self setValue:subscriptionPeriodSub forKey:@"subscriptionPeriod"];
+    [self setValue:map[@"paymentMode"] ?: @(0) forKey:@"paymentMode"];
+  }
+  return self;
+}
+
+@end
+
+@implementation SKProductStub
+
+- (instancetype)initWithMap:(NSDictionary *)map {
+  self = [super init];
+  if (self) {
+    [self setValue:map[@"productIdentifier"] ?: [NSNull null] forKey:@"productIdentifier"];
+    [self setValue:map[@"localizedDescription"] ?: [NSNull null] forKey:@"localizedDescription"];
+    [self setValue:map[@"localizedTitle"] ?: [NSNull null] forKey:@"localizedTitle"];
+    [self setValue:map[@"downloadable"] ?: @NO forKey:@"downloadable"];
+    [self setValue:map[@"price"] ?: [NSNull null] forKey:@"price"];
+    NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"];
+    [self setValue:locale ?: [NSNull null] forKey:@"priceLocale"];
+    [self setValue:map[@"downloadContentLengths"] ?: @(0) forKey:@"downloadContentLengths"];
+    SKProductSubscriptionPeriodStub *period =
+        [[SKProductSubscriptionPeriodStub alloc] initWithMap:map[@"subscriptionPeriod"]];
+    [self setValue:period ?: [NSNull null] forKey:@"subscriptionPeriod"];
+    SKProductDiscountStub *discount =
+        [[SKProductDiscountStub alloc] initWithMap:map[@"introductoryPrice"]];
+    [self setValue:discount ?: [NSNull null] forKey:@"introductoryPrice"];
+    [self setValue:map[@"subscriptionGroupIdentifier"] ?: [NSNull null]
+            forKey:@"subscriptionGroupIdentifier"];
+  }
+  return self;
+}
+
+@end
+
+@interface SKProductRequestStub ()
+
+@property(strong, nonatomic) NSSet *identifers;
+@property(strong, nonatomic) NSError *error;
+
+@end
+
+@implementation SKProductRequestStub
+
+- (instancetype)initWithProductIdentifiers:(NSSet<NSString *> *)productIdentifiers {
+  self = [super initWithProductIdentifiers:productIdentifiers];
+  self.identifers = productIdentifiers;
+  return self;
+}
+
+- (instancetype)initWithFailureError:(NSError *)error {
+  self = [super init];
+  self.error = error;
+  return self;
+}
+
+- (void)start {
+  NSMutableArray *productArray = [NSMutableArray new];
+  for (NSString *identifier in self.identifers) {
+    [productArray addObject:@{@"productIdentifier" : identifier}];
+  }
+  SKProductsResponseStub *response =
+      [[SKProductsResponseStub alloc] initWithMap:@{@"products" : productArray}];
+  if (self.error) {
+    [self.delegate request:self didFailWithError:self.error];
+  } else {
+    [self.delegate productsRequest:self didReceiveResponse:response];
+  }
+  [self.delegate requestDidFinish:self];
+}
+
+@end
+
+@implementation SKProductsResponseStub
+
+- (instancetype)initWithMap:(NSDictionary *)map {
+  self = [super init];
+  if (self) {
+    NSMutableArray *products = [NSMutableArray new];
+    for (NSDictionary *productMap in map[@"products"]) {
+      SKProductStub *product = [[SKProductStub alloc] initWithMap:productMap];
+      [products addObject:product];
+    }
+    [self setValue:products forKey:@"products"];
+  }
+  return self;
+}
+
+@end
+
+@interface InAppPurchasePluginStub ()
+
+@end
+
+@implementation InAppPurchasePluginStub
+
+- (SKProductRequestStub *)getProductRequestWithIdentifiers:(NSSet *)identifiers {
+  return [[SKProductRequestStub alloc] initWithProductIdentifiers:identifiers];
+}
+
+@end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
new file mode 100644
index 000000000000..fa4cd1700daf
--- /dev/null
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
@@ -0,0 +1,72 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <XCTest/XCTest.h>
+#import "FIAObjectTranslator.h"
+#import "Stubs.h"
+
+@interface TranslatorTest : XCTestCase
+
+@property(strong, nonatomic) NSDictionary *periodMap;
+@property(strong, nonatomic) NSDictionary *discountMap;
+@property(strong, nonatomic) NSDictionary *productMap;
+@property(strong, nonatomic) NSDictionary *productResponseMap;
+
+@end
+
+@implementation TranslatorTest
+
+- (void)setUp {
+  self.periodMap = @{@"numberOfUnits" : @(0), @"unit" : @(0)};
+  self.discountMap = @{
+    @"price" : @1.0,
+    @"currencyCode" : @"USD",
+    @"numberOfPeriods" : @1,
+    @"subscriptionPeriod" : self.periodMap,
+    @"paymentMode" : @1
+  };
+  self.productMap = @{
+    @"price" : @1.0,
+    @"currencyCode" : @"USD",
+    @"productIdentifier" : @"123",
+    @"localizedTitle" : @"title",
+    @"localizedDescription" : @"des",
+    @"downloadable" : @YES,
+    @"downloadContentLengths" : @1,
+    @"downloadContentVersion" : [NSNull null],  // not mockable
+    @"subscriptionPeriod" : self.periodMap,
+    @"introductoryPrice" : self.discountMap,
+    @"subscriptionGroupIdentifier" : @"com.group"
+  };
+  self.productResponseMap =
+      @{@"products" : @[ self.productMap ], @"invalidProductIdentifiers" : @[]};
+}
+
+- (void)testSKProductSubscriptionPeriodStubToMap {
+  SKProductSubscriptionPeriodStub *period =
+      [[SKProductSubscriptionPeriodStub alloc] initWithMap:self.periodMap];
+  NSDictionary *map = [period toMap];
+  XCTAssertEqualObjects(map, self.periodMap);
+}
+
+- (void)testSKProductDiscountStubToMap {
+  SKProductDiscountStub *discount = [[SKProductDiscountStub alloc] initWithMap:self.discountMap];
+  NSDictionary *map = [discount toMap];
+  XCTAssertEqualObjects(map, self.discountMap);
+}
+
+- (void)testProductToMap {
+  SKProductStub *product = [[SKProductStub alloc] initWithMap:self.productMap];
+  NSDictionary *map = [product toMap];
+  XCTAssertEqualObjects(map, self.productMap);
+}
+
+- (void)testProductResponseToMap {
+  SKProductsResponseStub *response =
+      [[SKProductsResponseStub alloc] initWithMap:self.productResponseMap];
+  NSDictionary *map = [response toMap];
+  XCTAssertEqualObjects(map, self.productResponseMap);
+}
+
+@end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/in_app_purchase_pluginTests.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/in_app_purchase_pluginTests.m
deleted file mode 100644
index 29ef97ba6cad..000000000000
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/in_app_purchase_pluginTests.m
+++ /dev/null
@@ -1,36 +0,0 @@
-#import <XCTest/XCTest.h>
-#import "InAppPurchasePlugin.h"
-
-@interface in_app_purchase_pluginTests : XCTestCase
-
-@end
-
-@implementation in_app_purchase_pluginTests
-InAppPurchasePlugin* plugin;
-
-- (void)setUp {
-  plugin = [[InAppPurchasePlugin alloc] init];
-}
-
-- (void)tearDown {
-}
-
-- (void)testInvalidMethodCall {
-  FlutterMethodCall* call = [FlutterMethodCall methodCallWithMethodName:@"invalid" arguments:NULL];
-  [plugin handleMethodCall:call
-                    result:^(id result) {
-                      XCTAssert(result == FlutterMethodNotImplemented);
-                    }];
-}
-
-- (void)testCanMakePayments {
-  FlutterMethodCall* call =
-      [FlutterMethodCall methodCallWithMethodName:@"-[SKPaymentQueue canMakePayments:]"
-                                        arguments:NULL];
-  [plugin handleMethodCall:call
-                    result:^(id result) {
-                      XCTAssert(result == [NSNumber numberWithBool:YES]);
-                    }];
-}
-
-@end
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
new file mode 100644
index 000000000000..260dc15ab3fe
--- /dev/null
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
@@ -0,0 +1,34 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <Foundation/Foundation.h>
+#import <StoreKit/StoreKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SKProduct (Coder)
+
+- (nullable NSDictionary *)toMap;
+
+@end
+
+@interface SKProductSubscriptionPeriod (Coder)
+
+- (nullable NSDictionary *)toMap;
+
+@end
+
+@interface SKProductDiscount (Coder)
+
+- (nullable NSDictionary *)toMap;
+
+@end
+
+@interface SKProductsResponse (Coder)
+
+- (nullable NSDictionary *)toMap;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
new file mode 100644
index 000000000000..277dc1fcd235
--- /dev/null
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
@@ -0,0 +1,85 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "FIAObjectTranslator.h"
+
+#pragma mark - SKProduct Coders
+
+@implementation SKProduct (Coder)
+
+- (NSDictionary *)toMap {
+  NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
+    @"localizedDescription" : self.localizedDescription ?: [NSNull null],
+    @"localizedTitle" : self.localizedTitle ?: [NSNull null],
+    @"productIdentifier" : self.productIdentifier ?: [NSNull null],
+    @"downloadable" : @(self.downloadable),
+    @"price" : self.price ?: [NSNull null],
+    @"downloadContentLengths" : self.downloadContentLengths ?: [NSNull null],
+    @"downloadContentVersion" : self.downloadContentVersion ?: [NSNull null]
+
+  }];
+  if (@available(iOS 10.0, *)) {
+    // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this
+    // expanded to a map. Matching android to only get the currencyCode for now.
+    // https://github.com/flutter/flutter/issues/26610
+    [map setObject:self.priceLocale.currencyCode ?: [NSNull null] forKey:@"currencyCode"];
+  }
+  if (@available(iOS 11.2, *)) {
+    [map setObject:[self.subscriptionPeriod toMap] ?: [NSNull null] forKey:@"subscriptionPeriod"];
+  }
+  if (@available(iOS 11.2, *)) {
+    [map setObject:[self.introductoryPrice toMap] ?: [NSNull null] forKey:@"introductoryPrice"];
+  }
+  if (@available(iOS 12.0, *)) {
+    [map setObject:self.subscriptionGroupIdentifier ?: [NSNull null]
+            forKey:@"subscriptionGroupIdentifier"];
+  }
+  return map;
+}
+
+@end
+
+@implementation SKProductSubscriptionPeriod (Coder)
+
+- (NSDictionary *)toMap {
+  return @{@"numberOfUnits" : @(self.numberOfUnits), @"unit" : @(self.unit)};
+}
+
+@end
+
+@implementation SKProductDiscount (Coder)
+
+- (NSDictionary *)toMap {
+  NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
+    @"price" : self.price ?: [NSNull null],
+    @"numberOfPeriods" : @(self.numberOfPeriods),
+    @"subscriptionPeriod" : [self.subscriptionPeriod toMap] ?: [NSNull null],
+    @"paymentMode" : @(self.paymentMode)
+  }];
+
+  if (@available(iOS 10.0, *)) {
+    // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this
+    // expanded to a map. Matching android to only get the currencyCode for now.
+    // https://github.com/flutter/flutter/issues/26610
+    [map setObject:self.priceLocale.currencyCode ?: [NSNull null] forKey:@"currencyCode"];
+  }
+  return map;
+}
+
+@end
+
+@implementation SKProductsResponse (Coder)
+
+- (NSDictionary *)toMap {
+  NSMutableArray *productsMapArray = [NSMutableArray new];
+  for (SKProduct *product in self.products) {
+    [productsMapArray addObject:[product toMap]];
+  }
+  return @{
+    @"products" : productsMapArray,
+    @"invalidProductIdentifiers" : self.invalidProductIdentifiers ?: @[]
+  };
+}
+
+@end
diff --git a/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.h b/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.h
new file mode 100644
index 000000000000..a4f7cb484b5c
--- /dev/null
+++ b/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.h
@@ -0,0 +1,20 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <Foundation/Foundation.h>
+#import <StoreKit/StoreKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void (^ProductRequestCompletion)(SKProductsResponse *_Nullable response,
+                                         NSError *_Nullable errror);
+
+@interface FIAPRequestHandler : NSObject
+
+- (instancetype)initWithRequest:(SKProductsRequest *)request;
+- (void)startProductRequestWithCompletionHandler:(ProductRequestCompletion)completion;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.m b/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.m
new file mode 100644
index 000000000000..e3d97e0e4338
--- /dev/null
+++ b/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.m
@@ -0,0 +1,50 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "FIAPRequestHandler.h"
+#import <StoreKit/StoreKit.h>
+
+#pragma mark - Main Handler
+
+@interface FIAPRequestHandler () <SKProductsRequestDelegate>
+
+@property(copy, nonatomic) ProductRequestCompletion completion;
+@property(strong, nonatomic) SKProductsRequest *request;
+
+@end
+
+@implementation FIAPRequestHandler
+
+- (instancetype)initWithRequest:(SKProductsRequest *)request {
+  self = [super init];
+  if (self) {
+    self.request = request;
+    request.delegate = self;
+  }
+  return self;
+}
+
+- (void)startProductRequestWithCompletionHandler:(ProductRequestCompletion)completion {
+  self.completion = completion;
+  [self.request start];
+}
+
+- (void)productsRequest:(SKProductsRequest *)request
+     didReceiveResponse:(SKProductsResponse *)response {
+  if (self.completion) {
+    self.completion(response, nil);
+  }
+}
+
+// Reserved for other SKRequests.
+- (void)requestDidFinish:(SKRequest *)request {
+}
+
+- (void)request:(SKRequest *)request didFailWithError:(NSError *)error {
+  if (self.completion) {
+    self.completion(nil, error);
+  }
+}
+
+@end
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
index efcbce94e84e..072547b77ad7 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
@@ -4,5 +4,5 @@
 
 #import <Flutter/Flutter.h>
 
-@interface InAppPurchasePlugin<SKProductsRequestDelegate> : NSObject <FlutterPlugin>
+@interface InAppPurchasePlugin : NSObject <FlutterPlugin>
 @end
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
index 50825abb566f..4a169cc37603 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
@@ -4,28 +4,24 @@
 
 #import "InAppPurchasePlugin.h"
 #import <StoreKit/StoreKit.h>
+#import "FIAObjectTranslator.h"
+#import "FIAPRequestHandler.h"
 
 @implementation InAppPurchasePlugin
 
-+ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-  FlutterMethodChannel* channel =
++ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
+  FlutterMethodChannel *channel =
       [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/in_app_purchase"
                                   binaryMessenger:[registrar messenger]];
-  InAppPurchasePlugin* instance = [[InAppPurchasePlugin alloc] init];
+  InAppPurchasePlugin *instance = [[InAppPurchasePlugin alloc] init];
   [registrar addMethodCallDelegate:instance channel:channel];
 }
 
-- (instancetype)init {
-  self = [super init];
-  if (!self) {
-    return nil;
-  }
-  return self;
-}
-
-- (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
+- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
   if ([@"-[SKPaymentQueue canMakePayments:]" isEqualToString:call.method]) {
     [self canMakePayments:result];
+  } else if ([@"-[InAppPurchasePlugin startProductRequest:result:]" isEqualToString:call.method]) {
+    [self handleProductRequestMethodCall:call result:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -35,4 +31,41 @@ - (void)canMakePayments:(FlutterResult)result {
   result([NSNumber numberWithBool:[SKPaymentQueue canMakePayments]]);
 }
 
+- (void)handleProductRequestMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
+  if (![call.arguments isKindOfClass:[NSArray class]]) {
+    result([FlutterError errorWithCode:@"storekit_invalid_argument"
+                               message:@"Argument type of startRequest is not array"
+                               details:call.arguments]);
+    return;
+  }
+  NSArray *productIdentifiers = (NSArray *)call.arguments;
+  SKProductsRequest *request =
+      [self getProductRequestWithIdentifiers:[NSSet setWithArray:productIdentifiers]];
+  FIAPRequestHandler *handler = [[FIAPRequestHandler alloc] initWithRequest:request];
+  [handler startProductRequestWithCompletionHandler:^(SKProductsResponse *_Nullable response,
+                                                      NSError *_Nullable error) {
+    if (error) {
+      NSString *details = [NSString stringWithFormat:@"Reason:%@\nRecoverSuggestion:%@",
+                                                     error.localizedFailureReason,
+                                                     error.localizedRecoverySuggestion];
+      result([FlutterError errorWithCode:@"storekit_getproductrequest_platform_error"
+                                 message:error.description
+                                 details:details]);
+      return;
+    }
+    if (!response) {
+      result([FlutterError errorWithCode:@"storekit_platform_no_response"
+                                 message:@"Failed to get SKProductResponse in startRequest "
+                                         @"call. Error occured on iOS platform"
+                                 details:call.arguments]);
+      return;
+    }
+    result([response toMap]);
+  }];
+}
+
+- (SKProductsRequest *)getProductRequestWithIdentifiers:(NSSet *)identifiers {
+  return [[SKProductsRequest alloc] initWithProductIdentifiers:identifiers];
+}
+
 @end
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
new file mode 100644
index 000000000000..15e7d838f147
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
@@ -0,0 +1,265 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/foundation.dart';
+
+/// Dart wrapper around StoreKit's [SKProductsResponse](https://developer.apple.com/documentation/storekit/skproductsresponse?language=objc).
+///
+/// Represents the response object returned by [SKRequestMaker.startProductRequest].
+/// Contains information about a list of products and a list of invalid product identifiers.
+class SkProductResponseWrapper {
+  SkProductResponseWrapper(
+      {@required this.products, @required this.invalidProductIdentifiers});
+
+  /// Constructing an instance from a map from the Objective-C layer.
+  ///
+  /// This method should only be used with `map` values returned by [SKRequestMaker.startProductRequest].
+  /// The `map` parameter must not be null.
+  SkProductResponseWrapper.fromMap(Map<String, List<dynamic>> map)
+      : assert(map != null),
+        products = _getListFromMapList(_getProductMapListFromResponseMap(map)),
+        invalidProductIdentifiers =
+            List.castFrom<dynamic, String>(map['invalidProductIdentifiers']);
+
+  /// Stores all matching successfully found products.
+  ///
+  /// One product in this list matches one valid product identifier passed to the [SKRequestMaker.startProductRequest].
+  /// Will be empty if the [SKRequestMaker.startProductRequest] method does not pass any correct product identifier.
+  final List<SKProductWrapper> products;
+
+  /// Stores product identifiers in the `productIdentifiers` from [SKRequestMaker.startProductRequest] that are not recognized by the App Store.
+  ///
+  /// The App Store will not recognize a product identifier unless certain criteria are met. A detailed list of the criteria can be
+  /// found here https://developer.apple.com/documentation/storekit/skproductsresponse/1505985-invalidproductidentifiers?language=objc.
+  /// Will be empty if all the product identifiers are valid.
+  final List<String> invalidProductIdentifiers;
+
+  static List<Map<dynamic, dynamic>> _getProductMapListFromResponseMap(
+      Map<String, List<dynamic>> map) {
+    return map['products'].cast<Map<dynamic, dynamic>>();
+  }
+
+  static List<SKProductWrapper> _getListFromMapList(
+      List<Map<dynamic, dynamic>> mapList) {
+    return mapList
+        .map((Map<dynamic, dynamic> map) => SKProductWrapper.fromMap(map))
+        .toList();
+  }
+}
+
+/// Dart wrapper around StoreKit's [SKProductPeriodUnit](https://developer.apple.com/documentation/storekit/skproductperiodunit?language=objc).
+///
+/// Used as a property in the [SKProductSubscriptionPeriodWrapper]. Minium is a day and maxium is a year.
+// The values of the enum options are matching the [SKProductPeriodUnit]'s values. Should there be an update or addition
+// in the [SKProductPeriodUnit], this need to be updated to match.
+enum SubscriptionPeriodUnit {
+  day,
+  week,
+  month,
+  year,
+}
+
+/// Dart wrapper around StoreKit's [SKProductSubscriptionPeriod](https://developer.apple.com/documentation/storekit/skproductsubscriptionperiod?language=objc).
+///
+/// A period is defined by a [numberOfUnits] and a [unit], e.g for a 3 months period [numberOfUnits] is 3 and [unit] is a month.
+/// It is used as a property in [SKProductDiscountWrapper] and [SKProductWrapper].
+class SKProductSubscriptionPeriodWrapper {
+  SKProductSubscriptionPeriodWrapper(
+      {@required this.numberOfUnits, @required this.unit});
+
+  /// Constructing an instance from a map from the Objective-C layer.
+  /// This method should only be used with `map` values returned by [SKProductDiscountWrapper.fromMap] or [SKProductWrapper.fromMap].
+  /// The `map` parameter must not be null.
+  SKProductSubscriptionPeriodWrapper.fromMap(Map<String, dynamic> map)
+      : assert(map != null &&
+            (map['numberOfUnits'] == null || map['numberOfUnits'] > 0)),
+        numberOfUnits = map['numberOfUnits'],
+        unit = (map['unit'] != null)
+            ? SubscriptionPeriodUnit.values[map['unit']]
+            : null;
+
+  /// The number of [unit] units in this period.
+  ///
+  /// Must be greater than 0.
+  final int numberOfUnits;
+
+  /// The time unit used to specify the length of this period.
+  final SubscriptionPeriodUnit unit;
+}
+
+/// Dart wrapper around StoreKit's [SKProductDiscountPaymentMode](https://developer.apple.com/documentation/storekit/skproductdiscountpaymentmode?language=objc).
+///
+/// This is used as a property in the [SKProductDiscountWrapper].
+// The values of the enum options are matching the [SKProductDiscountPaymentMode]'s values. Should there be an update or addition
+// in the [SKProductDiscountPaymentMode], this need to be updated to match.
+enum ProductDiscountPaymentMode {
+  /// Allows user to pay the discounted price at each payment period.
+  payAsYouGo,
+
+  /// Allows user to pay the discounted price upfront and receive the product for the rest of time that was paid for.
+  payUpFront,
+
+  /// User pays nothing during the discounted period.
+  freeTrail,
+}
+
+/// Dart wrapper around StoreKit's [SKProductDiscount](https://developer.apple.com/documentation/storekit/skproductdiscount?language=objc).
+///
+/// Most of the fields are identical to OBJC SKProduct.
+/// The only difference is instead of the locale object, we only exposed currencyCode for simplicity.
+/// It is used as a property in [SKProductWrapper].
+class SKProductDiscountWrapper {
+  SKProductDiscountWrapper(
+      {@required this.price,
+      @required this.currencyCode,
+      @required this.numberOfPeriods,
+      @required this.paymentMode,
+      @required this.subscriptionPeriod});
+
+  /// Constructing an instance from a map from the Objective-C layer.
+  ///
+  /// This method should only be used with `map` values returned by [SKProductWrapper.fromMap].
+  /// The `map` parameter must not be null.
+  SKProductDiscountWrapper.fromMap(Map<String, dynamic> map)
+      : assert(map != null),
+        price = map['price'],
+        currencyCode = map['currencyCode'],
+        numberOfPeriods = map['numberOfPeriods'],
+        paymentMode = (map['paymentMode'] != null)
+            ? ProductDiscountPaymentMode.values[map['paymentMode']]
+            : null,
+        subscriptionPeriod = map['subscriptionPeriod'] != null
+            ? SKProductSubscriptionPeriodWrapper.fromMap(
+                map['subscriptionPeriod'].cast<String, dynamic>())
+            : null;
+
+  /// The discounted price, in the currency that is defined in [currencyCode].
+  final double price;
+
+  // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this expanded to
+  //                 a map. Matching android to only get the currencyCode for now.
+  //                 https://github.com/flutter/flutter/issues/26610
+  /// The currencyCode for the [price], e.g USD for U.S. dollars.
+  final String currencyCode;
+
+  /// The object represent the discount period length.
+  ///
+  /// The value must be >= 0.
+  final int numberOfPeriods;
+
+  /// The object indicates how the discount price is charged.
+  final ProductDiscountPaymentMode paymentMode;
+
+  /// The object represents the duration of single subscription period for the discount.
+  ///
+  /// The [subscriptionPeriod] of the discount is independent of the product's [subscriptionPeriod],
+  /// and their units and duration do not have to be matched.
+  final SKProductSubscriptionPeriodWrapper subscriptionPeriod;
+}
+
+/// Dart wrapper around StoreKit's [SKProduct](https://developer.apple.com/documentation/storekit/skproduct?language=objc).
+///
+/// Most of the fields are identical to OBJC SKProduct.
+/// The only difference is instead of the locale object, we only exposed currencyCode for simplicity.
+/// A list of [SKProductWrapper] is returned in the [SKRequestMaker.startProductRequest] method, and
+/// should be stored for use when making a payment.
+class SKProductWrapper {
+  SKProductWrapper({
+    @required this.productIdentifier,
+    @required this.localizedTitle,
+    @required this.localizedDescription,
+    @required this.currencyCode,
+    @required this.downloadContentVersion,
+    @required this.subscriptionGroupIdentifier,
+    @required this.price,
+    @required this.downloadable,
+    @required this.downloadContentLengths,
+    @required this.subscriptionPeriod,
+    @required this.introductoryPrice,
+  });
+
+  /// Constructing an instance from a map from the Objective-C layer.
+  ///
+  /// This method should only be used with `map` values returned by [SkProductResponseWrapper.fromMap].
+  /// The `map` parameter must not be null.
+  SKProductWrapper.fromMap(Map<dynamic, dynamic> map)
+      : assert(map != null),
+        productIdentifier = map['productIdentifier'],
+        localizedTitle = map['localizedTitle'],
+        localizedDescription = map['localizedDescription'],
+        currencyCode = map['currencyCode'],
+        downloadContentVersion = map['downloadContentVersion'],
+        subscriptionGroupIdentifier = map['subscriptionGroupIdentifier'],
+        price = map['price'],
+        downloadable = map['downloadable'],
+        downloadContentLengths =
+            List.castFrom<dynamic, int>(map['downloadContentLengths']),
+        subscriptionPeriod = map['subscriptionPeriod'] != null
+            ? SKProductSubscriptionPeriodWrapper.fromMap(
+                map['subscriptionPeriod'].cast<String, dynamic>())
+            : null,
+        introductoryPrice = (map['introductoryPrice'] != null)
+            ? SKProductDiscountWrapper.fromMap(
+                map['introductoryPrice'].cast<String, dynamic>())
+            : null;
+
+  /// The unique identifier of the product.
+  final String productIdentifier;
+
+  /// The localizedTitle of the product.
+  ///
+  /// It is localized based on the current locale.
+  final String localizedTitle;
+
+  /// The localized description of the product.
+  ///
+  /// It is localized based on the current locale.
+  final String localizedDescription;
+
+  // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this expanded to
+  //                 a map. Matching android to only get the currencyCode for now.
+  //                 https://github.com/flutter/flutter/issues/26610
+  /// The currencyCode for the price, e.g USD for U.S. dollars.
+  final String currencyCode;
+
+  /// The version of the downloadable content.
+  ///
+  /// This is only available when [downloadable] is true.
+  /// It is formatted as a series of integers separated by periods.
+  final String downloadContentVersion;
+
+  /// The subscription group identifier.
+  ///
+  /// A subscription group is a collection of subscription products.
+  /// Check [SubscriptionGroup](https://developer.apple.com/app-store/subscriptions/) for more details about subscription group.
+  final String subscriptionGroupIdentifier;
+
+  /// The price of the product, in the currency that is defined in [currencyCode].
+  final double price;
+
+  /// Whether the AppStore has downloadable content for this product.
+  ///
+  /// [downloadContentVersion] and [downloadContentLengths] become available if this is true.
+  final bool downloadable;
+
+  /// The length of the downloadable content.
+  ///
+  /// This is only available when [downloadable] is true.
+  /// Each element is the size of one of the downloadable files (in bytes).
+  final List<int> downloadContentLengths;
+
+  /// The object represents the subscription period of the product.
+  ///
+  /// Can be [null] is the product is not a subscription.
+  final SKProductSubscriptionPeriodWrapper subscriptionPeriod;
+
+  /// The object represents the duration of single subscription period.
+  ///
+  /// This is only available if you set up the introductory price in the App Store Connect, otherwise it will be null.
+  /// Programmar is also responsible to determine if the user is eligible to receive it. See https://developer.apple.com/documentation/storekit/in-app_purchase/offering_introductory_pricing_in_your_app?language=objc
+  /// for more details.
+  /// The [subscriptionPeriod] of the discount is independent of the product's [subscriptionPeriod],
+  /// and their units and duration do not have to be matched.
+  final SKProductDiscountWrapper introductoryPrice;
+}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart
new file mode 100644
index 000000000000..76a385a1ae16
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart
@@ -0,0 +1,40 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'package:flutter/services.dart';
+import 'package:in_app_purchase/src/channel.dart';
+import 'sk_product_wrapper.dart';
+
+/// A request maker that handles all the requests made by SKRequest subclasses.
+///
+/// There are multiple [SKRequest](https://developer.apple.com/documentation/storekit/skrequest?language=objc) subclasses handling different requests in the `StoreKit` with multiple delegate methods,
+/// we consolidated all the `SKRequest` subclasses into this class to make requests in a more straightforward way.
+/// The request maker will create a SKRequest object, immediately starting it, and completing the future successfully or throw an exception depending on what happened to the request.
+class SKRequestMaker {
+  /// Fetches product information for a list of given product identifiers.
+  ///
+  /// The `productIdentifiers` should contain legit product identifiers that you declared for the products in the Itunes Connect. invalid identifiers
+  /// Will be stored and returned in [SkProductResponseWrapper.invalidProductIdentifiers]. Duplicate values in `productIdentifiers` will be omitted.
+  /// If `productIdentifiers` is null, an `storekit_invalid_argument` error will be returned. If `productIdentifiers` is empty, a [SkProductResponseWrapper]
+  /// will still be returned with [SkProductResponseWrapper.products] being null.
+  ///
+  /// [SkProductResponseWrapper] is returned if there is no error during the request.
+  /// A [PlatformException] is thrown if the platform code making the request fails.
+  Future<SkProductResponseWrapper> startProductRequest(
+      List<String> productIdentifiers) async {
+    final Map<dynamic, dynamic> productResponseMap = await channel.invokeMethod(
+      '-[InAppPurchasePlugin startProductRequest:result:]',
+      productIdentifiers,
+    );
+    if (productResponseMap == null) {
+      throw PlatformException(
+        code: 'storekit_no_response',
+        message: 'StoreKit: Failed to get response from platform.',
+      );
+    }
+    return SkProductResponseWrapper.fromMap(
+        productResponseMap.cast<String, List<dynamic>>());
+  }
+}
diff --git a/packages/in_app_purchase/lib/store_kit_wrappers.dart b/packages/in_app_purchase/lib/store_kit_wrappers.dart
index a216687c4013..9562ddd8bc68 100644
--- a/packages/in_app_purchase/lib/store_kit_wrappers.dart
+++ b/packages/in_app_purchase/lib/store_kit_wrappers.dart
@@ -3,3 +3,4 @@
 // found in the LICENSE file.
 
 export 'src/store_kit_wrappers/sk_payment_queue_wrapper.dart';
+export 'src/store_kit_wrappers/sk_product_wrapper.dart';
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
new file mode 100644
index 000000000000..b502a98edc5d
--- /dev/null
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
@@ -0,0 +1,168 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/test.dart';
+import 'package:in_app_purchase/src/store_kit_wrappers/sk_product_wrapper.dart';
+
+void main() {
+  final Map<String, dynamic> subMap = <String, dynamic>{
+    'numberOfUnits': 1,
+    'unit': 2
+  };
+  final Map<String, dynamic> discountMap = <String, dynamic>{
+    'price': 1.0,
+    'currencyCode': 'USD',
+    'numberOfPeriods': 1,
+    'paymentMode': 2,
+    'subscriptionPeriod': subMap,
+  };
+  final Map<String, dynamic> productMap = <String, dynamic>{
+    'productIdentifier': 'id',
+    'localizedTitle': 'title',
+    'localizedDescription': 'description',
+    'currencyCode': 'USD',
+    'downloadContentVersion': 'version',
+    'subscriptionGroupIdentifier': 'com.group',
+    'price': 1.0,
+    'downloadable': true,
+    'downloadContentLengths': <int>[1, 2],
+    'subscriptionPeriod': subMap,
+    'introductoryPrice': discountMap,
+  };
+
+  final Map<String, List<dynamic>> productResponseMap = <String, List<dynamic>>{
+    'products': <Map<String, dynamic>>[productMap],
+    'invalidProductIdentifiers': <String>['123'],
+  };
+
+  group('product request wrapper test', () {
+    test(
+        'SKProductSubscriptionPeriodWrapper should have property values consistent with map',
+        () {
+      final SKProductSubscriptionPeriodWrapper wrapper =
+          SKProductSubscriptionPeriodWrapper.fromMap(subMap);
+      expect(wrapper.numberOfUnits, subMap['numberOfUnits']);
+      expect(wrapper.unit, SubscriptionPeriodUnit.values[subMap['unit']]);
+    });
+
+    test(
+        'SKProductSubscriptionPeriodWrapper should have properties to be null if map is empty',
+        () {
+      final SKProductSubscriptionPeriodWrapper wrapper =
+          SKProductSubscriptionPeriodWrapper.fromMap(<String, dynamic>{});
+      expect(wrapper.numberOfUnits, null);
+      expect(wrapper.unit, null);
+    });
+
+    test(
+        'SKProductDiscountWrapper should have property values consistent with map',
+        () {
+      final SKProductDiscountWrapper wrapper =
+          SKProductDiscountWrapper.fromMap(discountMap);
+      expect(wrapper.price, discountMap['price']);
+      expect(wrapper.currencyCode, discountMap['currencyCode']);
+      expect(wrapper.numberOfPeriods, discountMap['numberOfPeriods']);
+      expect(wrapper.paymentMode,
+          ProductDiscountPaymentMode.values[discountMap['paymentMode']]);
+      expect(
+          wrapper.subscriptionPeriod.unit,
+          SubscriptionPeriodUnit
+              .values[discountMap['subscriptionPeriod']['unit']]);
+      expect(wrapper.subscriptionPeriod.numberOfUnits,
+          discountMap['subscriptionPeriod']['numberOfUnits']);
+    });
+
+    test(
+        'SKProductDiscountWrapper should have properties to be null if map is empty',
+        () {
+      final SKProductDiscountWrapper wrapper =
+          SKProductDiscountWrapper.fromMap(<String, dynamic>{});
+      expect(wrapper.price, null);
+      expect(wrapper.currencyCode, null);
+      expect(wrapper.numberOfPeriods, null);
+      expect(wrapper.paymentMode, null);
+      expect(wrapper.subscriptionPeriod, null);
+    });
+
+    void testMatchingProductMap(
+        SKProductWrapper wrapper, Map<String, dynamic> productMap) {
+      expect(wrapper.productIdentifier, productMap['productIdentifier']);
+      expect(wrapper.localizedTitle, productMap['localizedTitle']);
+      expect(wrapper.localizedDescription, productMap['localizedDescription']);
+      expect(wrapper.currencyCode, productMap['currencyCode']);
+      expect(
+          wrapper.downloadContentVersion, productMap['downloadContentVersion']);
+      expect(wrapper.subscriptionGroupIdentifier,
+          productMap['subscriptionGroupIdentifier']);
+      expect(wrapper.price, productMap['price']);
+      expect(wrapper.downloadable, productMap['downloadable']);
+      expect(
+          wrapper.downloadContentLengths, productMap['downloadContentLengths']);
+      expect(wrapper.introductoryPrice.price,
+          productMap['introductoryPrice']['price']);
+      expect(wrapper.introductoryPrice.numberOfPeriods,
+          productMap['introductoryPrice']['numberOfPeriods']);
+      expect(
+          wrapper.introductoryPrice.paymentMode,
+          ProductDiscountPaymentMode
+              .values[productMap['introductoryPrice']['paymentMode']]);
+      expect(
+          wrapper.introductoryPrice.subscriptionPeriod.unit,
+          SubscriptionPeriodUnit.values[productMap['introductoryPrice']
+              ['subscriptionPeriod']['unit']]);
+      expect(
+          wrapper.introductoryPrice.subscriptionPeriod.numberOfUnits,
+          productMap['introductoryPrice']['subscriptionPeriod']
+              ['numberOfUnits']);
+      expect(
+          wrapper.subscriptionPeriod.unit,
+          SubscriptionPeriodUnit
+              .values[productMap['subscriptionPeriod']['unit']]);
+      expect(wrapper.subscriptionPeriod.numberOfUnits,
+          productMap['subscriptionPeriod']['numberOfUnits']);
+    }
+
+    test('SKProductWrapper should have property values consistent with map',
+        () {
+      final SKProductWrapper wrapper = SKProductWrapper.fromMap(productMap);
+      testMatchingProductMap(wrapper, productMap);
+    });
+
+    test(
+        'SKProductDiscountWrapper should have properties to be null if map is empty',
+        () {
+      final SKProductWrapper wrapper =
+          SKProductWrapper.fromMap(<String, dynamic>{});
+      expect(wrapper.productIdentifier, null);
+      expect(wrapper.localizedTitle, null);
+      expect(wrapper.localizedDescription, null);
+      expect(wrapper.currencyCode, null);
+      expect(wrapper.downloadContentVersion, null);
+      expect(wrapper.subscriptionGroupIdentifier, null);
+      expect(wrapper.price, null);
+      expect(wrapper.downloadable, null);
+      expect(wrapper.subscriptionPeriod, null);
+    });
+
+    test('SKProductResponse wrapper should match', () {
+      final SkProductResponseWrapper wrapper =
+          SkProductResponseWrapper.fromMap(productResponseMap);
+      testMatchingProductMap(
+          wrapper.products[0], productResponseMap['products'][0]);
+      expect(wrapper.invalidProductIdentifiers,
+          productResponseMap['invalidProductIdentifiers']);
+    });
+    test('SKProductResponse wrapper should default to empty list', () {
+      final Map<String, List<dynamic>> productResponseMapEmptyList =
+          <String, List<dynamic>>{
+        'products': <Map<String, dynamic>>[],
+        'invalidProductIdentifiers': <String>[],
+      };
+      final SkProductResponseWrapper wrapper =
+          SkProductResponseWrapper.fromMap(productResponseMapEmptyList);
+      expect(wrapper.products.length, 0);
+      expect(wrapper.invalidProductIdentifiers.length, 0);
+    });
+  });
+}
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
new file mode 100644
index 000000000000..1fa8ec7cf925
--- /dev/null
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
@@ -0,0 +1,84 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/test.dart';
+import 'package:in_app_purchase/src/store_kit_wrappers/sk_product_wrapper.dart';
+import 'package:in_app_purchase/src/channel.dart';
+import 'package:in_app_purchase/src/store_kit_wrappers/sk_request_maker.dart';
+import '../stub_in_app_purchase_platform.dart';
+
+void main() {
+  final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
+
+  final Map<String, dynamic> subMap = <String, dynamic>{
+    'numberOfUnits': 1,
+    'unit': 2
+  };
+  final Map<String, dynamic> discountMap = <String, dynamic>{
+    'price': 1.0,
+    'currencyCode': 'USD',
+    'numberOfPeriods': 1,
+    'paymentMode': 2,
+    'subscriptionPeriod': subMap,
+  };
+  final Map<String, dynamic> productMap = <String, dynamic>{
+    'productIdentifier': 'id',
+    'localizedTitle': 'title',
+    'localizedDescription': 'description',
+    'currencyCode': 'USD',
+    'downloadContentVersion': 'version',
+    'subscriptionGroupIdentifier': 'com.group',
+    'price': 1.0,
+    'downloadable': true,
+    'downloadContentLengths': <int>[1, 2],
+    'subscriptionPeriod': subMap,
+    'introductoryPrice': discountMap,
+  };
+
+  final Map<String, List<dynamic>> productResponseMap = <String, List<dynamic>>{
+    'products': <Map<String, dynamic>>[productMap],
+    'invalidProductIdentifiers': <String>['123'],
+  };
+
+  setUpAll(() =>
+      channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
+
+  group('startProductRequest api', () {
+    test('platform call should get result', () async {
+      stubPlatform.addResponse(
+          name: '-[InAppPurchasePlugin startProductRequest:result:]',
+          value: productResponseMap.cast<String, dynamic>());
+      final SKRequestMaker request = SKRequestMaker();
+      final SkProductResponseWrapper response =
+          await request.startProductRequest(<String>['123']);
+      expect(
+        response.products,
+        isNotEmpty,
+      );
+      expect(
+        response.products.first.currencyCode,
+        'USD',
+      );
+      expect(
+        response.products.first.currencyCode,
+        isNot('USDA'),
+      );
+      expect(
+        response.invalidProductIdentifiers,
+        isNotEmpty,
+      );
+    });
+
+    test('result is null should throw', () async {
+      stubPlatform.addResponse(
+          name: '-[InAppPurchasePlugin startProductRequest:result:]',
+          value: null);
+      final SKRequestMaker request = SKRequestMaker();
+      expect(
+        request.startProductRequest(<String>['123']),
+        throwsException,
+      );
+    });
+  });
+}

From 98e7634904df476d951bd7902a808d3aedead847 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Mon, 28 Jan 2019 11:10:37 -0800
Subject: [PATCH 083/410] Updated `launch` to use async and await, fixed the
 incorrect return value by `launch` method. (#1124)

This is a fix for the comments flutter/flutter#25991 (comment) and flutter/flutter#25991 (comment) which mentioned that the launch api returns null instead of a boolean. flutter/flutter#25991
---
 packages/url_launcher/CHANGELOG.md          |  4 ++++
 packages/url_launcher/lib/url_launcher.dart | 16 ++++++++--------
 packages/url_launcher/pubspec.yaml          |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/url_launcher/CHANGELOG.md b/packages/url_launcher/CHANGELOG.md
index f9613b52a21e..03147630d08c 100644
--- a/packages/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.2.0+2
+
+* Updated `launch` to use async and await, fixed the incorrect return value by `launch` method.
+
 ## 4.2.0+1
 
 * Refactored the Java and Objective-C code. Replaced instance variables with properties in Objective-C.
diff --git a/packages/url_launcher/lib/url_launcher.dart b/packages/url_launcher/lib/url_launcher.dart
index 6cdb57d1619d..b51a4832920c 100644
--- a/packages/url_launcher/lib/url_launcher.dart
+++ b/packages/url_launcher/lib/url_launcher.dart
@@ -59,7 +59,7 @@ Future<bool> launch(
   bool enableJavaScript,
   bool universalLinksOnly,
   Brightness statusBarBrightness,
-}) {
+}) async {
   assert(urlString != null);
   final Uri url = Uri.parse(urlString.trimLeft());
   final bool isWebURL = url.scheme == 'http' || url.scheme == 'https';
@@ -82,7 +82,7 @@ Future<bool> launch(
   // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
   // https://github.com/flutter/flutter/issues/26431
   // ignore: strong_mode_implicit_dynamic_method
-  return _channel.invokeMethod(
+  final bool result = await _channel.invokeMethod(
     'launch',
     <String, Object>{
       'url': urlString,
@@ -91,12 +91,12 @@ Future<bool> launch(
       'enableJavaScript': enableJavaScript ?? false,
       'universalLinksOnly': universalLinksOnly ?? false,
     },
-  ).then((void _) {
-    if (statusBarBrightness != null) {
-      WidgetsBinding.instance.renderView.automaticSystemUiAdjustment =
-          previousAutomaticSystemUiAdjustment;
-    }
-  });
+  );
+  if (statusBarBrightness != null) {
+    WidgetsBinding.instance.renderView.automaticSystemUiAdjustment =
+        previousAutomaticSystemUiAdjustment;
+  }
+  return result;
 }
 
 /// Checks whether the specified URL can be handled by some app installed on the
diff --git a/packages/url_launcher/pubspec.yaml b/packages/url_launcher/pubspec.yaml
index 230e22faaaa4..471303479bcd 100644
--- a/packages/url_launcher/pubspec.yaml
+++ b/packages/url_launcher/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher
-version: 4.2.0+1
+version: 4.2.0+2
 
 flutter:
   plugin:

From 04521860ee5fd36a14bf33386bcf6749c46ce8e9 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Mon, 28 Jan 2019 13:34:12 -0800
Subject: [PATCH 084/410] Remove 'init' static method (#1108)

---
 packages/camera/CHANGELOG.md                               | 5 +++++
 .../main/java/io/flutter/plugins/camera/CameraPlugin.java  | 6 ------
 packages/camera/ios/Classes/CameraPlugin.m                 | 7 +------
 packages/camera/lib/camera.dart                            | 6 +-----
 packages/camera/pubspec.yaml                               | 2 +-
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index c6c3b9a86cb1..e29b7bd6ebf3 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,4 +1,9 @@
+## 0.3.0+1
+
+* Remove initial method call invocation from static camera method.
+
 ## 0.3.0
+
 * **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index b4a85f8b3503..00c1862ca1fd 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -148,12 +148,6 @@ public static void registerWith(Registrar registrar) {
   @Override
   public void onMethodCall(MethodCall call, final Result result) {
     switch (call.method) {
-      case "init":
-        if (camera != null) {
-          camera.close();
-        }
-        result.success(null);
-        break;
       case "availableCameras":
         try {
           String[] cameraNames = cameraManager.getCameraIdList();
diff --git a/packages/camera/ios/Classes/CameraPlugin.m b/packages/camera/ios/Classes/CameraPlugin.m
index 10e7c54e1a58..3f6fda8f3f90 100644
--- a/packages/camera/ios/Classes/CameraPlugin.m
+++ b/packages/camera/ios/Classes/CameraPlugin.m
@@ -633,12 +633,7 @@ - (instancetype)initWithRegistry:(NSObject<FlutterTextureRegistry> *)registry
 }
 
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
-  if ([@"init" isEqualToString:call.method]) {
-    if (_camera) {
-      [_camera close];
-    }
-    result(nil);
-  } else if ([@"availableCameras" isEqualToString:call.method]) {
+  if ([@"availableCameras" isEqualToString:call.method]) {
     AVCaptureDeviceDiscoverySession *discoverySession = [AVCaptureDeviceDiscoverySession
         discoverySessionWithDeviceTypes:@[ AVCaptureDeviceTypeBuiltInWideAngleCamera ]
                               mediaType:AVMediaTypeVideo
diff --git a/packages/camera/lib/camera.dart b/packages/camera/lib/camera.dart
index aae573e7e0f8..2a484b9e1c17 100644
--- a/packages/camera/lib/camera.dart
+++ b/packages/camera/lib/camera.dart
@@ -10,11 +10,7 @@ import 'package:flutter/widgets.dart';
 
 part 'camera_image.dart';
 
-final MethodChannel _channel = const MethodChannel('plugins.flutter.io/camera')
-  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-  // https://github.com/flutter/flutter/issues/26431
-  // ignore: strong_mode_implicit_dynamic_method
-  ..invokeMethod('init');
+final MethodChannel _channel = const MethodChannel('plugins.flutter.io/camera');
 
 enum CameraLensDirection { front, back, external }
 
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index cff91c1626c4..eaf4db20680f 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -1,7 +1,7 @@
 name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed and capturing images.
-version: 0.3.0
+version: 0.3.0+1
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From ea08babbfed33d6391eb889033921c84a1a0e8f5 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Mon, 28 Jan 2019 14:28:19 -0800
Subject: [PATCH 085/410] Revert AndroidX changes for 1.0.0 plugins (#1127)

The AndroidX migration didn't increment the major version for plugins >=
1.0.0. This commit reverts the code changes in the affected plugins.

It's critical that the forward roll PR is published with this so that clients
that have previously migrated aren't broken by the revert. I'm not planning
on merging this into master until the forward roll (flutter/plugins#1128) is
also LGTMed and ready to merge.

flutter/flutter#27128
flutter/flutter#23995
---
 packages/firebase_analytics/CHANGELOG.md      |  17 ++-
 .../firebase_analytics/android/build.gradle   |   6 +-
 .../example/android/app/build.gradle          |   6 +-
 .../example/android/app/gradle.properties     |   2 -
 .../gradle/wrapper/gradle-wrapper.properties  |   5 -
 .../example/android/build.gradle              |   2 +-
 .../firebase_analytics/example/pubspec.yaml   |   2 +-
 packages/firebase_analytics/pubspec.yaml      |   4 +-
 packages/firebase_database/CHANGELOG.md       |  17 ++-
 .../firebase_database/android/build.gradle    |   6 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 -
 .../gradle/wrapper/gradle-wrapper.properties  |   5 -
 .../example/android/build.gradle              |   2 +-
 .../firebase_database/example/pubspec.yaml    |   2 +-
 packages/firebase_database/pubspec.yaml       |   4 +-
 packages/firebase_messaging/CHANGELOG.md      |  19 ++-
 .../firebase_messaging/android/build.gradle   |   6 +-
 .../android/firebase_messaging.iml            | 121 ++++++------------
 .../FirebaseMessagingPlugin.java              |   4 +-
 .../FlutterFirebaseInstanceIDService.java     |   2 +-
 .../FlutterFirebaseMessagingService.java      |   2 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 -
 .../gradle/wrapper/gradle-wrapper.properties  |   5 -
 .../example/android/build.gradle              |   2 +-
 .../firebase_messaging/example/pubspec.yaml   |   2 +-
 packages/firebase_messaging/pubspec.yaml      |   4 +-
 packages/firebase_storage/CHANGELOG.md        |  13 ++
 .../firebase_storage/android/build.gradle     |   6 +-
 .../storage/FirebaseStoragePlugin.java        |   2 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 -
 .../gradle/wrapper/gradle-wrapper.properties  |   5 -
 .../example/android/build.gradle              |   2 +-
 .../firebase_storage/example/pubspec.yaml     |   2 +-
 packages/firebase_storage/pubspec.yaml        |   4 +-
 packages/google_sign_in/CHANGELOG.md          |  12 ++
 packages/google_sign_in/android/build.gradle  |   6 +-
 .../example/android/app/build.gradle          |   6 +-
 .../example/android/app/gradle.properties     |   2 -
 .../gradle/wrapper/gradle-wrapper.properties  |   5 -
 .../example/android/build.gradle              |   2 +-
 packages/google_sign_in/pubspec.yaml          |   2 +-
 packages/url_launcher/CHANGELOG.md            |  12 ++
 packages/url_launcher/android/build.gradle    |   8 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 -
 .../gradle/wrapper/gradle-wrapper.properties  |   5 -
 .../url_launcher/example/android/build.gradle |   2 +-
 packages/url_launcher/pubspec.yaml            |   2 +-
 51 files changed, 190 insertions(+), 203 deletions(-)
 delete mode 100644 packages/firebase_analytics/example/android/app/gradle.properties
 delete mode 100644 packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties
 delete mode 100644 packages/firebase_database/example/android/app/gradle.properties
 delete mode 100644 packages/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties
 delete mode 100644 packages/firebase_messaging/example/android/app/gradle.properties
 delete mode 100644 packages/firebase_messaging/example/android/app/gradle/wrapper/gradle-wrapper.properties
 delete mode 100644 packages/firebase_storage/example/android/app/gradle.properties
 delete mode 100644 packages/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties
 delete mode 100644 packages/google_sign_in/example/android/app/gradle.properties
 delete mode 100644 packages/google_sign_in/example/android/app/gradle/wrapper/gradle-wrapper.properties
 delete mode 100644 packages/url_launcher/example/android/app/gradle.properties
 delete mode 100644 packages/url_launcher/example/android/app/gradle/wrapper/gradle-wrapper.properties

diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index 065d8442b7e5..1d070062dc37 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,9 +1,22 @@
+## 1.2.0+1
+
+* **Revert the breaking 1.2.0 update**. 1.2.0 was known to be breaking and
+  should have incremented the major version number instead of the minor. This
+  revert is in and of itself breaking for anyone that has already migrated
+  however. Anyone who has already migrated their app to AndroidX should
+  immediately update to `2.0.0` instead. That's the correctly versioned new push
+  of `1.2.0`.
+
 ## 1.2.0
-* **Breaking change**. Migrate from the deprecated original Android Support
+
+* **BAD**. This was a breaking change that was incorrectly published on a minor
+  version upgrade, should never have happened. Reverted by 1.2.0+1.
+
+  "**Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
   migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
-  using the original support library.
+  using the original support library."
 
 ## 1.1.0
 
diff --git a/packages/firebase_analytics/android/build.gradle b/packages/firebase_analytics/android/build.gradle
index 7d9e329938a1..b7b560da8aad 100755
--- a/packages/firebase_analytics/android/build.gradle
+++ b/packages/firebase_analytics/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/example/android/app/build.gradle
index 3d617c0045f0..c32fd9145f1b 100755
--- a/packages/firebase_analytics/example/android/app/build.gradle
+++ b/packages/firebase_analytics/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebaseanalyticsexample"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 27
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
diff --git a/packages/firebase_analytics/example/android/app/gradle.properties b/packages/firebase_analytics/example/android/app/gradle.properties
deleted file mode 100644
index 5465fec0ecad..000000000000
--- a/packages/firebase_analytics/example/android/app/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-android.enableJetifier=true
-android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 9a4163a4f5ee..000000000000
--- a/packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/packages/firebase_analytics/example/android/build.gradle b/packages/firebase_analytics/example/android/build.gradle
index a144a1922d98..c9ffd24e9e5f 100755
--- a/packages/firebase_analytics/example/android/build.gradle
+++ b/packages/firebase_analytics/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_analytics/example/pubspec.yaml b/packages/firebase_analytics/example/pubspec.yaml
index 2139deb04a91..50274c21a534 100755
--- a/packages/firebase_analytics/example/pubspec.yaml
+++ b/packages/firebase_analytics/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_analytics:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.2.5
 
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index 807a327e6b08..b0e0492f157a 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 1.2.0
+version: 1.2.0+1
 
 flutter:
   plugin:
@@ -21,7 +21,7 @@ dev_dependencies:
   mockito: 3.0.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.2.5
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
diff --git a/packages/firebase_database/CHANGELOG.md b/packages/firebase_database/CHANGELOG.md
index 89015474d4ef..d8f828e1cd3a 100644
--- a/packages/firebase_database/CHANGELOG.md
+++ b/packages/firebase_database/CHANGELOG.md
@@ -1,9 +1,22 @@
+## 1.1.0+1
+
+* **Revert the breaking 1.1.0 update**. 1.1.0 was known to be breaking and
+  should have incremented the major version number instead of the minor. This
+  revert is in and of itself breaking for anyone that has already migrated
+  however. Anyone who has already migrated their app to AndroidX should
+  immediately update to `2.0.0` instead. That's the correctly versioned new push
+  of `1.1.0`.
+
 ## 1.1.0
-* **Breaking change**. Migrate from the deprecated original Android Support
+
+* **BAD**. This was a breaking change that was incorrectly published on a minor
+  version upgrade, should never have happened. Reverted by 1.1.0+1.
+
+  "**Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
   migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
-  using the original support library.
+  using the original support library."
 
 ## 1.0.5
 
diff --git a/packages/firebase_database/android/build.gradle b/packages/firebase_database/android/build.gradle
index 6304130ff5a6..0d6f4c18a631 100755
--- a/packages/firebase_database/android/build.gradle
+++ b/packages/firebase_database/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_database/example/android/app/build.gradle b/packages/firebase_database/example/android/app/build.gradle
index fef467aa8a1a..d7836d9872ed 100755
--- a/packages/firebase_database/example/android/app/build.gradle
+++ b/packages/firebase_database/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId 'io.flutter.plugins.firebasedatabaseexample'
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 27
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/firebase_database/example/android/app/gradle.properties b/packages/firebase_database/example/android/app/gradle.properties
deleted file mode 100644
index 5465fec0ecad..000000000000
--- a/packages/firebase_database/example/android/app/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-android.enableJetifier=true
-android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 9a4163a4f5ee..000000000000
--- a/packages/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/packages/firebase_database/example/android/build.gradle b/packages/firebase_database/example/android/build.gradle
index 6ca85f908e0b..83f45572c5a3 100755
--- a/packages/firebase_database/example/android/build.gradle
+++ b/packages/firebase_database/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_database/example/pubspec.yaml b/packages/firebase_database/example/pubspec.yaml
index 2d182410e2e4..429fef545b51 100755
--- a/packages/firebase_database/example/pubspec.yaml
+++ b/packages/firebase_database/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_database:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.2.5
 
 flutter:
   uses-material-design: true
diff --git a/packages/firebase_database/pubspec.yaml b/packages/firebase_database/pubspec.yaml
index c705cd2fea0c..e1772b7eb0ef 100755
--- a/packages/firebase_database/pubspec.yaml
+++ b/packages/firebase_database/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Database, a cloud-hosted NoSQL database
   with realtime data syncing across Android and iOS clients, and offline access.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_database
-version: 1.1.0
+version: 1.1.0+1
 
 flutter:
   plugin:
@@ -14,7 +14,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.2.5
 
 dev_dependencies:
   test: ^1.3.0
diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index 0573f7d5fda0..23fbcd1410f7 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,4 +1,17 @@
+## 2.2.0+1
+
+* **Revert the breaking 2.2.0 update**. 2.2.0 was known to be breaking and
+  should have incremented the major version number instead of the minor. This
+  revert is in and of itself breaking for anyone that has already migrated
+  however. Anyone who has already migrated their app to AndroidX should
+  immediately update to `3.0.0` instead. That's the correctly versioned new push
+  of `2.2.0`.
+
 ## 2.2.0
+
+* **BAD**. This was a breaking change that was incorrectly published on a minor
+  version upgrade, should never have happened. Reverted by `2.2.0+1`.
+
 * **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
@@ -39,7 +52,7 @@
 
 ## 1.0.2
 
-* Updated Gradle tooling to match Android Studio 3.1.2.
+* Updated Gradle tooling to match Android Studio 3.2.2.
 
 ## 1.0.1
 
@@ -81,7 +94,7 @@
 
 * Enabled use in Swift projects.
 
-## 0.1.2
+## 0.2.2
 
 * Fix for APNS not being correctly registered on iOS when reinstalling application.
 
@@ -149,7 +162,7 @@ In FirebaseMessagingPlugin.m:
 
 * Updated to latest plugin API
 
-## 0.0.1+2
+## 0.0.2.2
 
 * Downgraded gradle dependency for example app to make `flutter run` happy
 
diff --git a/packages/firebase_messaging/android/build.gradle b/packages/firebase_messaging/android/build.gradle
index 5798cf02ce5f..79e757bd1e27 100644
--- a/packages/firebase_messaging/android/build.gradle
+++ b/packages/firebase_messaging/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_messaging/android/firebase_messaging.iml b/packages/firebase_messaging/android/firebase_messaging.iml
index 1a79db0c9754..9ef7f775f115 100644
--- a/packages/firebase_messaging/android/firebase_messaging.iml
+++ b/packages/firebase_messaging/android/firebase_messaging.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":firebase_messaging" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../example/android/app" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":firebase_messaging" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../example/android" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -23,11 +23,23 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
-    <output-test url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -35,13 +47,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -56,13 +61,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -70,77 +68,32 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
     </content>
     <content url="file://$MODULE_DIR$/../example/build/firebase_messaging">
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/res/resValues/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/apt/test/debug" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/aapt_friendly_merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/library_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/lint_jar" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/packaged_res" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/public_res" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/shader_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-measurement-connector-17.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime-2.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/mklim/flutter/bin/cache/artifacts/engine/android-arm/flutter.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.print:print-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks-16.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0-rc01@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.customview:customview-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core-2.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-common-16.0.3" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-messaging-17.3.3" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0-rc01@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-stats-16.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.media:media-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-16.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base-16.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0-rc01@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0-rc01@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-2.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-interop-16.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.loader:loader-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime-2.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4-1.0.0-rc01" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-17.0.3" level="project" />
+    <orderEntry type="library" exported="" name="flutter" level="project" />
+    <orderEntry type="library" exported="" name="firebase-analytics-10.2.1" level="project" />
+    <orderEntry type="library" exported="" name="firebase-messaging-10.2.4" level="project" />
+    <orderEntry type="library" exported="" name="firebase-iid-10.2.4" level="project" />
+    <orderEntry type="library" exported="" name="firebase-core-10.2.1" level="project" />
+    <orderEntry type="library" exported="" name="firebase-common-10.2.4" level="project" />
+    <orderEntry type="library" exported="" name="firebase-analytics-impl-10.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-tasks-10.2.4" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-24.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-basement-10.2.4" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-24.0.0" level="project" />
+    <orderEntry type="library" exported="" name="android-android-25" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
index 7cfa219d0019..71e76b1951e3 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
@@ -9,9 +9,9 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
-import androidx.annotation.NonNull;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApp;
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java
index 71840b8e3c09..8d00597aeb7d 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java
@@ -6,7 +6,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import android.support.v4.content.LocalBroadcastManager;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.FirebaseInstanceIdService;
 
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java
index cdea8469a42a..623ea24cf849 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java
@@ -5,7 +5,7 @@
 package io.flutter.plugins.firebasemessaging;
 
 import android.content.Intent;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import android.support.v4.content.LocalBroadcastManager;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
diff --git a/packages/firebase_messaging/example/android/app/build.gradle b/packages/firebase_messaging/example/android/app/build.gradle
index 6946c388d840..7fb33cf1d015 100644
--- a/packages/firebase_messaging/example/android/app/build.gradle
+++ b/packages/firebase_messaging/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId 'io.flutter.plugins.firebasemessagingexample'
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 27
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/firebase_messaging/example/android/app/gradle.properties b/packages/firebase_messaging/example/android/app/gradle.properties
deleted file mode 100644
index 5465fec0ecad..000000000000
--- a/packages/firebase_messaging/example/android/app/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-android.enableJetifier=true
-android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_messaging/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_messaging/example/android/app/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 9a4163a4f5ee..000000000000
--- a/packages/firebase_messaging/example/android/app/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/packages/firebase_messaging/example/android/build.gradle b/packages/firebase_messaging/example/android/build.gradle
index 6ca85f908e0b..83f45572c5a3 100644
--- a/packages/firebase_messaging/example/android/build.gradle
+++ b/packages/firebase_messaging/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_messaging/example/pubspec.yaml b/packages/firebase_messaging/example/pubspec.yaml
index 42940ecdd010..ec5e0f6a8627 100644
--- a/packages/firebase_messaging/example/pubspec.yaml
+++ b/packages/firebase_messaging/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_messaging:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.2.5
 
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
index 7f58f15d5142..c5c96b84e61a 100644
--- a/packages/firebase_messaging/pubspec.yaml
+++ b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 2.2.0
+version: 2.2.0+1
 
 flutter:
   plugin:
@@ -22,7 +22,7 @@ dev_dependencies:
   mockito: ^3.0.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.2.5
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
diff --git a/packages/firebase_storage/CHANGELOG.md b/packages/firebase_storage/CHANGELOG.md
index 204b249ef537..7feef33df1a2 100644
--- a/packages/firebase_storage/CHANGELOG.md
+++ b/packages/firebase_storage/CHANGELOG.md
@@ -1,4 +1,17 @@
+## 1.1.0+1
+
+* **Revert the breaking 1.1.0 update**. 1.1.0 was known to be breaking and
+  should have incremented the major version number instead of the minor. This
+  revert is in and of itself breaking for anyone that has already migrated
+  however. Anyone who has already migrated their app to AndroidX should
+  immediately update to `2.0.0` instead. That's the correctly versioned new push
+  of `1.1.0`.
+
 ## 1.1.0
+
+* **BAD**. This was a breaking change that was incorrectly published on a minor
+  version upgrade, should never have happened. Reverted by 1.1.0+1.
+
 * **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
diff --git a/packages/firebase_storage/android/build.gradle b/packages/firebase_storage/android/build.gradle
index c070209cf56d..c4d5be2af099 100755
--- a/packages/firebase_storage/android/build.gradle
+++ b/packages/firebase_storage/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
@@ -30,11 +30,11 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java b/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java
index 6cdc58f7fdd9..a22b2b578ff8 100755
--- a/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java
+++ b/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java
@@ -5,8 +5,8 @@
 package io.flutter.plugins.firebase.storage;
 
 import android.net.Uri;
+import android.support.annotation.NonNull;
 import android.util.SparseArray;
-import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
diff --git a/packages/firebase_storage/example/android/app/build.gradle b/packages/firebase_storage/example/android/app/build.gradle
index e40ea979a675..86c9a900ddba 100755
--- a/packages/firebase_storage/example/android/app/build.gradle
+++ b/packages/firebase_storage/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId 'io.flutter.plugins.firebasestorageexample'
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 27
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/firebase_storage/example/android/app/gradle.properties b/packages/firebase_storage/example/android/app/gradle.properties
deleted file mode 100644
index 5465fec0ecad..000000000000
--- a/packages/firebase_storage/example/android/app/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-android.enableJetifier=true
-android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 9a4163a4f5ee..000000000000
--- a/packages/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/packages/firebase_storage/example/android/build.gradle b/packages/firebase_storage/example/android/build.gradle
index a144a1922d98..c9ffd24e9e5f 100755
--- a/packages/firebase_storage/example/android/build.gradle
+++ b/packages/firebase_storage/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_storage/example/pubspec.yaml b/packages/firebase_storage/example/pubspec.yaml
index 35554d1691d2..e9b4448efff1 100755
--- a/packages/firebase_storage/example/pubspec.yaml
+++ b/packages/firebase_storage/example/pubspec.yaml
@@ -7,7 +7,7 @@ dependencies:
     sdk: flutter
   firebase_storage:
     path: ../
-  firebase_core: "^0.3.0"
+  firebase_core: ^0.2.5
   uuid: "^1.0.0"
   http: ^0.12.0
 
diff --git a/packages/firebase_storage/pubspec.yaml b/packages/firebase_storage/pubspec.yaml
index c3a965900d41..c21ee9f29c25 100755
--- a/packages/firebase_storage/pubspec.yaml
+++ b/packages/firebase_storage/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Storage, a powerful, simple, and
   cost-effective object storage service for Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_storage
-version: 1.1.0
+version: 1.1.0+1
 
 flutter:
   plugin:
@@ -14,7 +14,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.2.5
 
 dev_dependencies:
   http: ^0.12.0
diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md
index 42722b7c762c..d25c13ee84a5 100644
--- a/packages/google_sign_in/CHANGELOG.md
+++ b/packages/google_sign_in/CHANGELOG.md
@@ -1,5 +1,17 @@
+## 3.3.0+1
+
+* **Revert the breaking 3.3.0 update**. 3.3.0 was known to be breaking and
+  should have incremented the major version number instead of the minor. This
+  revert is in and of itself breaking for anyone that has already migrated
+  however. Anyone who has already migrated their app to AndroidX should
+  immediately update to `4.0.0` instead. That's the correctly versioned new push
+  of `3.3.0`.
+
 ## 3.3.0
 
+* **BAD**. This was a breaking change that was incorrectly published on a minor
+  version upgrade, should never have happened. Reverted by 3.3.0+1.
+
 * **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
diff --git a/packages/google_sign_in/android/build.gradle b/packages/google_sign_in/android/build.gradle
index f51d723219ff..08d1f8e3588e 100755
--- a/packages/google_sign_in/android/build.gradle
+++ b/packages/google_sign_in/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/google_sign_in/example/android/app/build.gradle b/packages/google_sign_in/example/android/app/build.gradle
index 5b1c5699d48d..0f5f615f762d 100755
--- a/packages/google_sign_in/example/android/app/build.gradle
+++ b/packages/google_sign_in/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.googlesigninexample"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 27
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
diff --git a/packages/google_sign_in/example/android/app/gradle.properties b/packages/google_sign_in/example/android/app/gradle.properties
deleted file mode 100644
index 5465fec0ecad..000000000000
--- a/packages/google_sign_in/example/android/app/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-android.enableJetifier=true
-android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/google_sign_in/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/google_sign_in/example/android/app/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 9a4163a4f5ee..000000000000
--- a/packages/google_sign_in/example/android/app/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/packages/google_sign_in/example/android/build.gradle b/packages/google_sign_in/example/android/build.gradle
index 541636cc492a..bb8a303898ca 100755
--- a/packages/google_sign_in/example/android/build.gradle
+++ b/packages/google_sign_in/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml
index 5681d23c213d..7881a15e4c2a 100755
--- a/packages/google_sign_in/pubspec.yaml
+++ b/packages/google_sign_in/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in
-version: 3.3.0
+version: 3.3.0+1
 
 flutter:
   plugin:
diff --git a/packages/url_launcher/CHANGELOG.md b/packages/url_launcher/CHANGELOG.md
index 03147630d08c..048c45af8fac 100644
--- a/packages/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 4.2.0+3
+
+* **Revert the breaking 4.2.0 update**. 4.2.0 was known to be breaking and
+  should have incremented the major version number instead of the minor. This
+  revert is in and of itself breaking for anyone that has already migrated
+  however. Anyone who has already migrated their app to AndroidX should
+  immediately update to `5.0.0` instead. That's the correctly versioned new push
+  of `4.2.0`.
+
 ## 4.2.0+2
 
 * Updated `launch` to use async and await, fixed the incorrect return value by `launch` method.
@@ -8,6 +17,9 @@
 
 ## 4.2.0
 
+* **BAD**. This was a breaking change that was incorrectly published on a minor
+  version upgrade, should never have happened. Reverted by 4.2.0+3.
+
 * **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
diff --git a/packages/url_launcher/android/build.gradle b/packages/url_launcher/android/build.gradle
index 0d3a58d3f292..1c82a15f1d6f 100644
--- a/packages/url_launcher/android/build.gradle
+++ b/packages/url_launcher/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
-
+    compileSdkVersion 27
+    
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/url_launcher/example/android/app/build.gradle b/packages/url_launcher/example/android/app/build.gradle
index 325396c57235..6e480a14c034 100644
--- a/packages/url_launcher/example/android/app/build.gradle
+++ b/packages/url_launcher/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.urllauncherexample"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 27
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/packages/url_launcher/example/android/app/gradle.properties b/packages/url_launcher/example/android/app/gradle.properties
deleted file mode 100644
index 5465fec0ecad..000000000000
--- a/packages/url_launcher/example/android/app/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-android.enableJetifier=true
-android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/url_launcher/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/url_launcher/example/android/app/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 9a4163a4f5ee..000000000000
--- a/packages/url_launcher/example/android/app/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/packages/url_launcher/example/android/build.gradle b/packages/url_launcher/example/android/build.gradle
index 541636cc492a..bb8a303898ca 100644
--- a/packages/url_launcher/example/android/build.gradle
+++ b/packages/url_launcher/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
diff --git a/packages/url_launcher/pubspec.yaml b/packages/url_launcher/pubspec.yaml
index 471303479bcd..494b980d90a1 100644
--- a/packages/url_launcher/pubspec.yaml
+++ b/packages/url_launcher/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher
-version: 4.2.0+2
+version: 4.2.0+3
 
 flutter:
   plugin:

From 9d8a1004ca3e52e0286c512097242f5876bf05cc Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Mon, 28 Jan 2019 15:04:04 -0800
Subject: [PATCH 086/410] Migrate to AndroidX forward roll (#1128)

This PR forward rolls the earlier breaking changes with a proper semantic version upgrade.

flutter/flutter#27128
flutter/flutter#23995
---
 packages/firebase_analytics/CHANGELOG.md      |  10 ++
 .../firebase_analytics/android/build.gradle   |   6 +-
 .../example/android/app/build.gradle          |   6 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../firebase_analytics/example/pubspec.yaml   |   2 +-
 packages/firebase_analytics/pubspec.yaml      |   4 +-
 packages/firebase_database/CHANGELOG.md       |  10 ++
 .../firebase_database/android/build.gradle    |   6 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../firebase_database/example/pubspec.yaml    |   2 +-
 packages/firebase_database/pubspec.yaml       |   4 +-
 packages/firebase_messaging/CHANGELOG.md      |  10 ++
 .../firebase_messaging/android/build.gradle   |   6 +-
 .../android/firebase_messaging.iml            | 121 ++++++++++++------
 .../FirebaseMessagingPlugin.java              |   4 +-
 .../FlutterFirebaseInstanceIDService.java     |   2 +-
 .../FlutterFirebaseMessagingService.java      |   2 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../firebase_messaging/example/pubspec.yaml   |   2 +-
 packages/firebase_messaging/pubspec.yaml      |   4 +-
 packages/firebase_storage/CHANGELOG.md        |  10 ++
 .../firebase_storage/android/build.gradle     |   6 +-
 .../storage/FirebaseStoragePlugin.java        |   2 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 .../firebase_storage/example/pubspec.yaml     |   2 +-
 packages/firebase_storage/pubspec.yaml        |   4 +-
 packages/google_sign_in/CHANGELOG.md          |  10 ++
 packages/google_sign_in/android/build.gradle  |   6 +-
 .../example/android/app/build.gradle          |   6 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../example/android/build.gradle              |   2 +-
 packages/google_sign_in/pubspec.yaml          |   2 +-
 packages/url_launcher/CHANGELOG.md            |  10 ++
 packages/url_launcher/android/build.gradle    |   8 +-
 .../example/android/app/build.gradle          |  10 +-
 .../example/android/app/gradle.properties     |   2 +
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 .../url_launcher/example/android/build.gradle |   2 +-
 packages/url_launcher/pubspec.yaml            |   2 +-
 51 files changed, 256 insertions(+), 107 deletions(-)
 create mode 100644 packages/firebase_analytics/example/android/app/gradle.properties
 create mode 100644 packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_database/example/android/app/gradle.properties
 create mode 100644 packages/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_messaging/example/android/app/gradle.properties
 create mode 100644 packages/firebase_messaging/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_storage/example/android/app/gradle.properties
 create mode 100644 packages/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/google_sign_in/example/android/app/gradle.properties
 create mode 100644 packages/google_sign_in/example/android/app/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/url_launcher/example/android/app/gradle.properties
 create mode 100644 packages/url_launcher/example/android/app/gradle/wrapper/gradle-wrapper.properties

diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index 1d070062dc37..b3880e843947 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 2.0.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
+  This was originally incorrectly pushed in the `1.2.0` update.
+
 ## 1.2.0+1
 
 * **Revert the breaking 1.2.0 update**. 1.2.0 was known to be breaking and
diff --git a/packages/firebase_analytics/android/build.gradle b/packages/firebase_analytics/android/build.gradle
index b7b560da8aad..7d9e329938a1 100755
--- a/packages/firebase_analytics/android/build.gradle
+++ b/packages/firebase_analytics/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/example/android/app/build.gradle
index c32fd9145f1b..3d617c0045f0 100755
--- a/packages/firebase_analytics/example/android/app/build.gradle
+++ b/packages/firebase_analytics/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebaseanalyticsexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
diff --git a/packages/firebase_analytics/example/android/app/gradle.properties b/packages/firebase_analytics/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_analytics/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_analytics/example/android/build.gradle b/packages/firebase_analytics/example/android/build.gradle
index c9ffd24e9e5f..a144a1922d98 100755
--- a/packages/firebase_analytics/example/android/build.gradle
+++ b/packages/firebase_analytics/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_analytics/example/pubspec.yaml b/packages/firebase_analytics/example/pubspec.yaml
index 50274c21a534..2139deb04a91 100755
--- a/packages/firebase_analytics/example/pubspec.yaml
+++ b/packages/firebase_analytics/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_analytics:
     path: ../
-  firebase_core: ^0.2.5
+  firebase_core: ^0.3.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index b0e0492f157a..d3cd02d1c23f 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 1.2.0+1
+version: 2.0.0
 
 flutter:
   plugin:
@@ -21,7 +21,7 @@ dev_dependencies:
   mockito: 3.0.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.2.5
+  firebase_core: ^0.3.0
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
diff --git a/packages/firebase_database/CHANGELOG.md b/packages/firebase_database/CHANGELOG.md
index d8f828e1cd3a..d037f64e42c2 100644
--- a/packages/firebase_database/CHANGELOG.md
+++ b/packages/firebase_database/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 2.0.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
+  This was originally incorrectly pushed in the `1.1.0` update.
+
 ## 1.1.0+1
 
 * **Revert the breaking 1.1.0 update**. 1.1.0 was known to be breaking and
diff --git a/packages/firebase_database/android/build.gradle b/packages/firebase_database/android/build.gradle
index 0d6f4c18a631..6304130ff5a6 100755
--- a/packages/firebase_database/android/build.gradle
+++ b/packages/firebase_database/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_database/example/android/app/build.gradle b/packages/firebase_database/example/android/app/build.gradle
index d7836d9872ed..fef467aa8a1a 100755
--- a/packages/firebase_database/example/android/app/build.gradle
+++ b/packages/firebase_database/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId 'io.flutter.plugins.firebasedatabaseexample'
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/firebase_database/example/android/app/gradle.properties b/packages/firebase_database/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_database/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_database/example/android/build.gradle b/packages/firebase_database/example/android/build.gradle
index 83f45572c5a3..6ca85f908e0b 100755
--- a/packages/firebase_database/example/android/build.gradle
+++ b/packages/firebase_database/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_database/example/pubspec.yaml b/packages/firebase_database/example/pubspec.yaml
index 429fef545b51..2d182410e2e4 100755
--- a/packages/firebase_database/example/pubspec.yaml
+++ b/packages/firebase_database/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_database:
     path: ../
-  firebase_core: ^0.2.5
+  firebase_core: ^0.3.0
 
 flutter:
   uses-material-design: true
diff --git a/packages/firebase_database/pubspec.yaml b/packages/firebase_database/pubspec.yaml
index e1772b7eb0ef..913c247b5189 100755
--- a/packages/firebase_database/pubspec.yaml
+++ b/packages/firebase_database/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Database, a cloud-hosted NoSQL database
   with realtime data syncing across Android and iOS clients, and offline access.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_database
-version: 1.1.0+1
+version: 2.0.0
 
 flutter:
   plugin:
@@ -14,7 +14,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_core: ^0.2.5
+  firebase_core: ^0.3.0
 
 dev_dependencies:
   test: ^1.3.0
diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index 23fbcd1410f7..3a8f1c59e740 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 3.0.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
+  This was originally incorrectly pushed in the `2.2.0` update.
+
 ## 2.2.0+1
 
 * **Revert the breaking 2.2.0 update**. 2.2.0 was known to be breaking and
diff --git a/packages/firebase_messaging/android/build.gradle b/packages/firebase_messaging/android/build.gradle
index 79e757bd1e27..5798cf02ce5f 100644
--- a/packages/firebase_messaging/android/build.gradle
+++ b/packages/firebase_messaging/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_messaging/android/firebase_messaging.iml b/packages/firebase_messaging/android/firebase_messaging.iml
index 9ef7f775f115..1a79db0c9754 100644
--- a/packages/firebase_messaging/android/firebase_messaging.iml
+++ b/packages/firebase_messaging/android/firebase_messaging.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":firebase_messaging" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../example/android" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":firebase_messaging" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../example/android/app" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -23,23 +23,11 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -47,6 +35,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -61,13 +56,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -75,25 +63,84 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
     </content>
     <content url="file://$MODULE_DIR$/../example/build/firebase_messaging">
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/tmp" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/aapt_friendly_merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/check-manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/library_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/lint_jar" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/packaged_res" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/public_res" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/shader_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/firebase_messaging/outputs" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="flutter" level="project" />
-    <orderEntry type="library" exported="" name="firebase-analytics-10.2.1" level="project" />
-    <orderEntry type="library" exported="" name="firebase-messaging-10.2.4" level="project" />
-    <orderEntry type="library" exported="" name="firebase-iid-10.2.4" level="project" />
-    <orderEntry type="library" exported="" name="firebase-core-10.2.1" level="project" />
-    <orderEntry type="library" exported="" name="firebase-common-10.2.4" level="project" />
-    <orderEntry type="library" exported="" name="firebase-analytics-impl-10.2.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-tasks-10.2.4" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-24.0.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-basement-10.2.4" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-24.0.0" level="project" />
-    <orderEntry type="library" exported="" name="android-android-25" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-measurement-connector-17.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime-2.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/mklim/flutter/bin/cache/artifacts/engine/android-arm/flutter.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.print:print-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks-16.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.customview:customview-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core-2.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-common-16.0.3" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-messaging-17.3.3" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-stats-16.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.media:media-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-16.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base-16.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-2.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-interop-16.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.loader:loader-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime-2.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4-1.0.0-rc01" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-17.0.3" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
index 71e76b1951e3..7cfa219d0019 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
@@ -9,9 +9,9 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApp;
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java
index 8d00597aeb7d..71840b8e3c09 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java
@@ -6,7 +6,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.FirebaseInstanceIdService;
 
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java
index 623ea24cf849..cdea8469a42a 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java
@@ -5,7 +5,7 @@
 package io.flutter.plugins.firebasemessaging;
 
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
diff --git a/packages/firebase_messaging/example/android/app/build.gradle b/packages/firebase_messaging/example/android/app/build.gradle
index 7fb33cf1d015..6946c388d840 100644
--- a/packages/firebase_messaging/example/android/app/build.gradle
+++ b/packages/firebase_messaging/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId 'io.flutter.plugins.firebasemessagingexample'
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/firebase_messaging/example/android/app/gradle.properties b/packages/firebase_messaging/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_messaging/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_messaging/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_messaging/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_messaging/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_messaging/example/android/build.gradle b/packages/firebase_messaging/example/android/build.gradle
index 83f45572c5a3..6ca85f908e0b 100644
--- a/packages/firebase_messaging/example/android/build.gradle
+++ b/packages/firebase_messaging/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_messaging/example/pubspec.yaml b/packages/firebase_messaging/example/pubspec.yaml
index ec5e0f6a8627..42940ecdd010 100644
--- a/packages/firebase_messaging/example/pubspec.yaml
+++ b/packages/firebase_messaging/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_messaging:
     path: ../
-  firebase_core: ^0.2.5
+  firebase_core: ^0.3.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
index c5c96b84e61a..a9cdfb5d5f7c 100644
--- a/packages/firebase_messaging/pubspec.yaml
+++ b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 2.2.0+1
+version: 3.0.0
 
 flutter:
   plugin:
@@ -22,7 +22,7 @@ dev_dependencies:
   mockito: ^3.0.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.2.5
+  firebase_core: ^0.3.0
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
diff --git a/packages/firebase_storage/CHANGELOG.md b/packages/firebase_storage/CHANGELOG.md
index 7feef33df1a2..20aa66481d6e 100644
--- a/packages/firebase_storage/CHANGELOG.md
+++ b/packages/firebase_storage/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 2.0.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
+  This was originally incorrectly pushed in the `1.1.0` update.
+
 ## 1.1.0+1
 
 * **Revert the breaking 1.1.0 update**. 1.1.0 was known to be breaking and
diff --git a/packages/firebase_storage/android/build.gradle b/packages/firebase_storage/android/build.gradle
index c4d5be2af099..c070209cf56d 100755
--- a/packages/firebase_storage/android/build.gradle
+++ b/packages/firebase_storage/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -30,11 +30,11 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java b/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java
index a22b2b578ff8..6cdc58f7fdd9 100755
--- a/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java
+++ b/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java
@@ -5,8 +5,8 @@
 package io.flutter.plugins.firebase.storage;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
 import android.util.SparseArray;
+import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
diff --git a/packages/firebase_storage/example/android/app/build.gradle b/packages/firebase_storage/example/android/app/build.gradle
index 86c9a900ddba..e40ea979a675 100755
--- a/packages/firebase_storage/example/android/app/build.gradle
+++ b/packages/firebase_storage/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId 'io.flutter.plugins.firebasestorageexample'
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,8 +55,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/packages/firebase_storage/example/android/app/gradle.properties b/packages/firebase_storage/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/firebase_storage/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/firebase_storage/example/android/build.gradle b/packages/firebase_storage/example/android/build.gradle
index c9ffd24e9e5f..a144a1922d98 100755
--- a/packages/firebase_storage/example/android/build.gradle
+++ b/packages/firebase_storage/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_storage/example/pubspec.yaml b/packages/firebase_storage/example/pubspec.yaml
index e9b4448efff1..8acbfafef8ac 100755
--- a/packages/firebase_storage/example/pubspec.yaml
+++ b/packages/firebase_storage/example/pubspec.yaml
@@ -7,7 +7,7 @@ dependencies:
     sdk: flutter
   firebase_storage:
     path: ../
-  firebase_core: ^0.2.5
+  firebase_core: ^0.3.0
   uuid: "^1.0.0"
   http: ^0.12.0
 
diff --git a/packages/firebase_storage/pubspec.yaml b/packages/firebase_storage/pubspec.yaml
index c21ee9f29c25..3cb69f00ec92 100755
--- a/packages/firebase_storage/pubspec.yaml
+++ b/packages/firebase_storage/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Storage, a powerful, simple, and
   cost-effective object storage service for Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_storage
-version: 1.1.0+1
+version: 2.0.0
 
 flutter:
   plugin:
@@ -14,7 +14,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_core: ^0.2.5
+  firebase_core: ^0.3.0
 
 dev_dependencies:
   http: ^0.12.0
diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md
index d25c13ee84a5..28b7df523c5b 100644
--- a/packages/google_sign_in/CHANGELOG.md
+++ b/packages/google_sign_in/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 4.0.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
+  This was originally incorrectly pushed in the `3.3.0` update.
+
 ## 3.3.0+1
 
 * **Revert the breaking 3.3.0 update**. 3.3.0 was known to be breaking and
diff --git a/packages/google_sign_in/android/build.gradle b/packages/google_sign_in/android/build.gradle
index 08d1f8e3588e..f51d723219ff 100755
--- a/packages/google_sign_in/android/build.gradle
+++ b/packages/google_sign_in/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/google_sign_in/example/android/app/build.gradle b/packages/google_sign_in/example/android/app/build.gradle
index 0f5f615f762d..5b1c5699d48d 100755
--- a/packages/google_sign_in/example/android/app/build.gradle
+++ b/packages/google_sign_in/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.googlesigninexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
diff --git a/packages/google_sign_in/example/android/app/gradle.properties b/packages/google_sign_in/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/google_sign_in/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/google_sign_in/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/google_sign_in/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/google_sign_in/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/google_sign_in/example/android/build.gradle b/packages/google_sign_in/example/android/build.gradle
index bb8a303898ca..541636cc492a 100755
--- a/packages/google_sign_in/example/android/build.gradle
+++ b/packages/google_sign_in/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml
index 7881a15e4c2a..52a53b865d19 100755
--- a/packages/google_sign_in/pubspec.yaml
+++ b/packages/google_sign_in/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in
-version: 3.3.0+1
+version: 4.0.0
 
 flutter:
   plugin:
diff --git a/packages/url_launcher/CHANGELOG.md b/packages/url_launcher/CHANGELOG.md
index 048c45af8fac..2642d33d8b31 100644
--- a/packages/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.0.0
+
+* **Breaking change**. Migrate from the deprecated original Android Support
+  Library to AndroidX. This shouldn't result in any functional changes, but it
+  requires any Android apps using this plugin to [also
+  migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
+  using the original support library.
+
+  This was originally incorrectly pushed in the `4.2.0` update.
+
 ## 4.2.0+3
 
 * **Revert the breaking 4.2.0 update**. 4.2.0 was known to be breaking and
diff --git a/packages/url_launcher/android/build.gradle b/packages/url_launcher/android/build.gradle
index 1c82a15f1d6f..0d3a58d3f292 100644
--- a/packages/url_launcher/android/build.gradle
+++ b/packages/url_launcher/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    
+    compileSdkVersion 28
+
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/url_launcher/example/android/app/build.gradle b/packages/url_launcher/example/android/app/build.gradle
index 6e480a14c034..325396c57235 100644
--- a/packages/url_launcher/example/android/app/build.gradle
+++ b/packages/url_launcher/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.urllauncherexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,6 +55,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/packages/url_launcher/example/android/app/gradle.properties b/packages/url_launcher/example/android/app/gradle.properties
new file mode 100644
index 000000000000..5465fec0ecad
--- /dev/null
+++ b/packages/url_launcher/example/android/app/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/url_launcher/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/url_launcher/example/android/app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..9a4163a4f5ee
--- /dev/null
+++ b/packages/url_launcher/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/url_launcher/example/android/build.gradle b/packages/url_launcher/example/android/build.gradle
index bb8a303898ca..541636cc492a 100644
--- a/packages/url_launcher/example/android/build.gradle
+++ b/packages/url_launcher/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/url_launcher/pubspec.yaml b/packages/url_launcher/pubspec.yaml
index 494b980d90a1..77892fd9a35e 100644
--- a/packages/url_launcher/pubspec.yaml
+++ b/packages/url_launcher/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher
-version: 4.2.0+3
+version: 5.0.0
 
 flutter:
   plugin:

From 8aa016c166c6ea0a8d84e312a949ab493769a8af Mon Sep 17 00:00:00 2001
From: Ben Konyi <bkonyi@google.com>
Date: Tue, 29 Jan 2019 15:04:12 -0800
Subject: [PATCH 087/410] android_alarm_manager background execution bug fixes
 (#1129)

* android_alarm_manager background execution bug fixes

* Updated android_alarm_manager to fix issues with "background start not
allowed" when attempting to start AlarmService while backgrounded.
  * Switched to using a combination of BroadcastReceiver and
  JobIntentService from using a Service (launching a Service from an
  alarm Intent causes the "Background start not allowed" on Android 8+)

* Alarm events received before the AlarmService isolate is finished
initializing are now queued and processed once the isolate is
initialized.

* Updated CHANGELOG.md and README.md with new setup steps.

* Bumped version to 0.4.0.

Fixes #26846.
---
 packages/android_alarm_manager/CHANGELOG.md   |  23 +++
 packages/android_alarm_manager/README.md      |   4 +
 .../android/build.gradle                      |   4 +
 .../AlarmBroadcastReceiver.java               |  16 ++
 .../androidalarmmanager/AlarmService.java     | 168 +++++++++++-------
 .../AndroidAlarmManagerPlugin.java            |   1 +
 .../android/app/src/main/AndroidManifest.xml  |   4 +
 .../example/pubspec.yaml                      |   2 +-
 packages/android_alarm_manager/pubspec.yaml   |   2 +-
 9 files changed, 157 insertions(+), 67 deletions(-)
 create mode 100644 packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmBroadcastReceiver.java

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index d068373f96a9..bf58bb8d0a4b 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,26 @@
+## 0.4.0
+* **Breaking change**. Migrated the underlying AlarmService to utilize a
+  BroadcastReceiver with a JobIntentService instead of a Service to handle
+  processing of alarms. This requires AndroidManifest.xml to be updated to
+  include the following entries:
+
+  ```xml
+        <service
+            android:name="io.flutter.plugins.androidalarmmanager.AlarmService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="false"/>
+        <receiver
+            android:name="io.flutter.plugins.androidalarmmanager.AlarmBroadcastReceiver"
+            android:exported="false"/>
+  ```
+
+* Fixed issue where background service was not starting due to background
+  execution restrictions on Android 8+ (see [issue
+  #26846](https://github.com/flutter/flutter/issues/26846)).
+* Fixed issue where alarm events were ignored when the background isolate was
+  still initializing. Alarm events are now queued if the background isolate has
+  not completed initializing and are processed once initialization is complete.
+
 ## 0.3.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/android_alarm_manager/README.md b/packages/android_alarm_manager/README.md
index 9797e300ba5d..bcbb007aac8d 100644
--- a/packages/android_alarm_manager/README.md
+++ b/packages/android_alarm_manager/README.md
@@ -13,6 +13,10 @@ After importing this plugin to your project as usual, add the following to your
 ```xml
 <service
     android:name="io.flutter.plugins.androidalarmmanager.AlarmService"
+    android:permission="android.permission.BIND_JOB_SERVICE"
+    android:exported="false"/>
+<receiver
+    android:name="io.flutter.plugins.androidalarmmanager.AlarmBroadcastReceiver"
     android:exported="false"/>
 ```
 
diff --git a/packages/android_alarm_manager/android/build.gradle b/packages/android_alarm_manager/android/build.gradle
index 173875c58e40..b29e92fb3156 100644
--- a/packages/android_alarm_manager/android/build.gradle
+++ b/packages/android_alarm_manager/android/build.gradle
@@ -32,3 +32,7 @@ android {
         disable 'InvalidPackage'
     }
 }
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+}
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmBroadcastReceiver.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmBroadcastReceiver.java
new file mode 100644
index 000000000000..4916e5340dfc
--- /dev/null
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmBroadcastReceiver.java
@@ -0,0 +1,16 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.androidalarmmanager;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class AlarmBroadcastReceiver extends BroadcastReceiver {
+  @Override
+  public void onReceive(Context context, Intent intent) {
+    AlarmService.enqueueAlarmProcessing(context, intent);
+  }
+}
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
index 505ec84bae10..85637cf2e4dd 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
@@ -6,30 +6,69 @@
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
-import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.os.IBinder;
+import android.content.SharedPreferences;
 import android.util.Log;
+import androidx.core.app.JobIntentService;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
 import io.flutter.view.FlutterCallbackInformation;
 import io.flutter.view.FlutterMain;
 import io.flutter.view.FlutterNativeView;
 import io.flutter.view.FlutterRunArguments;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class AlarmService extends Service {
+public class AlarmService extends JobIntentService {
   public static final String TAG = "AlarmService";
+  private static final String SHARED_PREFERENCES_KEY = "io.flutter.android_alarm_manager_plugin";
+  private static final String CALLBACK_HANDLE_KEY = "callback_handle";
+  private static final int JOB_ID = 1984; // Random job ID.
   private static AtomicBoolean sStarted = new AtomicBoolean(false);
+  private static List<Intent> sAlarmQueue = Collections.synchronizedList(new LinkedList<Intent>());
   private static FlutterNativeView sBackgroundFlutterView;
   private static MethodChannel sBackgroundChannel;
   private static PluginRegistrantCallback sPluginRegistrantCallback;
 
   private String mAppBundlePath;
 
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    Context context = getApplicationContext();
+    FlutterMain.ensureInitializationComplete(context, null);
+    mAppBundlePath = FlutterMain.findAppBundlePath(context);
+    if (!sStarted.get()) {
+      SharedPreferences p = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
+      long callbackHandle = p.getLong(CALLBACK_HANDLE_KEY, 0);
+      startAlarmService(context, callbackHandle);
+    }
+  }
+
+  // Schedule the alarm to be handled by the AlarmService.
+  public static void enqueueAlarmProcessing(Context context, Intent alarmContext) {
+    enqueueWork(context, AlarmService.class, JOB_ID, alarmContext);
+  }
+
+  // Called once the Dart isolate (sBackgroundFlutterView) has finished
+  // initializing. Processes all alarm events that came in while the isolate
+  // was starting.
   public static void onInitialized() {
+    Log.i(TAG, "AlarmService started!");
     sStarted.set(true);
+    synchronized (sAlarmQueue) {
+      // Handle all the alarm events received before the Dart isolate was fully
+      // initialized and clear the queue.
+      Iterator<Intent> i = sAlarmQueue.iterator();
+      while (i.hasNext()) {
+        invokeCallbackDispatcher(i.next());
+      }
+      sAlarmQueue.clear();
+    }
   }
 
   // Here we start the AlarmService. This method does a few things:
@@ -70,47 +109,9 @@ public static void setBackgroundChannel(MethodChannel channel) {
     sBackgroundChannel = channel;
   }
 
-  public static void setOneShot(
-      Context context,
-      int requestCode,
-      boolean exact,
-      boolean wakeup,
-      long startMillis,
-      long callbackHandle) {
-    final boolean repeating = false;
-    scheduleAlarm(context, requestCode, repeating, exact, wakeup, startMillis, 0, callbackHandle);
-  }
-
-  public static void setPeriodic(
-      Context context,
-      int requestCode,
-      boolean exact,
-      boolean wakeup,
-      long startMillis,
-      long intervalMillis,
-      long callbackHandle) {
-    final boolean repeating = true;
-    scheduleAlarm(
-        context,
-        requestCode,
-        repeating,
-        exact,
-        wakeup,
-        startMillis,
-        intervalMillis,
-        callbackHandle);
-  }
-
-  public static void cancel(Context context, int requestCode) {
-    Intent alarm = new Intent(context, AlarmService.class);
-    PendingIntent existingIntent =
-        PendingIntent.getService(context, requestCode, alarm, PendingIntent.FLAG_NO_CREATE);
-    if (existingIntent == null) {
-      Log.i(TAG, "cancel: service not found");
-      return;
-    }
-    AlarmManager manager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-    manager.cancel(existingIntent);
+  public static void setCallbackDispatcher(Context context, long callbackHandle) {
+    SharedPreferences p = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
+    p.edit().putLong(CALLBACK_HANDLE_KEY, callbackHandle).apply();
   }
 
   public static boolean setBackgroundFlutterView(FlutterNativeView view) {
@@ -127,22 +128,22 @@ public static void setPluginRegistrant(PluginRegistrantCallback callback) {
   }
 
   @Override
-  public void onCreate() {
-    super.onCreate();
-    Context context = getApplicationContext();
-    FlutterMain.ensureInitializationComplete(context, null);
-    mAppBundlePath = FlutterMain.findAppBundlePath(context);
+  protected void onHandleWork(Intent intent) {
+    // If we're in the middle of processing queued alarms, block until they're
+    // done before processing new alarms.
+    synchronized (sAlarmQueue) {
+      if (!sStarted.get()) {
+        Log.i(TAG, "AlarmService has not yet started.");
+        sAlarmQueue.add(intent);
+        return;
+      }
+    }
+    invokeCallbackDispatcher(intent);
   }
 
   // This is where we handle alarm events before sending them to our callback
   // dispatcher in Dart.
-  @Override
-  public int onStartCommand(Intent intent, int flags, int startId) {
-    if (!sStarted.get()) {
-      Log.i(TAG, "AlarmService has not yet started.");
-      // TODO(bkonyi): queue up alarm events.
-      return START_NOT_STICKY;
-    }
+  private static void invokeCallbackDispatcher(Intent intent) {
     // Grab the handle for the callback associated with this alarm. Pay close
     // attention to the type of the callback handle as storing this value in a
     // variable of the wrong size will cause the callback lookup to fail.
@@ -151,18 +152,12 @@ public int onStartCommand(Intent intent, int flags, int startId) {
       Log.e(
           TAG,
           "setBackgroundChannel was not called before alarms were scheduled." + " Bailing out.");
-      return START_NOT_STICKY;
+      return;
     }
     // Handle the alarm event in Dart. Note that for this plugin, we don't
     // care about the method name as we simply lookup and invoke the callback
     // provided.
     sBackgroundChannel.invokeMethod("", new Object[] {callbackHandle});
-    return START_NOT_STICKY;
-  }
-
-  @Override
-  public IBinder onBind(Intent intent) {
-    return null;
   }
 
   private static void scheduleAlarm(
@@ -175,10 +170,10 @@ private static void scheduleAlarm(
       long intervalMillis,
       long callbackHandle) {
     // Create an Intent for the alarm and set the desired Dart callback handle.
-    Intent alarm = new Intent(context, AlarmService.class);
+    Intent alarm = new Intent(context, AlarmBroadcastReceiver.class);
     alarm.putExtra("callbackHandle", callbackHandle);
     PendingIntent pendingIntent =
-        PendingIntent.getService(context, requestCode, alarm, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent.getBroadcast(context, requestCode, alarm, PendingIntent.FLAG_UPDATE_CURRENT);
 
     // Use the appropriate clock.
     int clock = AlarmManager.RTC;
@@ -202,4 +197,47 @@ private static void scheduleAlarm(
       }
     }
   }
+
+  public static void setOneShot(
+      Context context,
+      int requestCode,
+      boolean exact,
+      boolean wakeup,
+      long startMillis,
+      long callbackHandle) {
+    final boolean repeating = false;
+    scheduleAlarm(context, requestCode, repeating, exact, wakeup, startMillis, 0, callbackHandle);
+  }
+
+  public static void setPeriodic(
+      Context context,
+      int requestCode,
+      boolean exact,
+      boolean wakeup,
+      long startMillis,
+      long intervalMillis,
+      long callbackHandle) {
+    final boolean repeating = true;
+    scheduleAlarm(
+        context,
+        requestCode,
+        repeating,
+        exact,
+        wakeup,
+        startMillis,
+        intervalMillis,
+        callbackHandle);
+  }
+
+  public static void cancel(Context context, int requestCode) {
+    Intent alarm = new Intent(context, AlarmBroadcastReceiver.class);
+    PendingIntent existingIntent =
+        PendingIntent.getBroadcast(context, requestCode, alarm, PendingIntent.FLAG_NO_CREATE);
+    if (existingIntent == null) {
+      Log.i(TAG, "cancel: broadcast receiver not found");
+      return;
+    }
+    AlarmManager manager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+    manager.cancel(existingIntent);
+  }
 }
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
index 6b5c394053a6..b0060c146950 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
@@ -72,6 +72,7 @@ public void onMethodCall(MethodCall call, Result result) {
 
   private void startService(JSONArray arguments) throws JSONException {
     long callbackHandle = arguments.getLong(0);
+    AlarmService.setCallbackDispatcher(mContext, callbackHandle);
     AlarmService.startAlarmService(mContext, callbackHandle);
   }
 
diff --git a/packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml b/packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml
index 5491bf24a42e..e1724dac19ad 100644
--- a/packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml
@@ -24,6 +24,10 @@
         </activity>
         <service
             android:name="io.flutter.plugins.androidalarmmanager.AlarmService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="false"/>
+        <receiver
+            android:name="io.flutter.plugins.androidalarmmanager.AlarmBroadcastReceiver"
             android:exported="false"/>
     </application>
 </manifest>
diff --git a/packages/android_alarm_manager/example/pubspec.yaml b/packages/android_alarm_manager/example/pubspec.yaml
index 6a5628493d51..692964f259d1 100644
--- a/packages/android_alarm_manager/example/pubspec.yaml
+++ b/packages/android_alarm_manager/example/pubspec.yaml
@@ -7,7 +7,7 @@ dependencies:
   android_alarm_manager:
     path: ../
   firebase_auth: "^0.8.0+1"
-  google_sign_in: ^3.3.0
+  google_sign_in: "^4.0.0"
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index 39a7b41e04f1..b12ab8c69563 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -1,7 +1,7 @@
 name: android_alarm_manager
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.3.0
+version: 0.4.0
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 

From d02df2f799059cc21ce9a50515d14b5fb5afaf83 Mon Sep 17 00:00:00 2001
From: KyleWong <kangwang1988@users.noreply.github.com>
Date: Thu, 31 Jan 2019 00:17:23 +0800
Subject: [PATCH 088/410] Use string to save double for
 shared_preference(Android). (#1132)

---
 packages/shared_preferences/CHANGELOG.md                 | 4 ++++
 .../sharedpreferences/SharedPreferencesPlugin.java       | 9 +++++++--
 packages/shared_preferences/pubspec.yaml                 | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/shared_preferences/CHANGELOG.md b/packages/shared_preferences/CHANGELOG.md
index 0e11805b244b..b0b8ec8948d1 100644
--- a/packages/shared_preferences/CHANGELOG.md
+++ b/packages/shared_preferences/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.1
+
+* Use String to save double in Android.
+
 ## 0.5.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java b/packages/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java
index fe457c3190bc..49d7979c246f 100644
--- a/packages/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java
+++ b/packages/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java
@@ -32,6 +32,7 @@ public class SharedPreferencesPlugin implements MethodCallHandler {
   // Fun fact: The following is a base64 encoding of the string "This is the prefix for a list."
   private static final String LIST_IDENTIFIER = "VGhpcyBpcyB0aGUgcHJlZml4IGZvciBhIGxpc3Qu";
   private static final String BIG_INTEGER_PREFIX = "VGhpcyBpcyB0aGUgcHJlZml4IGZvciBCaWdJbnRlZ2Vy";
+  private static final String DOUBLE_PREFIX = "VGhpcyBpcyB0aGUgcHJlZml4IGZvciBEb3VibGUu";
 
   private final android.content.SharedPreferences preferences;
 
@@ -88,6 +89,9 @@ private Map<String, Object> getAllPrefs() throws IOException {
           } else if (stringValue.startsWith(BIG_INTEGER_PREFIX)) {
             String encoded = stringValue.substring(BIG_INTEGER_PREFIX.length());
             value = new BigInteger(encoded, Character.MAX_RADIX);
+          } else if (stringValue.startsWith(DOUBLE_PREFIX)) {
+            String doubleStr = stringValue.substring(DOUBLE_PREFIX.length());
+            value = Double.valueOf(doubleStr);
           }
         } else if (value instanceof Set) {
           // This only happens for previous usage of setStringSet. The app expects a list.
@@ -122,8 +126,9 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
           status = preferences.edit().putBoolean(key, (boolean) call.argument("value")).commit();
           break;
         case "setDouble":
-          float floatValue = ((Number) call.argument("value")).floatValue();
-          status = preferences.edit().putFloat(key, floatValue).commit();
+          double doubleValue = ((Number) call.argument("value")).doubleValue();
+          String doubleValueStr = Double.toString(doubleValue);
+          status = preferences.edit().putString(key, DOUBLE_PREFIX + doubleValueStr).commit();
           break;
         case "setInt":
           Number number = call.argument("value");
diff --git a/packages/shared_preferences/pubspec.yaml b/packages/shared_preferences/pubspec.yaml
index 8794ec6c2827..4e9805cfdf35 100644
--- a/packages/shared_preferences/pubspec.yaml
+++ b/packages/shared_preferences/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for reading and writing simple key-value pairs.
   Wraps NSUserDefaults on iOS and SharedPreferences on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences
-version: 0.5.0
+version: 0.5.1
 
 flutter:
   plugin:

From 06fd96e0b4d0eeba04796e510750fb474715946c Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Wed, 30 Jan 2019 10:03:52 -0800
Subject: [PATCH 089/410] Updated connectivity to singleton (#1134)

Fix for flutter/flutter#21709

Creating a second instance of the Connectivity object can cause the second instance overriding the first instance's stream channel. We can force the class to be a singleton because this class is designed to work as a singleton.
---
 packages/connectivity/CHANGELOG.md          |  4 ++++
 packages/connectivity/lib/connectivity.dart | 17 +++++++++++++++++
 packages/connectivity/pubspec.yaml          |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md
index b74aee57df70..80bde632186f 100644
--- a/packages/connectivity/CHANGELOG.md
+++ b/packages/connectivity/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0+1
+
+* Updated `Connectivity` to a singleton.
+
 ## 0.4.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/connectivity/lib/connectivity.dart b/packages/connectivity/lib/connectivity.dart
index 9c25bb75c8da..00df102b7ef1 100644
--- a/packages/connectivity/lib/connectivity.dart
+++ b/packages/connectivity/lib/connectivity.dart
@@ -20,6 +20,23 @@ const EventChannel _eventChannel =
     EventChannel('plugins.flutter.io/connectivity_status');
 
 class Connectivity {
+  /// Constructs a singleton instance of [Connectivity].
+  ///
+  /// [Connectivity] is designed to work as a singleton.
+  // When a second instance is created, the first instance will not be able to listen to the
+  // EventChannel because it is overridden. Forcing the class to be a singleton class can prevent
+  // misusage of creating a second instance from a programmer.
+  factory Connectivity() {
+    if (_singleton == null) {
+      _singleton = Connectivity._();
+    }
+    return _singleton;
+  }
+
+  Connectivity._();
+
+  static Connectivity _singleton;
+
   Stream<ConnectivityResult> _onConnectivityChanged;
 
   /// Fires whenever the connectivity state changes.
diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml
index 1711b24d052a..49084bc65747 100644
--- a/packages/connectivity/pubspec.yaml
+++ b/packages/connectivity/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi &
   mobile/cellular) connectivity on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
-version: 0.4.0
+version: 0.4.0+1
 
 flutter:
   plugin:

From 009cd4a60a18ed534f0c5aaeb4f6952485a4b209 Mon Sep 17 00:00:00 2001
From: KyleWong <kangwang1988@users.noreply.github.com>
Date: Thu, 31 Jan 2019 04:23:35 +0800
Subject: [PATCH 090/410] Fix broken documentation link to
 AndroidBuildVersionCodes (#1092)

---
 packages/device_info/lib/device_info.dart | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/device_info/lib/device_info.dart b/packages/device_info/lib/device_info.dart
index 7a56459abcb7..038de10e2268 100644
--- a/packages/device_info/lib/device_info.dart
+++ b/packages/device_info/lib/device_info.dart
@@ -193,7 +193,9 @@ class AndroidBuildVersion {
   /// The user-visible version string.
   final String release;
 
-  /// The user-visible SDK version of the framework; its possible values are defined in [AndroidBuildVersionCodes].
+  /// The user-visible SDK version of the framework.
+  ///
+  /// Possible values are defined in: https://developer.android.com/reference/android/os/Build.VERSION_CODES.html
   final int sdkInt;
 
   /// The user-visible security patch level.

From 0e14196bd24b7e4d8ae8e1f18c773972c934f382 Mon Sep 17 00:00:00 2001
From: "Edman P. Anjos" <edmanjos@gmail.com>
Date: Wed, 30 Jan 2019 22:05:16 +0100
Subject: [PATCH 091/410] A few additional Androix dependencies (#1120)

---
 packages/cloud_firestore/android/build.gradle        | 1 +
 packages/cloud_functions/android/build.gradle        | 1 +
 packages/firebase_dynamic_links/android/build.gradle | 1 +
 packages/firebase_messaging/android/build.gradle     | 2 ++
 packages/firebase_ml_vision/android/build.gradle     | 1 +
 packages/firebase_remote_config/android/build.gradle | 1 +
 packages/firebase_storage/android/build.gradle       | 1 +
 7 files changed, 8 insertions(+)

diff --git a/packages/cloud_firestore/android/build.gradle b/packages/cloud_firestore/android/build.gradle
index 90e8bd678640..bd8c9cba5d2c 100755
--- a/packages/cloud_firestore/android/build.gradle
+++ b/packages/cloud_firestore/android/build.gradle
@@ -35,5 +35,6 @@ android {
     }
     dependencies {
         api 'com.google.firebase:firebase-firestore:17.1.1'
+        implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/cloud_functions/android/build.gradle b/packages/cloud_functions/android/build.gradle
index e0c46f39f417..deb98ba76478 100644
--- a/packages/cloud_functions/android/build.gradle
+++ b/packages/cloud_functions/android/build.gradle
@@ -33,5 +33,6 @@ android {
     }
     dependencies {
         api 'com.google.firebase:firebase-functions:16.1.1'
+        implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/android/build.gradle
index a313a737c6bb..47c937902024 100644
--- a/packages/firebase_dynamic_links/android/build.gradle
+++ b/packages/firebase_dynamic_links/android/build.gradle
@@ -33,5 +33,6 @@ android {
     }
     dependencies {
         api 'com.google.firebase:firebase-dynamic-links:16.1.2'
+        implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/firebase_messaging/android/build.gradle b/packages/firebase_messaging/android/build.gradle
index 5798cf02ce5f..6fe6bcac24d0 100644
--- a/packages/firebase_messaging/android/build.gradle
+++ b/packages/firebase_messaging/android/build.gradle
@@ -33,5 +33,7 @@ android {
     }
     dependencies {
         api 'com.google.firebase:firebase-messaging:17.3.3'
+        implementation 'androidx.annotation:annotation:1.0.0'
+        implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     }
 }
diff --git a/packages/firebase_ml_vision/android/build.gradle b/packages/firebase_ml_vision/android/build.gradle
index d44f30900cf1..ce0be9652cb5 100644
--- a/packages/firebase_ml_vision/android/build.gradle
+++ b/packages/firebase_ml_vision/android/build.gradle
@@ -35,5 +35,6 @@ android {
         api 'com.android.support:support-v4:27.1.1'
         api 'com.google.firebase:firebase-ml-vision:17.0.1'
         api 'com.google.firebase:firebase-ml-vision-image-label-model:16.2.0'
+        implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/firebase_remote_config/android/build.gradle b/packages/firebase_remote_config/android/build.gradle
index 7b1ad93dcdd3..2b48c7b41b4c 100644
--- a/packages/firebase_remote_config/android/build.gradle
+++ b/packages/firebase_remote_config/android/build.gradle
@@ -33,5 +33,6 @@ android {
     }
     dependencies {
         api 'com.google.firebase:firebase-config:16.0.1'
+        implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/firebase_storage/android/build.gradle b/packages/firebase_storage/android/build.gradle
index c070209cf56d..1defb76f1d89 100755
--- a/packages/firebase_storage/android/build.gradle
+++ b/packages/firebase_storage/android/build.gradle
@@ -41,5 +41,6 @@ android {
     }
     dependencies {
         api 'com.google.firebase:firebase-storage:16.0.3'
+        implementation 'androidx.annotation:annotation:1.0.0'
     }
 }

From edc81910c5e9465335c3b171bb7e26fd3d6ccb9b Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Wed, 30 Jan 2019 14:36:51 -0800
Subject: [PATCH 092/410] Remove base detector class and change detection
 method name (#842)

---
 packages/firebase_ml_vision/CHANGELOG.md      |  9 ++++-
 packages/firebase_ml_vision/README.md         |  6 ++--
 .../FirebaseMlVisionPlugin.java               |  2 +-
 .../firebase_ml_vision/example/lib/main.dart  | 23 ++++++++-----
 .../ios/Classes/FirebaseMlVisionPlugin.m      |  2 +-
 .../lib/src/barcode_detector.dart             | 16 +++++----
 .../lib/src/face_detector.dart                | 18 ++++++----
 .../lib/src/firebase_vision.dart              |  6 ----
 .../lib/src/label_detector.dart               | 34 +++++++++++--------
 .../lib/src/text_recognizer.dart              | 22 +++++-------
 packages/firebase_ml_vision/pubspec.yaml      |  5 ++-
 .../test/firebase_ml_vision_test.dart         | 16 ++++-----
 12 files changed, 87 insertions(+), 72 deletions(-)

diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 0831c31658e4..2bf3227ff497 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,5 +1,12 @@
+## 0.4.0
+
+* **Breaking Change** Removal of base detector class `FirebaseVisionDetector`.
+* **Breaking Change** Removal of `TextRecognizer.detectInImage()`. Pleas use `TextRecognizer.processImage()`.
+* **Breaking Change** Changed `FaceDetector.detectInImage()` to `FaceDetector.processImage()`.
+
 ## 0.3.0
-* **Breaking change**. Migrate from the deprecated original Android Support
+
+* **Breaking Change** Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
   migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
diff --git a/packages/firebase_ml_vision/README.md b/packages/firebase_ml_vision/README.md
index fb4de076d547..95d38bc9738b 100644
--- a/packages/firebase_ml_vision/README.md
+++ b/packages/firebase_ml_vision/README.md
@@ -1,8 +1,8 @@
-# ML Kit for Firebase
+# ML Kit Vision for Firebase
 
 [![pub package](https://img.shields.io/pub/v/firebase_ml_vision.svg)](https://pub.dartlang.org/packages/firebase_ml_vision)
 
-A Flutter plugin to use the [ML Kit for Firebase API](https://firebase.google.com/docs/ml-kit/).
+A Flutter plugin to use the [ML Kit Vision for Firebase API](https://firebase.google.com/docs/ml-kit/).
 
 For Flutter plugins for other Firebase products, see [FlutterFire.md](https://github.com/flutter/plugins/blob/master/FlutterFire.md).
 
@@ -153,4 +153,4 @@ for (TextBlock block in visionText.blocks) {
 
 ## Getting Started
 
-See the `example` directory for a complete sample app using ML Kit for Firebase.
+See the `example` directory for a complete sample app using ML Kit Vision for Firebase.
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
index 3ca61ee4890a..65594a845c90 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
@@ -44,7 +44,7 @@ public void onMethodCall(MethodCall call, Result result) {
       case "BarcodeDetector#detectInImage":
         BarcodeDetector.instance.handleDetection(image, options, result);
         break;
-      case "FaceDetector#detectInImage":
+      case "FaceDetector#processImage":
         FaceDetector.instance.handleDetection(image, options, result);
         break;
       case "LabelDetector#detectInImage":
diff --git a/packages/firebase_ml_vision/example/lib/main.dart b/packages/firebase_ml_vision/example/lib/main.dart
index 224154bed00a..f52e06ed35c0 100644
--- a/packages/firebase_ml_vision/example/lib/main.dart
+++ b/packages/firebase_ml_vision/example/lib/main.dart
@@ -70,30 +70,35 @@ class _MyHomePageState extends State<_MyHomePage> {
     final FirebaseVisionImage visionImage =
         FirebaseVisionImage.fromFile(imageFile);
 
-    FirebaseVisionDetector detector;
+    dynamic results;
     switch (_currentDetector) {
       case Detector.barcode:
-        detector = FirebaseVision.instance.barcodeDetector();
+        final BarcodeDetector detector =
+            FirebaseVision.instance.barcodeDetector();
+        results = await detector.detectInImage(visionImage);
         break;
       case Detector.face:
-        detector = FirebaseVision.instance.faceDetector();
+        final FaceDetector detector = FirebaseVision.instance.faceDetector();
+        results = await detector.processImage(visionImage);
         break;
       case Detector.label:
-        detector = FirebaseVision.instance.labelDetector();
+        final LabelDetector detector = FirebaseVision.instance.labelDetector();
+        results = await detector.detectInImage(visionImage);
         break;
       case Detector.cloudLabel:
-        detector = FirebaseVision.instance.cloudLabelDetector();
+        final CloudLabelDetector detector =
+            FirebaseVision.instance.cloudLabelDetector();
+        results = await detector.detectInImage(visionImage);
         break;
       case Detector.text:
-        detector = FirebaseVision.instance.textRecognizer();
+        final TextRecognizer recognizer =
+            FirebaseVision.instance.textRecognizer();
+        results = await recognizer.processImage(visionImage);
         break;
       default:
         return;
     }
 
-    final dynamic results =
-        await detector.detectInImage(visionImage) ?? <dynamic>[];
-
     setState(() {
       _scanResults = results;
     });
diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index 567d2b0b1d70..dddb405980c4 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -40,7 +40,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
   NSDictionary *options = call.arguments[@"options"];
   if ([@"BarcodeDetector#detectInImage" isEqualToString:call.method]) {
     [BarcodeDetector handleDetection:image options:options result:result];
-  } else if ([@"FaceDetector#detectInImage" isEqualToString:call.method]) {
+  } else if ([@"FaceDetector#processImage" isEqualToString:call.method]) {
     [FaceDetector handleDetection:image options:options result:result];
   } else if ([@"LabelDetector#detectInImage" isEqualToString:call.method]) {
     [LabelDetector handleDetection:image options:options result:result];
diff --git a/packages/firebase_ml_vision/lib/src/barcode_detector.dart b/packages/firebase_ml_vision/lib/src/barcode_detector.dart
index 093628a1eca1..7224e738b473 100644
--- a/packages/firebase_ml_vision/lib/src/barcode_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/barcode_detector.dart
@@ -170,21 +170,25 @@ class BarcodeFormat {
 
 /// Detector for performing barcode scanning on an input image.
 ///
-/// A barcode detector is created via barcodeDetector() in [FirebaseVision]:
+/// A barcode detector is created via
+/// `barcodeDetector([BarcodeDetectorOptions options])` in [FirebaseVision]:
 ///
 /// ```dart
-/// BarcodeDetector barcodeDetector = FirebaseVision.instance.barcodeDetector();
+/// final FirebaseVisionImage image =
+///     FirebaseVisionImage.fromFilePath('path/to/file');
+///
+/// final BarcodeDetector barcodeDetector =
+///     FirebaseVision.instance.barcodeDetector();
+///
+/// final List<Barcode> barcodes = await barcodeDetector.detectInImage(image);
 /// ```
-class BarcodeDetector extends FirebaseVisionDetector {
+class BarcodeDetector {
   BarcodeDetector._(this.options) : assert(options != null);
 
   /// The options for configuring this detector.
   final BarcodeDetectorOptions options;
 
   /// Detects barcodes in the input image.
-  ///
-  /// The barcode scanning is performed asynchronously.
-  @override
   Future<List<Barcode>> detectInImage(FirebaseVisionImage visionImage) async {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
diff --git a/packages/firebase_ml_vision/lib/src/face_detector.dart b/packages/firebase_ml_vision/lib/src/face_detector.dart
index a25785bb5d54..b08b1e4497e4 100644
--- a/packages/firebase_ml_vision/lib/src/face_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/face_detector.dart
@@ -26,26 +26,30 @@ enum FaceLandmarkType {
 
 /// Detector for detecting faces in an input image.
 ///
-/// A face detector is created via faceDetector(FaceDetectorOptions options)
-/// in [FirebaseVision]:
+/// A face detector is created via
+/// `faceDetector([FaceDetectorOptions options])` in [FirebaseVision]:
 ///
 /// ```dart
-/// FaceDetector faceDetector = FirebaseVision.instance.faceDetector(options);
+/// final FirebaseVisionImage image =
+///     FirebaseVisionImage.fromFilePath('path/to/file');
+///
+/// final FaceDetector faceDetector = FirebaseVision.instance.faceDetector();
+///
+/// final List<Faces> faces = await faceDetector.processImage(image);
 /// ```
-class FaceDetector extends FirebaseVisionDetector {
+class FaceDetector {
   FaceDetector._(this.options) : assert(options != null);
 
   /// The options for the face detector.
   final FaceDetectorOptions options;
 
   /// Detects faces in the input image.
-  @override
-  Future<List<Face>> detectInImage(FirebaseVisionImage visionImage) async {
+  Future<List<Face>> processImage(FirebaseVisionImage visionImage) async {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
-      'FaceDetector#detectInImage',
+      'FaceDetector#processImage',
       <String, dynamic>{
         'options': <String, dynamic>{
           'enableClassification': options.enableClassification,
diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 9525db5f4a3a..834472afa37a 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -229,12 +229,6 @@ class FirebaseVisionImageMetadata {
       };
 }
 
-/// Abstract class for detectors in [FirebaseVision] API.
-abstract class FirebaseVisionDetector {
-  /// Uses machine learning model to detect objects of interest in an image.
-  Future<dynamic> detectInImage(FirebaseVisionImage visionImage);
-}
-
 String _enumToString(dynamic enumValue) {
   final String enumString = enumValue.toString();
   return enumString.substring(enumString.indexOf('.') + 1);
diff --git a/packages/firebase_ml_vision/lib/src/label_detector.dart b/packages/firebase_ml_vision/lib/src/label_detector.dart
index 3a28fd11616f..a37060a9b626 100644
--- a/packages/firebase_ml_vision/lib/src/label_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/label_detector.dart
@@ -12,13 +12,19 @@ part of firebase_ml_vision;
 /// this information, you can perform tasks such as automatic metadata
 /// generation and content moderation.
 ///
-/// A label detector is created via labelDetector(LabelDetectorOptions options)
-/// in [FirebaseVision]:
+/// A label detector is created via
+/// `labelDetector([LabelDetectorOptions options])` in [FirebaseVision]:
 ///
 /// ```dart
-/// LabelDetector labelDetector = FirebaseVision.instance.labelDetector(options);
+/// final FirebaseVisionImage image =
+///     FirebaseVisionImage.fromFilePath('path/to/file');
+///
+/// final LabelDetector labelDetector =
+///     FirebaseVision.instance.labelDetector(options);
+///
+/// final List<Label> labels = await labelDetector.detectInImage(image);
 /// ```
-class LabelDetector extends FirebaseVisionDetector {
+class LabelDetector {
   LabelDetector._(this.options) : assert(options != null);
 
   /// The options for the detector.
@@ -27,9 +33,6 @@ class LabelDetector extends FirebaseVisionDetector {
   final LabelDetectorOptions options;
 
   /// Detects entities in the input image.
-  ///
-  /// Performed asynchronously.
-  @override
   Future<List<Label>> detectInImage(FirebaseVisionImage visionImage) async {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
@@ -62,22 +65,25 @@ class LabelDetector extends FirebaseVisionDetector {
 /// this information, you can perform tasks such as automatic metadata
 /// generation and content moderation.
 ///
-/// A cloud label detector is created via cloudLabelDetector(CloudDetectorOptions options)
-/// in [FirebaseVision]:
+/// A cloud label detector is created via
+/// `cloudLabelDetector([CloudDetectorOptions options])` in [FirebaseVision]:
 ///
 /// ```dart
-/// CloudLabelDetector cloudLabelDetector = FirebaseVision.instance.cloudLabelDetector(options);
+/// final FirebaseVisionImage image =
+///     FirebaseVisionImage.fromFilePath('path/to/file');
+///
+/// final CloudLabelDetector cloudLabelDetector =
+///     FirebaseVision.instance.cloudLabelDetector();
+///
+/// final List<Label> labels = await cloudLabelDetector.detectInImage(image);
 /// ```
-class CloudLabelDetector extends FirebaseVisionDetector {
+class CloudLabelDetector {
   CloudLabelDetector._(this.options) : assert(options != null);
 
   /// Options used to configure this cloud detector.
   final CloudDetectorOptions options;
 
   /// Detects entities in the input image.
-  ///
-  /// Performed asynchronously.
-  @override
   Future<List<Label>> detectInImage(FirebaseVisionImage visionImage) async {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
diff --git a/packages/firebase_ml_vision/lib/src/text_recognizer.dart b/packages/firebase_ml_vision/lib/src/text_recognizer.dart
index de8bf1c97c2d..1cfa9a6ced0c 100644
--- a/packages/firebase_ml_vision/lib/src/text_recognizer.dart
+++ b/packages/firebase_ml_vision/lib/src/text_recognizer.dart
@@ -9,14 +9,19 @@ part of firebase_ml_vision;
 /// A text recognizer is created via `textRecognizer()` in [FirebaseVision]:
 ///
 /// ```dart
-/// TextRecognizer textRecognizer = FirebaseVision.instance.textRecognizer();
+/// final FirebaseVisionImage image =
+///     FirebaseVisionImage.fromFilePath('path/to/file');
+///
+/// final TextRecognizer textRecognizer =
+///     FirebaseVision.instance.textRecognizer();
+///
+/// final List<VisionText> recognizedText =
+///     await textRecognizer.processImage(image);
 /// ```
-class TextRecognizer implements FirebaseVisionDetector {
+class TextRecognizer {
   TextRecognizer._();
 
   /// Detects [VisionText] from a [FirebaseVisionImage].
-  ///
-  /// The OCR is performed asynchronously.
   Future<VisionText> processImage(FirebaseVisionImage visionImage) async {
     final Map<dynamic, dynamic> reply =
         // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
@@ -31,15 +36,6 @@ class TextRecognizer implements FirebaseVisionDetector {
 
     return VisionText._(reply);
   }
-
-  /// Detects [VisionText] from a [FirebaseVisionImage].
-  ///
-  /// The OCR is performed asynchronously.
-  @Deprecated('Please use `processImage`')
-  @override
-  Future<VisionText> detectInImage(FirebaseVisionImage visionImage) async {
-    return processImage(visionImage);
-  }
 }
 
 /// Recognized text in an image.
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index fbfdb78cf652..80cbef6c6ecd 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -1,9 +1,8 @@
 name: firebase_ml_vision
-description: Flutter plugin for Google ML Vision for Firebase, an SDK that brings Google's machine
-  learning expertise to Android and iOS apps in a powerful yet easy-to-use package.
+description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.3.0
+version: 0.4.0
 
 dependencies:
   flutter:
diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index 8136c5839ec8..8a9411cde6ee 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -23,7 +23,7 @@ void main() {
         switch (methodCall.method) {
           case 'BarcodeDetector#detectInImage':
             return returnValue;
-          case 'FaceDetector#detectInImage':
+          case 'FaceDetector#processImage':
             return returnValue;
           case 'LabelDetector#detectInImage':
             return returnValue;
@@ -528,7 +528,7 @@ void main() {
         ];
       });
 
-      test('detectInImage', () async {
+      test('processImage', () async {
         returnValue = testFaces;
 
         final FaceDetector detector = FirebaseVision.instance.faceDetector(
@@ -545,11 +545,11 @@ void main() {
           'empty',
         );
 
-        final List<Face> faces = await detector.detectInImage(image);
+        final List<Face> faces = await detector.processImage(image);
 
         expect(log, <Matcher>[
           isMethodCall(
-            'FaceDetector#detectInImage',
+            'FaceDetector#processImage',
             arguments: <String, dynamic>{
               'type': 'file',
               'path': 'empty',
@@ -595,7 +595,7 @@ void main() {
         expect(p(FaceLandmarkType.rightMouth), const Point<double>(18.1, 19.1));
       });
 
-      test('detectInImage with null landmark', () async {
+      test('processImage with null landmark', () async {
         testFaces[0]['landmarks']['bottomMouth'] = null;
         returnValue = testFaces;
 
@@ -606,12 +606,12 @@ void main() {
           'empty',
         );
 
-        final List<Face> faces = await detector.detectInImage(image);
+        final List<Face> faces = await detector.processImage(image);
 
         expect(faces[0].getLandmark(FaceLandmarkType.bottomMouth), isNull);
       });
 
-      test('detectInImage no faces', () async {
+      test('processImage no faces', () async {
         returnValue = <dynamic>[];
 
         final FaceDetector detector = FirebaseVision.instance.faceDetector(
@@ -621,7 +621,7 @@ void main() {
           'empty',
         );
 
-        final List<Face> faces = await detector.detectInImage(image);
+        final List<Face> faces = await detector.processImage(image);
         expect(faces, isEmpty);
       });
     });

From aedcc6f81843ae2da3a6ac0c8e8c4b530d1ac035 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Wed, 30 Jan 2019 17:00:13 -0800
Subject: [PATCH 093/410] WebView JavaScript channels - iOS implementation.
 (#1139)

iOS implementation of the method channel API for adding and removing JavaScript channels.

#1116 adds the Dart side support, the current PR will land first.

flutter/flutter#24837
---
 .../ios/Runner.xcodeproj/project.pbxproj      | 63 ++++++++++++++--
 .../contents.xcworkspacedata                  |  3 +
 .../ios/Classes/FlutterWebView.h              |  4 ++
 .../ios/Classes/FlutterWebView.m              | 71 ++++++++++++++++++-
 .../ios/Classes/JavaScriptChannelHandler.h    | 17 +++++
 .../ios/Classes/JavaScriptChannelHandler.m    | 36 ++++++++++
 6 files changed, 188 insertions(+), 6 deletions(-)
 create mode 100644 packages/webview_flutter/ios/Classes/JavaScriptChannelHandler.h
 create mode 100644 packages/webview_flutter/ios/Classes/JavaScriptChannelHandler.m

diff --git a/packages/webview_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/webview_flutter/example/ios/Runner.xcodeproj/project.pbxproj
index f05b3e20715e..f471b69fb7d1 100644
--- a/packages/webview_flutter/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/webview_flutter/example/ios/Runner.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -20,6 +19,7 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		9D26F6F82D91F92CC095EBA9 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B845D8FBDE0AAD6BE1A0386 /* libPods-Runner.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -40,12 +40,12 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		8B845D8FBDE0AAD6BE1A0386 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
@@ -64,6 +64,7 @@
 			files = (
 				9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
 				3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
+				9D26F6F82D91F92CC095EBA9 /* libPods-Runner.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -73,7 +74,6 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
@@ -90,7 +90,8 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				CF3B75C9A7D2FA2A4C99F110 /* Frameworks */,
+				C6FFB52F5C2B8A41A7E39DE2 /* Pods */,
+				B6736FC417BDCCDA377E779D /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -126,6 +127,21 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		B6736FC417BDCCDA377E779D /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				8B845D8FBDE0AAD6BE1A0386 /* libPods-Runner.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		C6FFB52F5C2B8A41A7E39DE2 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -133,12 +149,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				B71376B4FB8384EF9D5F3F84 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				A1F14D6FD37A3C5047F5A5AD /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -190,7 +208,6 @@
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -226,6 +243,42 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		A1F14D6FD37A3C5047F5A5AD /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		B71376B4FB8384EF9D5F3F84 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
diff --git a/packages/webview_flutter/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/webview_flutter/example/ios/Runner.xcworkspace/contents.xcworkspacedata
index 1d526a16ed0f..21a3cc14c74e 100644
--- a/packages/webview_flutter/example/ios/Runner.xcworkspace/contents.xcworkspacedata
+++ b/packages/webview_flutter/example/ios/Runner.xcworkspace/contents.xcworkspacedata
@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>
diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.h b/packages/webview_flutter/ios/Classes/FlutterWebView.h
index 268e704a5f76..08e6b8ab53a8 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.h
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.h
@@ -1,3 +1,7 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #import <Flutter/Flutter.h>
 #import <WebKit/WebKit.h>
 
diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m
index 7f30ad31bdec..b65899fdbae4 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.m
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m
@@ -1,4 +1,9 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #import "FlutterWebView.h"
+#import "JavaScriptChannelHandler.h"
 
 @implementation FLTWebViewFactory {
   NSObject<FlutterBinaryMessenger>* _messenger;
@@ -33,6 +38,8 @@ @implementation FLTWebViewController {
   int64_t _viewId;
   FlutterMethodChannel* _channel;
   NSString* _currentUrl;
+  // The set of registered JavaScript channel names.
+  NSMutableSet* _javaScriptChannelNames;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -41,15 +48,29 @@ - (instancetype)initWithFrame:(CGRect)frame
               binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger {
   if ([super init]) {
     _viewId = viewId;
-    _webView = [[WKWebView alloc] initWithFrame:frame];
+
     NSString* channelName = [NSString stringWithFormat:@"plugins.flutter.io/webview_%lld", viewId];
     _channel = [FlutterMethodChannel methodChannelWithName:channelName binaryMessenger:messenger];
+    _javaScriptChannelNames = [[NSMutableSet alloc] init];
+
+    WKUserContentController* userContentController = [[WKUserContentController alloc] init];
+    if ([args[@"javascriptChannelNames"] isKindOfClass:[NSArray class]]) {
+      NSArray* javaScriptChannelNames = args[@"javascriptChannelNames"];
+      [_javaScriptChannelNames addObjectsFromArray:javaScriptChannelNames];
+      [self registerJavaScriptChannels:_javaScriptChannelNames controller:userContentController];
+    }
+
+    WKWebViewConfiguration* configuration = [[WKWebViewConfiguration alloc] init];
+    configuration.userContentController = userContentController;
+
+    _webView = [[WKWebView alloc] initWithFrame:frame configuration:configuration];
     __weak __typeof__(self) weakSelf = self;
     [_channel setMethodCallHandler:^(FlutterMethodCall* call, FlutterResult result) {
       [weakSelf onMethodCall:call result:result];
     }];
     NSDictionary<NSString*, id>* settings = args[@"settings"];
     [self applySettings:settings];
+
     NSString* initialUrl = args[@"initialUrl"];
     if (initialUrl && ![initialUrl isKindOfClass:[NSNull class]]) {
       [self loadUrl:initialUrl];
@@ -81,6 +102,10 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     [self onCurrentUrl:call result:result];
   } else if ([[call method] isEqualToString:@"evaluateJavascript"]) {
     [self onEvaluateJavaScript:call result:result];
+  } else if ([[call method] isEqualToString:@"addJavascriptChannels"]) {
+    [self onAddJavaScriptChannels:call result:result];
+  } else if ([[call method] isEqualToString:@"removeJavascriptChannels"]) {
+    [self onRemoveJavaScriptChannels:call result:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -154,6 +179,33 @@ - (void)onEvaluateJavaScript:(FlutterMethodCall*)call result:(FlutterResult)resu
              }];
 }
 
+- (void)onAddJavaScriptChannels:(FlutterMethodCall*)call result:(FlutterResult)result {
+  NSArray* channelNames = [call arguments];
+  NSSet* channelNamesSet = [[NSSet alloc] initWithArray:channelNames];
+  [_javaScriptChannelNames addObjectsFromArray:channelNames];
+  [self registerJavaScriptChannels:channelNamesSet
+                        controller:_webView.configuration.userContentController];
+  result(nil);
+}
+
+- (void)onRemoveJavaScriptChannels:(FlutterMethodCall*)call result:(FlutterResult)result {
+  // WkWebView does not support removing a single user script, so instead we remove all
+  // user scripts, all message handlers. And re-register channels that shouldn't be removed.
+  [_webView.configuration.userContentController removeAllUserScripts];
+  for (NSString* channelName in _javaScriptChannelNames) {
+    [_webView.configuration.userContentController removeScriptMessageHandlerForName:channelName];
+  }
+
+  NSArray* channelNamesToRemove = [call arguments];
+  for (NSString* channelName in channelNamesToRemove) {
+    [_javaScriptChannelNames removeObject:channelName];
+  }
+
+  [self registerJavaScriptChannels:_javaScriptChannelNames
+                        controller:_webView.configuration.userContentController];
+  result(nil);
+}
+
 - (void)applySettings:(NSDictionary<NSString*, id>*)settings {
   for (NSString* key in settings) {
     if ([key isEqualToString:@"jsMode"]) {
@@ -189,4 +241,21 @@ - (bool)loadUrl:(NSString*)url {
   return true;
 }
 
+- (void)registerJavaScriptChannels:(NSSet*)channelNames
+                        controller:(WKUserContentController*)userContentController {
+  for (NSString* channelName in channelNames) {
+    FLTJavaScriptChannel* channel =
+        [[FLTJavaScriptChannel alloc] initWithMethodChannel:_channel
+                                      javaScriptChannelName:channelName];
+    [userContentController addScriptMessageHandler:channel name:channelName];
+    NSString* wrapperSource = [NSString
+        stringWithFormat:@"window.%@ = webkit.messageHandlers.%@;", channelName, channelName];
+    WKUserScript* wrapperScript =
+        [[WKUserScript alloc] initWithSource:wrapperSource
+                               injectionTime:WKUserScriptInjectionTimeAtDocumentStart
+                            forMainFrameOnly:NO];
+    [userContentController addUserScript:wrapperScript];
+  }
+}
+
 @end
diff --git a/packages/webview_flutter/ios/Classes/JavaScriptChannelHandler.h b/packages/webview_flutter/ios/Classes/JavaScriptChannelHandler.h
new file mode 100644
index 000000000000..1e0a9f2fe9d6
--- /dev/null
+++ b/packages/webview_flutter/ios/Classes/JavaScriptChannelHandler.h
@@ -0,0 +1,17 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <Flutter/Flutter.h>
+#import <WebKit/WebKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FLTJavaScriptChannel : NSObject <WKScriptMessageHandler>
+
+- (instancetype)initWithMethodChannel:(FlutterMethodChannel*)methodChannel
+                javaScriptChannelName:(NSString*)javaScriptChannelName;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/packages/webview_flutter/ios/Classes/JavaScriptChannelHandler.m b/packages/webview_flutter/ios/Classes/JavaScriptChannelHandler.m
new file mode 100644
index 000000000000..5bafd8c715dd
--- /dev/null
+++ b/packages/webview_flutter/ios/Classes/JavaScriptChannelHandler.m
@@ -0,0 +1,36 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "JavaScriptChannelHandler.h"
+
+@implementation FLTJavaScriptChannel {
+  FlutterMethodChannel* _methodChannel;
+  NSString* _javaScriptChannelName;
+}
+
+- (instancetype)initWithMethodChannel:(FlutterMethodChannel*)methodChannel
+                javaScriptChannelName:(NSString*)javaScriptChannelName {
+  self = [super init];
+  NSAssert(methodChannel != nil, @"methodChannel must not be null.");
+  NSAssert(javaScriptChannelName != nil, @"javaScriptChannelName must not be null.");
+  if (self) {
+    _methodChannel = methodChannel;
+    _javaScriptChannelName = javaScriptChannelName;
+  }
+  return self;
+}
+
+- (void)userContentController:(WKUserContentController*)userContentController
+      didReceiveScriptMessage:(WKScriptMessage*)message {
+  NSAssert(_methodChannel != nil, @"Can't send a message to an unitialized JavaScript channel.");
+  NSAssert(_javaScriptChannelName != nil,
+           @"Can't send a message to an unitialized JavaScript channel.");
+  NSDictionary* arguments = @{
+    @"channel" : _javaScriptChannelName,
+    @"message" : [NSString stringWithFormat:@"%@", message.body]
+  };
+  [_methodChannel invokeMethod:@"javascriptChannelMessage" arguments:arguments];
+}
+
+@end

From 0f9fbe4189f484aa78963473212b42b19cd8c23d Mon Sep 17 00:00:00 2001
From: Wouter Hardeman <wouterhardeman@users.noreply.github.com>
Date: Thu, 31 Jan 2019 20:48:35 +0100
Subject: [PATCH 094/410] [image_picker] Fixed a crash that would occur when
 called in quick succession on Android (#1093)

---
 packages/image_picker/CHANGELOG.md                   |  4 ++++
 .../plugins/imagepicker/ImagePickerDelegate.java     | 12 ++++++------
 packages/image_picker/pubspec.yaml                   |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 40be3eb73977..ee65ab4c29cf 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.0+1
+
+* Fix a crash when user calls the plugin in quick succession on Android.
+
 ## 0.5.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
index 3c6dab51da28..68a6aabc462a 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
@@ -186,7 +186,7 @@ public void onScanCompleted(String path, Uri uri) {
 
   public void chooseVideoFromGallery(MethodCall methodCall, MethodChannel.Result result) {
     if (!setPendingMethodCallAndResult(methodCall, result)) {
-      finishWithAlreadyActiveError();
+      finishWithAlreadyActiveError(result);
       return;
     }
 
@@ -208,7 +208,7 @@ private void launchPickVideoFromGalleryIntent() {
 
   public void takeVideoWithCamera(MethodCall methodCall, MethodChannel.Result result) {
     if (!setPendingMethodCallAndResult(methodCall, result)) {
-      finishWithAlreadyActiveError();
+      finishWithAlreadyActiveError(result);
       return;
     }
 
@@ -242,7 +242,7 @@ private void launchTakeVideoWithCameraIntent() {
 
   public void chooseImageFromGallery(MethodCall methodCall, MethodChannel.Result result) {
     if (!setPendingMethodCallAndResult(methodCall, result)) {
-      finishWithAlreadyActiveError();
+      finishWithAlreadyActiveError(result);
       return;
     }
 
@@ -264,7 +264,7 @@ private void launchPickImageFromGalleryIntent() {
 
   public void takeImageWithCamera(MethodCall methodCall, MethodChannel.Result result) {
     if (!setPendingMethodCallAndResult(methodCall, result)) {
-      finishWithAlreadyActiveError();
+      finishWithAlreadyActiveError(result);
       return;
     }
 
@@ -482,8 +482,8 @@ private void finishWithSuccess(String imagePath) {
     clearMethodCallAndResult();
   }
 
-  private void finishWithAlreadyActiveError() {
-    finishWithError("already_active", "Image picker is already active");
+  private void finishWithAlreadyActiveError(MethodChannel.Result result) {
+    result.error("already_active", "Image picker is already active", null);
   }
 
   private void finishWithError(String errorCode, String errorMessage) {
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 895bad4929fa..73e267977f92 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.0
+version: 0.5.0+1
 
 flutter:
   plugin:

From 1c982efdd7b9d578d73eed05a337440692148b45 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Mon, 4 Feb 2019 11:17:33 -0800
Subject: [PATCH 095/410] Using json serializer for skproduct wrapper and
 related classes (#1147)

---
 .../sk_product_wrapper.dart                   | 97 ++++++++-----------
 .../sk_product_wrapper.g.dart                 | 96 ++++++++++++++++++
 .../store_kit_wrappers/sk_request_maker.dart  |  5 +-
 .../store_kit_wrappers/sk_product_test.dart   | 19 ++--
 .../store_kit_wrappers/sk_request_test.dart   |  2 +-
 5 files changed, 146 insertions(+), 73 deletions(-)
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart

diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
index 15e7d838f147..110a03f5d2e4 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
@@ -3,11 +3,18 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+// WARNING: Changes to `@JsonSerializable` classes need to be reflected in the
+// below generated file. Run `flutter packages pub run build_runner watch` to
+// rebuild and watch for further changes.
+part 'sk_product_wrapper.g.dart';
 
 /// Dart wrapper around StoreKit's [SKProductsResponse](https://developer.apple.com/documentation/storekit/skproductsresponse?language=objc).
 ///
 /// Represents the response object returned by [SKRequestMaker.startProductRequest].
 /// Contains information about a list of products and a list of invalid product identifiers.
+@JsonSerializable()
 class SkProductResponseWrapper {
   SkProductResponseWrapper(
       {@required this.products, @required this.invalidProductIdentifiers});
@@ -16,11 +23,10 @@ class SkProductResponseWrapper {
   ///
   /// This method should only be used with `map` values returned by [SKRequestMaker.startProductRequest].
   /// The `map` parameter must not be null.
-  SkProductResponseWrapper.fromMap(Map<String, List<dynamic>> map)
-      : assert(map != null),
-        products = _getListFromMapList(_getProductMapListFromResponseMap(map)),
-        invalidProductIdentifiers =
-            List.castFrom<dynamic, String>(map['invalidProductIdentifiers']);
+  factory SkProductResponseWrapper.fromJson(Map map) {
+    assert(map != null);
+    return _$SkProductResponseWrapperFromJson(map);
+  }
 
   /// Stores all matching successfully found products.
   ///
@@ -34,18 +40,6 @@ class SkProductResponseWrapper {
   /// found here https://developer.apple.com/documentation/storekit/skproductsresponse/1505985-invalidproductidentifiers?language=objc.
   /// Will be empty if all the product identifiers are valid.
   final List<String> invalidProductIdentifiers;
-
-  static List<Map<dynamic, dynamic>> _getProductMapListFromResponseMap(
-      Map<String, List<dynamic>> map) {
-    return map['products'].cast<Map<dynamic, dynamic>>();
-  }
-
-  static List<SKProductWrapper> _getListFromMapList(
-      List<Map<dynamic, dynamic>> mapList) {
-    return mapList
-        .map((Map<dynamic, dynamic> map) => SKProductWrapper.fromMap(map))
-        .toList();
-  }
 }
 
 /// Dart wrapper around StoreKit's [SKProductPeriodUnit](https://developer.apple.com/documentation/storekit/skproductperiodunit?language=objc).
@@ -54,9 +48,13 @@ class SkProductResponseWrapper {
 // The values of the enum options are matching the [SKProductPeriodUnit]'s values. Should there be an update or addition
 // in the [SKProductPeriodUnit], this need to be updated to match.
 enum SubscriptionPeriodUnit {
+  @JsonValue(0)
   day,
+  @JsonValue(1)
   week,
+  @JsonValue(2)
   month,
+  @JsonValue(3)
   year,
 }
 
@@ -64,20 +62,20 @@ enum SubscriptionPeriodUnit {
 ///
 /// A period is defined by a [numberOfUnits] and a [unit], e.g for a 3 months period [numberOfUnits] is 3 and [unit] is a month.
 /// It is used as a property in [SKProductDiscountWrapper] and [SKProductWrapper].
+@JsonSerializable(nullable: true)
 class SKProductSubscriptionPeriodWrapper {
   SKProductSubscriptionPeriodWrapper(
       {@required this.numberOfUnits, @required this.unit});
 
   /// Constructing an instance from a map from the Objective-C layer.
-  /// This method should only be used with `map` values returned by [SKProductDiscountWrapper.fromMap] or [SKProductWrapper.fromMap].
+  ///
+  /// This method should only be used with `map` values returned by [SKProductDiscountWrapper.fromJson] or [SKProductWrapper.fromJson].
   /// The `map` parameter must not be null.
-  SKProductSubscriptionPeriodWrapper.fromMap(Map<String, dynamic> map)
-      : assert(map != null &&
-            (map['numberOfUnits'] == null || map['numberOfUnits'] > 0)),
-        numberOfUnits = map['numberOfUnits'],
-        unit = (map['unit'] != null)
-            ? SubscriptionPeriodUnit.values[map['unit']]
-            : null;
+  factory SKProductSubscriptionPeriodWrapper.fromJson(Map map) {
+    assert(map != null &&
+        (map['numberOfUnits'] == null || map['numberOfUnits'] > 0));
+    return _$SKProductSubscriptionPeriodWrapperFromJson(map);
+  }
 
   /// The number of [unit] units in this period.
   ///
@@ -95,12 +93,15 @@ class SKProductSubscriptionPeriodWrapper {
 // in the [SKProductDiscountPaymentMode], this need to be updated to match.
 enum ProductDiscountPaymentMode {
   /// Allows user to pay the discounted price at each payment period.
+  @JsonValue(0)
   payAsYouGo,
 
   /// Allows user to pay the discounted price upfront and receive the product for the rest of time that was paid for.
+  @JsonValue(1)
   payUpFront,
 
   /// User pays nothing during the discounted period.
+  @JsonValue(2)
   freeTrail,
 }
 
@@ -109,6 +110,7 @@ enum ProductDiscountPaymentMode {
 /// Most of the fields are identical to OBJC SKProduct.
 /// The only difference is instead of the locale object, we only exposed currencyCode for simplicity.
 /// It is used as a property in [SKProductWrapper].
+@JsonSerializable(nullable: true)
 class SKProductDiscountWrapper {
   SKProductDiscountWrapper(
       {@required this.price,
@@ -119,20 +121,12 @@ class SKProductDiscountWrapper {
 
   /// Constructing an instance from a map from the Objective-C layer.
   ///
-  /// This method should only be used with `map` values returned by [SKProductWrapper.fromMap].
+  /// This method should only be used with `map` values returned by [SKProductWrapper.fromJson].
   /// The `map` parameter must not be null.
-  SKProductDiscountWrapper.fromMap(Map<String, dynamic> map)
-      : assert(map != null),
-        price = map['price'],
-        currencyCode = map['currencyCode'],
-        numberOfPeriods = map['numberOfPeriods'],
-        paymentMode = (map['paymentMode'] != null)
-            ? ProductDiscountPaymentMode.values[map['paymentMode']]
-            : null,
-        subscriptionPeriod = map['subscriptionPeriod'] != null
-            ? SKProductSubscriptionPeriodWrapper.fromMap(
-                map['subscriptionPeriod'].cast<String, dynamic>())
-            : null;
+  factory SKProductDiscountWrapper.fromJson(Map map) {
+    assert(map != null);
+    return _$SKProductDiscountWrapperFromJson(map);
+  }
 
   /// The discounted price, in the currency that is defined in [currencyCode].
   final double price;
@@ -164,6 +158,7 @@ class SKProductDiscountWrapper {
 /// The only difference is instead of the locale object, we only exposed currencyCode for simplicity.
 /// A list of [SKProductWrapper] is returned in the [SKRequestMaker.startProductRequest] method, and
 /// should be stored for use when making a payment.
+@JsonSerializable(nullable: true)
 class SKProductWrapper {
   SKProductWrapper({
     @required this.productIdentifier,
@@ -181,28 +176,12 @@ class SKProductWrapper {
 
   /// Constructing an instance from a map from the Objective-C layer.
   ///
-  /// This method should only be used with `map` values returned by [SkProductResponseWrapper.fromMap].
+  /// This method should only be used with `map` values returned by [SkProductResponseWrapper.fromJson].
   /// The `map` parameter must not be null.
-  SKProductWrapper.fromMap(Map<dynamic, dynamic> map)
-      : assert(map != null),
-        productIdentifier = map['productIdentifier'],
-        localizedTitle = map['localizedTitle'],
-        localizedDescription = map['localizedDescription'],
-        currencyCode = map['currencyCode'],
-        downloadContentVersion = map['downloadContentVersion'],
-        subscriptionGroupIdentifier = map['subscriptionGroupIdentifier'],
-        price = map['price'],
-        downloadable = map['downloadable'],
-        downloadContentLengths =
-            List.castFrom<dynamic, int>(map['downloadContentLengths']),
-        subscriptionPeriod = map['subscriptionPeriod'] != null
-            ? SKProductSubscriptionPeriodWrapper.fromMap(
-                map['subscriptionPeriod'].cast<String, dynamic>())
-            : null,
-        introductoryPrice = (map['introductoryPrice'] != null)
-            ? SKProductDiscountWrapper.fromMap(
-                map['introductoryPrice'].cast<String, dynamic>())
-            : null;
+  factory SKProductWrapper.fromJson(Map map) {
+    assert(map != null);
+    return _$SKProductWrapperFromJson(map);
+  }
 
   /// The unique identifier of the product.
   final String productIdentifier;
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
new file mode 100644
index 000000000000..8799d65f61f7
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
@@ -0,0 +1,96 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'sk_product_wrapper.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SkProductResponseWrapper _$SkProductResponseWrapperFromJson(Map json) {
+  return SkProductResponseWrapper(
+      products: (json['products'] as List)
+          .map((e) => SKProductWrapper.fromJson(e as Map))
+          .toList(),
+      invalidProductIdentifiers: (json['invalidProductIdentifiers'] as List)
+          .map((e) => e as String)
+          .toList());
+}
+
+SKProductSubscriptionPeriodWrapper _$SKProductSubscriptionPeriodWrapperFromJson(
+    Map json) {
+  return SKProductSubscriptionPeriodWrapper(
+      numberOfUnits: json['numberOfUnits'] as int,
+      unit:
+          _$enumDecodeNullable(_$SubscriptionPeriodUnitEnumMap, json['unit']));
+}
+
+T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    throw ArgumentError('A value must be provided. Supported values: '
+        '${enumValues.values.join(', ')}');
+  }
+  return enumValues.entries
+      .singleWhere((e) => e.value == source,
+          orElse: () => throw ArgumentError(
+              '`$source` is not one of the supported values: '
+              '${enumValues.values.join(', ')}'))
+      .key;
+}
+
+T _$enumDecodeNullable<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    return null;
+  }
+  return _$enumDecode<T>(enumValues, source);
+}
+
+const _$SubscriptionPeriodUnitEnumMap = <SubscriptionPeriodUnit, dynamic>{
+  SubscriptionPeriodUnit.day: 0,
+  SubscriptionPeriodUnit.week: 1,
+  SubscriptionPeriodUnit.month: 2,
+  SubscriptionPeriodUnit.year: 3
+};
+
+SKProductDiscountWrapper _$SKProductDiscountWrapperFromJson(Map json) {
+  return SKProductDiscountWrapper(
+      price: (json['price'] as num)?.toDouble(),
+      currencyCode: json['currencyCode'] as String,
+      numberOfPeriods: json['numberOfPeriods'] as int,
+      paymentMode: _$enumDecodeNullable(
+          _$ProductDiscountPaymentModeEnumMap, json['paymentMode']),
+      subscriptionPeriod: json['subscriptionPeriod'] == null
+          ? null
+          : SKProductSubscriptionPeriodWrapper.fromJson(
+              json['subscriptionPeriod'] as Map));
+}
+
+const _$ProductDiscountPaymentModeEnumMap =
+    <ProductDiscountPaymentMode, dynamic>{
+  ProductDiscountPaymentMode.payAsYouGo: 0,
+  ProductDiscountPaymentMode.payUpFront: 1,
+  ProductDiscountPaymentMode.freeTrail: 2
+};
+
+SKProductWrapper _$SKProductWrapperFromJson(Map json) {
+  return SKProductWrapper(
+      productIdentifier: json['productIdentifier'] as String,
+      localizedTitle: json['localizedTitle'] as String,
+      localizedDescription: json['localizedDescription'] as String,
+      currencyCode: json['currencyCode'] as String,
+      downloadContentVersion: json['downloadContentVersion'] as String,
+      subscriptionGroupIdentifier:
+          json['subscriptionGroupIdentifier'] as String,
+      price: (json['price'] as num)?.toDouble(),
+      downloadable: json['downloadable'] as bool,
+      downloadContentLengths: (json['downloadContentLengths'] as List)
+          ?.map((e) => e as int)
+          ?.toList(),
+      subscriptionPeriod: json['subscriptionPeriod'] == null
+          ? null
+          : SKProductSubscriptionPeriodWrapper.fromJson(
+              json['subscriptionPeriod'] as Map),
+      introductoryPrice: json['introductoryPrice'] == null
+          ? null
+          : SKProductDiscountWrapper.fromJson(
+              json['introductoryPrice'] as Map));
+}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart
index 76a385a1ae16..295e7277315a 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart
@@ -24,7 +24,7 @@ class SKRequestMaker {
   /// A [PlatformException] is thrown if the platform code making the request fails.
   Future<SkProductResponseWrapper> startProductRequest(
       List<String> productIdentifiers) async {
-    final Map<dynamic, dynamic> productResponseMap = await channel.invokeMethod(
+    final Map productResponseMap = await channel.invokeMethod(
       '-[InAppPurchasePlugin startProductRequest:result:]',
       productIdentifiers,
     );
@@ -34,7 +34,6 @@ class SKRequestMaker {
         message: 'StoreKit: Failed to get response from platform.',
       );
     }
-    return SkProductResponseWrapper.fromMap(
-        productResponseMap.cast<String, List<dynamic>>());
+    return SkProductResponseWrapper.fromJson(productResponseMap);
   }
 }
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
index b502a98edc5d..f691e7a73a18 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
@@ -41,7 +41,7 @@ void main() {
         'SKProductSubscriptionPeriodWrapper should have property values consistent with map',
         () {
       final SKProductSubscriptionPeriodWrapper wrapper =
-          SKProductSubscriptionPeriodWrapper.fromMap(subMap);
+          SKProductSubscriptionPeriodWrapper.fromJson(subMap);
       expect(wrapper.numberOfUnits, subMap['numberOfUnits']);
       expect(wrapper.unit, SubscriptionPeriodUnit.values[subMap['unit']]);
     });
@@ -50,7 +50,7 @@ void main() {
         'SKProductSubscriptionPeriodWrapper should have properties to be null if map is empty',
         () {
       final SKProductSubscriptionPeriodWrapper wrapper =
-          SKProductSubscriptionPeriodWrapper.fromMap(<String, dynamic>{});
+          SKProductSubscriptionPeriodWrapper.fromJson(<String, dynamic>{});
       expect(wrapper.numberOfUnits, null);
       expect(wrapper.unit, null);
     });
@@ -59,7 +59,7 @@ void main() {
         'SKProductDiscountWrapper should have property values consistent with map',
         () {
       final SKProductDiscountWrapper wrapper =
-          SKProductDiscountWrapper.fromMap(discountMap);
+          SKProductDiscountWrapper.fromJson(discountMap);
       expect(wrapper.price, discountMap['price']);
       expect(wrapper.currencyCode, discountMap['currencyCode']);
       expect(wrapper.numberOfPeriods, discountMap['numberOfPeriods']);
@@ -77,7 +77,7 @@ void main() {
         'SKProductDiscountWrapper should have properties to be null if map is empty',
         () {
       final SKProductDiscountWrapper wrapper =
-          SKProductDiscountWrapper.fromMap(<String, dynamic>{});
+          SKProductDiscountWrapper.fromJson(<String, dynamic>{});
       expect(wrapper.price, null);
       expect(wrapper.currencyCode, null);
       expect(wrapper.numberOfPeriods, null);
@@ -125,15 +125,14 @@ void main() {
 
     test('SKProductWrapper should have property values consistent with map',
         () {
-      final SKProductWrapper wrapper = SKProductWrapper.fromMap(productMap);
+      final SKProductWrapper wrapper = SKProductWrapper.fromJson(productMap);
       testMatchingProductMap(wrapper, productMap);
     });
 
-    test(
-        'SKProductDiscountWrapper should have properties to be null if map is empty',
+    test('SKProductWrapper should have properties to be null if map is empty',
         () {
       final SKProductWrapper wrapper =
-          SKProductWrapper.fromMap(<String, dynamic>{});
+          SKProductWrapper.fromJson(<String, dynamic>{});
       expect(wrapper.productIdentifier, null);
       expect(wrapper.localizedTitle, null);
       expect(wrapper.localizedDescription, null);
@@ -147,7 +146,7 @@ void main() {
 
     test('SKProductResponse wrapper should match', () {
       final SkProductResponseWrapper wrapper =
-          SkProductResponseWrapper.fromMap(productResponseMap);
+          SkProductResponseWrapper.fromJson(productResponseMap);
       testMatchingProductMap(
           wrapper.products[0], productResponseMap['products'][0]);
       expect(wrapper.invalidProductIdentifiers,
@@ -160,7 +159,7 @@ void main() {
         'invalidProductIdentifiers': <String>[],
       };
       final SkProductResponseWrapper wrapper =
-          SkProductResponseWrapper.fromMap(productResponseMapEmptyList);
+          SkProductResponseWrapper.fromJson(productResponseMapEmptyList);
       expect(wrapper.products.length, 0);
       expect(wrapper.invalidProductIdentifiers.length, 0);
     });
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
index 1fa8ec7cf925..a03e056f45f1 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
@@ -48,7 +48,7 @@ void main() {
     test('platform call should get result', () async {
       stubPlatform.addResponse(
           name: '-[InAppPurchasePlugin startProductRequest:result:]',
-          value: productResponseMap.cast<String, dynamic>());
+          value: productResponseMap);
       final SKRequestMaker request = SKRequestMaker();
       final SkProductResponseWrapper response =
           await request.startProductRequest(<String>['123']);

From 7d494b433f7aab6d702e5a412a6cce3be1e77956 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Mon, 4 Feb 2019 12:56:40 -0800
Subject: [PATCH 096/410] WebView JavasScript channels Android implementation.
 (#1130)

Platform implementation of the method channel API for adding and removing JavaScript channels.

#1116 adds the Dart side support, the current PR will land first.

flutter/flutter#24837
---
 .../webviewflutter/FlutterWebView.java        | 44 +++++++++++++++++--
 .../webviewflutter/JavaScriptChannel.java     | 38 ++++++++++++++++
 2 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java

diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index 58f249a3cbe7..a6528cd34a8c 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -9,22 +9,31 @@
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
 import io.flutter.plugin.platform.PlatformView;
+import java.util.List;
 import java.util.Map;
 
 public class FlutterWebView implements PlatformView, MethodCallHandler {
+  private static final String JS_CHANNEL_NAMES_FIELD = "javascriptChannelNames";
   private final WebView webView;
   private final MethodChannel methodChannel;
 
   @SuppressWarnings("unchecked")
   FlutterWebView(Context context, BinaryMessenger messenger, int id, Map<String, Object> params) {
     webView = new WebView(context);
+
+    methodChannel = new MethodChannel(messenger, "plugins.flutter.io/webview_" + id);
+    methodChannel.setMethodCallHandler(this);
+
+    applySettings((Map<String, Object>) params.get("settings"));
+
+    if (params.containsKey(JS_CHANNEL_NAMES_FIELD)) {
+      registerJavaScriptChannelNames((List<String>) params.get(JS_CHANNEL_NAMES_FIELD));
+    }
+
     if (params.containsKey("initialUrl")) {
       String url = (String) params.get("initialUrl");
       webView.loadUrl(url);
     }
-    applySettings((Map<String, Object>) params.get("settings"));
-    methodChannel = new MethodChannel(messenger, "plugins.flutter.io/webview_" + id);
-    methodChannel.setMethodCallHandler(this);
   }
 
   @Override
@@ -62,6 +71,12 @@ public void onMethodCall(MethodCall methodCall, Result result) {
       case "evaluateJavascript":
         evaluateJavaScript(methodCall, result);
         break;
+      case "addJavascriptChannels":
+        addJavaScriptChannels(methodCall, result);
+        break;
+      case "removeJavascriptChannels":
+        removeJavaScriptChannels(methodCall, result);
+        break;
       default:
         result.notImplemented();
     }
@@ -125,6 +140,22 @@ public void onReceiveValue(String value) {
         });
   }
 
+  @SuppressWarnings("unchecked")
+  private void addJavaScriptChannels(MethodCall methodCall, Result result) {
+    List<String> channelNames = (List<String>) methodCall.arguments;
+    registerJavaScriptChannelNames(channelNames);
+    result.success(null);
+  }
+
+  @SuppressWarnings("unchecked")
+  private void removeJavaScriptChannels(MethodCall methodCall, Result result) {
+    List<String> channelNames = (List<String>) methodCall.arguments;
+    for (String channelName : channelNames) {
+      webView.removeJavascriptInterface(channelName);
+    }
+    result.success(null);
+  }
+
   private void applySettings(Map<String, Object> settings) {
     for (String key : settings.keySet()) {
       switch (key) {
@@ -150,6 +181,13 @@ private void updateJsMode(int mode) {
     }
   }
 
+  private void registerJavaScriptChannelNames(List<String> channelNames) {
+    for (String channelName : channelNames) {
+      webView.addJavascriptInterface(
+          new JavaScriptChannel(methodChannel, channelName), channelName);
+    }
+  }
+
   @Override
   public void dispose() {}
 }
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java
new file mode 100644
index 000000000000..1fba623b3913
--- /dev/null
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java
@@ -0,0 +1,38 @@
+package io.flutter.plugins.webviewflutter;
+
+import android.webkit.JavascriptInterface;
+import io.flutter.plugin.common.MethodChannel;
+import java.util.HashMap;
+
+/**
+ * Added as a JavaScript interface to the WebView for any JavaScript channel that the Dart code sets
+ * up.
+ *
+ * <p>Exposes a single method named `postMessage` to JavaScript, which sends a message over a method
+ * channel to the Dart code.
+ */
+class JavaScriptChannel {
+  private final MethodChannel methodChannel;
+  private final String javaScriptChannelName;
+
+  /**
+   * @param methodChannel the Flutter WebView method channel to which JS messages are sent
+   * @param javaScriptChannelName the name of the JavaScript channel, this is sent over the method
+   *     channel with each message to let the Dart code know which JavaScript channel the message
+   *     was sent through
+   */
+  JavaScriptChannel(MethodChannel methodChannel, String javaScriptChannelName) {
+    this.methodChannel = methodChannel;
+    this.javaScriptChannelName = javaScriptChannelName;
+  }
+
+  // Suppressing unused warning as this is invoked from JavaScript.
+  @SuppressWarnings("unused")
+  @JavascriptInterface
+  public void postMessage(String message) {
+    HashMap<String, String> arguments = new HashMap<>();
+    arguments.put("channel", javaScriptChannelName);
+    arguments.put("message", message);
+    methodChannel.invokeMethod("javascriptChannelMessage", arguments);
+  }
+}

From ac644776a28b52e0952794629828f5e8304a6ea0 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Mon, 4 Feb 2019 12:57:33 -0800
Subject: [PATCH 097/410] Add WebView JavaScript channels (Dart side). (#1116)

Allows JavaScript code running in the WebView to send messages that will be received by the Flutter app's Dart code.

To keep the PRs smaller this does not include the platform side implementations which will be sent in following PRs.

Right now there are no return values on the JavaScript side, we could think of returning a JavaScript promise (or a promise equivalent) in the future, but as a first step I start without it (`evaluateJavascript` can be used to pass messages in the other direction so this shouldn't be a blocking limitation).
I believe that if we end up adding a return value on the JavaScript side this could be done without making a breaking change.

### Sample usage
Dart:
```dart
WebView(
  javascriptChannels: <JavascriptChannel>[
    JavascriptChannel(name: 'Print', onMessageReceived: (String msg) {print(msg); }),
  ].toSet(),
),
```

JavaScript (running inside the WebView):
```javascript
Print.postMessage('Hello!');
```


Fixes: https://github.com/flutter/flutter/issues/24837
---
 packages/webview_flutter/CHANGELOG.md         |   5 +
 .../webview_flutter/example/lib/main.dart     |  56 ++++--
 .../webview_flutter/lib/webview_flutter.dart  | 177 ++++++++++++++++-
 packages/webview_flutter/pubspec.yaml         |   2 +-
 .../test/webview_flutter_test.dart            | 187 ++++++++++++++++++
 5 files changed, 397 insertions(+), 30 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index d90be52c5468..07a69c0f3501 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.1
+
+* Added JavaScript channels to facilitate message passing from JavaScript code running inside
+  the WebView to the Flutter app's Dart code.
+
 ## 0.3.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index 9befe4b67f41..d8a4e8c439d8 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -23,17 +23,34 @@ class WebViewExample extends StatelessWidget {
           SampleMenu(_controller.future),
         ],
       ),
-      body: WebView(
-        initialUrl: 'https://flutter.io',
-        javascriptMode: JavascriptMode.unrestricted,
-        onWebViewCreated: (WebViewController webViewController) {
-          _controller.complete(webViewController);
-        },
-      ),
+      // We're using a Builder here so we have a context that is below the Scaffold
+      // to allow calling Scaffold.of(context) so we can show a snackbar.
+      body: Builder(builder: (BuildContext context) {
+        return WebView(
+          initialUrl: 'https://flutter.io',
+          javascriptMode: JavascriptMode.unrestricted,
+          onWebViewCreated: (WebViewController webViewController) {
+            _controller.complete(webViewController);
+          },
+          javascriptChannels: <JavascriptChannel>[
+            _toasterJavascriptChannel(context),
+          ].toSet(),
+        );
+      }),
       floatingActionButton: favoriteButton(),
     );
   }
 
+  JavascriptChannel _toasterJavascriptChannel(BuildContext context) {
+    return JavascriptChannel(
+        name: 'Toaster',
+        onMessageReceived: (JavascriptMessage message) {
+          Scaffold.of(context).showSnackBar(
+            SnackBar(content: Text(message.message)),
+          );
+        });
+  }
+
   Widget favoriteButton() {
     return FutureBuilder<WebViewController>(
         future: _controller.future,
@@ -44,7 +61,7 @@ class WebViewExample extends StatelessWidget {
               onPressed: () async {
                 final String url = await controller.data.currentUrl();
                 Scaffold.of(context).showSnackBar(
-                  SnackBar(content: Text("Favorited $url")),
+                  SnackBar(content: Text('Favorited $url')),
                 );
               },
               child: const Icon(Icons.favorite),
@@ -56,7 +73,7 @@ class WebViewExample extends StatelessWidget {
 }
 
 enum MenuOptions {
-  evaluateJavascript,
+  showUserAgent,
   toast,
 }
 
@@ -73,8 +90,8 @@ class SampleMenu extends StatelessWidget {
         return PopupMenuButton<MenuOptions>(
           onSelected: (MenuOptions value) {
             switch (value) {
-              case MenuOptions.evaluateJavascript:
-                _onEvaluateJavascript(controller.data, context);
+              case MenuOptions.showUserAgent:
+                _onShowUserAgent(controller.data, context);
                 break;
               case MenuOptions.toast:
                 Scaffold.of(context).showSnackBar(
@@ -87,8 +104,8 @@ class SampleMenu extends StatelessWidget {
           },
           itemBuilder: (BuildContext context) => <PopupMenuItem<MenuOptions>>[
                 PopupMenuItem<MenuOptions>(
-                  value: MenuOptions.evaluateJavascript,
-                  child: const Text('Evaluate JavaScript'),
+                  value: MenuOptions.showUserAgent,
+                  child: const Text('Show user agent'),
                   enabled: controller.hasData,
                 ),
                 const PopupMenuItem<MenuOptions>(
@@ -101,15 +118,12 @@ class SampleMenu extends StatelessWidget {
     );
   }
 
-  void _onEvaluateJavascript(
+  void _onShowUserAgent(
       WebViewController controller, BuildContext context) async {
-    final String result = await controller
-        .evaluateJavascript("document.body.style.backgroundColor = 'red'");
-    Scaffold.of(context).showSnackBar(
-      SnackBar(
-        content: Text('JavaScript evaluated, the result is: $result'),
-      ),
-    );
+    // Send a message with the user agent string to the Toaster JavaScript channel we registered
+    // with the WebView.
+    controller.evaluateJavascript(
+        'Toaster.postMessage("User Agent: " + navigator.userAgent);');
   }
 }
 
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index 43f88b6892e4..8d5a74686760 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -19,6 +19,51 @@ enum JavascriptMode {
   unrestricted,
 }
 
+/// A message that was sent by JavaScript code running in a [WebView].
+class JavascriptMessage {
+  /// Constructs a JavaScript message object.
+  ///
+  /// The `message` parameter must not be null.
+  const JavascriptMessage(this.message) : assert(message != null);
+
+  /// The contents of the message that was sent by the JavaScript code.
+  final String message;
+}
+
+/// Callback type for handling messages sent from Javascript running in a web view.
+typedef void JavascriptMessageHandler(JavascriptMessage message);
+
+final RegExp _validChannelNames = RegExp('^[a-zA-Z_][a-zA-Z0-9]*\$');
+
+/// A named channel for receiving messaged from JavaScript code running inside a web view.
+class JavascriptChannel {
+  /// Constructs a Javascript channel.
+  ///
+  /// The parameters `name` and `onMessageReceived` must not be null.
+  JavascriptChannel({
+    @required this.name,
+    @required this.onMessageReceived,
+  })  : assert(name != null),
+        assert(onMessageReceived != null),
+        assert(_validChannelNames.hasMatch(name));
+
+  /// The channel's name.
+  ///
+  /// Passing this channel object as part of a [WebView.javascriptChannels] adds a channel object to
+  /// the Javascript window object's property named `name`.
+  ///
+  /// The name must start with a letter or underscore(_), followed by any combination of those
+  /// characters plus digits.
+  ///
+  /// Note that any JavaScript existing `window` property with this name will be overriden.
+  ///
+  /// See also [WebView.javascriptChannels] for more details on the channel registration mechanism.
+  final String name;
+
+  /// A callback that's invoked when a message is received through the channel.
+  final JavascriptMessageHandler onMessageReceived;
+}
+
 /// A web view widget for showing html content.
 class WebView extends StatefulWidget {
   /// Creates a new web view.
@@ -32,6 +77,7 @@ class WebView extends StatefulWidget {
     this.onWebViewCreated,
     this.initialUrl,
     this.javascriptMode = JavascriptMode.disabled,
+    this.javascriptChannels,
     this.gestureRecognizers,
   })  : assert(javascriptMode != null),
         super(key: key);
@@ -56,6 +102,35 @@ class WebView extends StatefulWidget {
   /// Whether Javascript execution is enabled.
   final JavascriptMode javascriptMode;
 
+  /// The set of [JavascriptChannel]s available to JavaScript code running in the web view.
+  ///
+  /// For each [JavascriptChannel] in the set, a channel object is made available for the
+  /// JavaScript code in a window property named [JavascriptChannel.name].
+  /// The JavaScript code can then call `postMessage` on that object to send a message that will be
+  /// passed to [JavascriptChannel.onMessageReceived].
+  ///
+  /// For example for the following JavascriptChannel:
+  ///
+  /// ```dart
+  /// JavascriptChannel(name: 'Print', onMessageReceived: (String message) { print(message); });
+  /// ```
+  ///
+  /// JavaScript code can call:
+  ///
+  /// ```javascript
+  /// Print.postMessage('Hello');
+  /// ```
+  ///
+  /// To asynchronously invoke the message handler which will print the message to standard output.
+  ///
+  /// Adding a new JavaScript channel only takes affect after the next page is loaded.
+  ///
+  /// Set values must not be null. A [JavascriptChannel.name] cannot be the same for multiple
+  /// channels in the list.
+  ///
+  /// A null value is equivalent to an empty set.
+  final Set<JavascriptChannel> javascriptChannels;
+
   @override
   State<StatefulWidget> createState() => _WebViewState();
 }
@@ -103,45 +178,79 @@ class _WebViewState extends State<WebView> {
         '$defaultTargetPlatform is not yet supported by the webview_flutter plugin');
   }
 
+  @override
+  void initState() {
+    super.initState();
+    _assertJavascriptChannelNamesAreUnique();
+  }
+
   @override
   void didUpdateWidget(WebView oldWidget) {
     super.didUpdateWidget(oldWidget);
-    _updateSettings(_WebSettings.fromWidget(widget));
+    _assertJavascriptChannelNamesAreUnique();
+    _updateConfiguration(_WebSettings.fromWidget(widget));
   }
 
-  Future<void> _updateSettings(_WebSettings settings) async {
+  Future<void> _updateConfiguration(_WebSettings settings) async {
     _settings = settings;
     final WebViewController controller = await _controller.future;
     controller._updateSettings(settings);
+    controller._updateJavascriptChannels(widget.javascriptChannels);
   }
 
   void _onPlatformViewCreated(int id) {
-    final WebViewController controller =
-        WebViewController._(id, _WebSettings.fromWidget(widget));
+    final WebViewController controller = WebViewController._(
+      id,
+      _WebSettings.fromWidget(widget),
+      widget.javascriptChannels,
+    );
     _controller.complete(controller);
     if (widget.onWebViewCreated != null) {
       widget.onWebViewCreated(controller);
     }
   }
+
+  void _assertJavascriptChannelNamesAreUnique() {
+    if (widget.javascriptChannels == null ||
+        widget.javascriptChannels.isEmpty) {
+      return;
+    }
+    assert(_extractChannelNames(widget.javascriptChannels).length ==
+        widget.javascriptChannels.length);
+  }
+}
+
+Set<String> _extractChannelNames(Set<JavascriptChannel> channels) {
+  final Set<String> channelNames = channels == null
+      ? Set<String>()
+      : channels.map((JavascriptChannel channel) => channel.name).toSet();
+  return channelNames;
 }
 
 class _CreationParams {
-  _CreationParams({this.initialUrl, this.settings});
+  _CreationParams(
+      {this.initialUrl, this.settings, this.javascriptChannelNames});
 
   static _CreationParams fromWidget(WebView widget) {
     return _CreationParams(
       initialUrl: widget.initialUrl,
       settings: _WebSettings.fromWidget(widget),
+      javascriptChannelNames:
+          _extractChannelNames(widget.javascriptChannels).toList(),
     );
   }
 
   final String initialUrl;
+
   final _WebSettings settings;
 
+  final List<String> javascriptChannelNames;
+
   Map<String, dynamic> toMap() {
     return <String, dynamic>{
       'initialUrl': initialUrl,
       'settings': settings.toMap(),
+      'javascriptChannelNames': javascriptChannelNames,
     };
   }
 }
@@ -178,14 +287,32 @@ class _WebSettings {
 /// A [WebViewController] instance can be obtained by setting the [WebView.onWebViewCreated]
 /// callback for a [WebView] widget.
 class WebViewController {
-  WebViewController._(int id, _WebSettings settings)
-      : _channel = MethodChannel('plugins.flutter.io/webview_$id'),
-        _settings = settings;
+  WebViewController._(
+      int id, this._settings, Set<JavascriptChannel> javascriptChannels)
+      : _channel = MethodChannel('plugins.flutter.io/webview_$id') {
+    _updateJavascriptChannelsFromSet(javascriptChannels);
+    _channel.setMethodCallHandler(_onMethodCall);
+  }
 
   final MethodChannel _channel;
 
   _WebSettings _settings;
 
+  // Maps a channel name to a channel.
+  Map<String, JavascriptChannel> _javascriptChannels =
+      <String, JavascriptChannel>{};
+
+  Future<void> _onMethodCall(MethodCall call) async {
+    switch (call.method) {
+      case 'javascriptChannelMessage':
+        final String channel = call.arguments['channel'];
+        final String message = call.arguments['message'];
+        _javascriptChannels[channel]
+            .onMessageReceived(JavascriptMessage(message));
+        break;
+    }
+  }
+
   /// Loads the specified URL.
   ///
   /// `url` must not be null.
@@ -279,6 +406,40 @@ class WebViewController {
     return _channel.invokeMethod('updateSettings', updateMap);
   }
 
+  Future<void> _updateJavascriptChannels(
+      Set<JavascriptChannel> newChannels) async {
+    final Set<String> currentChannels = _javascriptChannels.keys.toSet();
+    final Set<String> newChannelNames = _extractChannelNames(newChannels);
+    final Set<String> channelsToAdd =
+        newChannelNames.difference(currentChannels);
+    final Set<String> channelsToRemove =
+        currentChannels.difference(newChannelNames);
+    if (channelsToRemove.isNotEmpty) {
+      // TODO(amirh): remove this when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
+      _channel.invokeMethod(
+          'removeJavascriptChannels', channelsToRemove.toList());
+    }
+    if (channelsToAdd.isNotEmpty) {
+      // TODO(amirh): remove this when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
+      _channel.invokeMethod('addJavascriptChannels', channelsToAdd.toList());
+    }
+    _updateJavascriptChannelsFromSet(newChannels);
+  }
+
+  void _updateJavascriptChannelsFromSet(Set<JavascriptChannel> channels) {
+    _javascriptChannels.clear();
+    if (channels == null) {
+      return;
+    }
+    for (JavascriptChannel channel in channels) {
+      _javascriptChannels[channel.name] = channel;
+    }
+  }
+
   /// Evaluates a JavaScript expression in the context of the current page.
   ///
   /// On Android returns the evaluation result as a JSON formatted string.
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 2ed52c97e23a..329159e0eeab 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.0
+version: 0.3.1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 
diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart
index ae286bf5118e..12b4831b5399 100644
--- a/packages/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/test/webview_flutter_test.dart
@@ -9,6 +9,8 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
+typedef void VoidCallback();
+
 void main() {
   final _FakePlatformViewsController fakePlatformViewsController =
       _FakePlatformViewsController();
@@ -353,6 +355,164 @@ void main() {
       throwsA(anything),
     );
   });
+
+  testWidgets('Initial JavaScript channels', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://youtube.com',
+        javascriptChannels: <JavascriptChannel>[
+          JavascriptChannel(
+              name: 'Tts', onMessageReceived: (JavascriptMessage msg) {}),
+          JavascriptChannel(
+              name: 'Alarm', onMessageReceived: (JavascriptMessage msg) {}),
+        ].toSet(),
+      ),
+    );
+
+    final FakePlatformWebView platformWebView =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformWebView.javascriptChannelNames,
+        unorderedEquals(<String>['Tts', 'Alarm']));
+  });
+
+  test('Only valid JavaScript channel names are allowed', () {
+    final JavascriptMessageHandler noOp = (JavascriptMessage msg) {};
+    JavascriptChannel(name: 'Tts1', onMessageReceived: noOp);
+    JavascriptChannel(name: '_Alarm', onMessageReceived: noOp);
+
+    VoidCallback createChannel(String name) {
+      return () {
+        JavascriptChannel(name: name, onMessageReceived: noOp);
+      };
+    }
+
+    expect(createChannel('1Alarm'), throwsAssertionError);
+    expect(createChannel('foo.bar'), throwsAssertionError);
+    expect(createChannel(''), throwsAssertionError);
+  });
+
+  testWidgets('Unique JavaScript channel names are required',
+      (WidgetTester tester) async {
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://youtube.com',
+        javascriptChannels: <JavascriptChannel>[
+          JavascriptChannel(
+              name: 'Alarm', onMessageReceived: (JavascriptMessage msg) {}),
+          JavascriptChannel(
+              name: 'Alarm', onMessageReceived: (JavascriptMessage msg) {}),
+        ].toSet(),
+      ),
+    );
+    expect(tester.takeException(), isNot(null));
+  });
+
+  testWidgets('JavaScript channels update', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://youtube.com',
+        javascriptChannels: <JavascriptChannel>[
+          JavascriptChannel(
+              name: 'Tts', onMessageReceived: (JavascriptMessage msg) {}),
+          JavascriptChannel(
+              name: 'Alarm', onMessageReceived: (JavascriptMessage msg) {}),
+        ].toSet(),
+      ),
+    );
+
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://youtube.com',
+        javascriptChannels: <JavascriptChannel>[
+          JavascriptChannel(
+              name: 'Tts', onMessageReceived: (JavascriptMessage msg) {}),
+          JavascriptChannel(
+              name: 'Alarm2', onMessageReceived: (JavascriptMessage msg) {}),
+          JavascriptChannel(
+              name: 'Alarm3', onMessageReceived: (JavascriptMessage msg) {}),
+        ].toSet(),
+      ),
+    );
+
+    final FakePlatformWebView platformWebView =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformWebView.javascriptChannelNames,
+        unorderedEquals(<String>['Tts', 'Alarm2', 'Alarm3']));
+  });
+
+  testWidgets('Remove all JavaScript channels and then add',
+      (WidgetTester tester) async {
+    // This covers a specific bug we had where after updating javascriptChannels to null,
+    // updating it again with a subset of the previously registered channels fails as the
+    // widget's cache of current channel wasn't properly updated when updating javascriptChannels to
+    // null.
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://youtube.com',
+        javascriptChannels: <JavascriptChannel>[
+          JavascriptChannel(
+              name: 'Tts', onMessageReceived: (JavascriptMessage msg) {}),
+        ].toSet(),
+      ),
+    );
+
+    await tester.pumpWidget(
+      const WebView(
+        initialUrl: 'https://youtube.com',
+      ),
+    );
+
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://youtube.com',
+        javascriptChannels: <JavascriptChannel>[
+          JavascriptChannel(
+              name: 'Tts', onMessageReceived: (JavascriptMessage msg) {}),
+        ].toSet(),
+      ),
+    );
+
+    final FakePlatformWebView platformWebView =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformWebView.javascriptChannelNames,
+        unorderedEquals(<String>['Tts']));
+  });
+
+  testWidgets('JavaScript channel messages', (WidgetTester tester) async {
+    final List<String> ttsMessagesReceived = <String>[];
+    final List<String> alarmMessagesReceived = <String>[];
+    await tester.pumpWidget(
+      WebView(
+        initialUrl: 'https://youtube.com',
+        javascriptChannels: <JavascriptChannel>[
+          JavascriptChannel(
+              name: 'Tts',
+              onMessageReceived: (JavascriptMessage msg) {
+                ttsMessagesReceived.add(msg.message);
+              }),
+          JavascriptChannel(
+              name: 'Alarm',
+              onMessageReceived: (JavascriptMessage msg) {
+                alarmMessagesReceived.add(msg.message);
+              }),
+        ].toSet(),
+      ),
+    );
+
+    final FakePlatformWebView platformWebView =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(ttsMessagesReceived, isEmpty);
+    expect(alarmMessagesReceived, isEmpty);
+
+    platformWebView.fakeJavascriptPostMessage('Tts', 'Hello');
+    platformWebView.fakeJavascriptPostMessage('Tts', 'World');
+
+    expect(ttsMessagesReceived, <String>['Hello', 'World']);
+  });
 }
 
 class FakePlatformWebView {
@@ -365,6 +525,10 @@ class FakePlatformWebView {
       }
       javascriptMode = JavascriptMode.values[params['settings']['jsMode']];
     }
+    if (params.containsKey('javascriptChannelNames')) {
+      javascriptChannelNames =
+          List<String>.from(params['javascriptChannelNames']);
+    }
     channel = MethodChannel(
         'plugins.flutter.io/webview_$id', const StandardMethodCodec());
     channel.setMockMethodCallHandler(onMethodCall);
@@ -378,6 +542,7 @@ class FakePlatformWebView {
 
   String get currentUrl => history.isEmpty ? null : history[currentPosition];
   JavascriptMode javascriptMode;
+  List<String> javascriptChannelNames;
 
   Future<dynamic> onMethodCall(MethodCall call) {
     switch (call.method) {
@@ -416,9 +581,31 @@ class FakePlatformWebView {
         break;
       case 'evaluateJavascript':
         return Future<dynamic>.value(call.arguments);
+        break;
+      case 'addJavascriptChannels':
+        final List<String> channelNames = List<String>.from(call.arguments);
+        javascriptChannelNames.addAll(channelNames);
+        break;
+      case 'removeJavascriptChannels':
+        final List<String> channelNames = List<String>.from(call.arguments);
+        javascriptChannelNames
+            .removeWhere((String channel) => channelNames.contains(channel));
+        break;
     }
     return Future<void>.sync(() {});
   }
+
+  void fakeJavascriptPostMessage(String jsChannel, String message) {
+    final StandardMethodCodec codec = const StandardMethodCodec();
+    final Map<String, dynamic> arguments = <String, dynamic>{
+      'channel': jsChannel,
+      'message': message
+    };
+    final ByteData data = codec
+        .encodeMethodCall(MethodCall('javascriptChannelMessage', arguments));
+    BinaryMessages.handlePlatformMessage(
+        channel.name, data, (ByteData data) {});
+  }
 }
 
 class _FakePlatformViewsController {

From 2c78fda9530b90989b8734560ac229178fd9a9bd Mon Sep 17 00:00:00 2001
From: Ben Konyi <bkonyi@google.com>
Date: Mon, 4 Feb 2019 16:20:48 -0800
Subject: [PATCH 098/410] Added support for persisting alarms across reboots
 (#1133)

Added support for persisting alarms across reboots.

Android doesn't automatically reschedule alarms after a reboot, so
alarms set using this plugin would have to be scheduled manually after
each reboot. With this change, alarms scheduled with the 'rescheduleOnReboot'
flag set to true will be rescheduled at boot.
---
 packages/android_alarm_manager/CHANGELOG.md   |  24 +++
 packages/android_alarm_manager/README.md      |  16 +-
 .../androidalarmmanager/AlarmService.java     | 146 +++++++++++++++++-
 .../AndroidAlarmManagerPlugin.java            |  18 ++-
 .../RebootBroadcastReceiver.java              |  36 +++++
 .../android/app/src/main/AndroidManifest.xml  |   8 +
 .../lib/android_alarm_manager.dart            |  22 ++-
 packages/android_alarm_manager/pubspec.yaml   |   2 +-
 8 files changed, 262 insertions(+), 10 deletions(-)
 create mode 100644 packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/RebootBroadcastReceiver.java

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index bf58bb8d0a4b..0ec184f085f7 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 0.4.1
+* Added support for setting alarms which persist across reboots.
+  * Both `AndroidAlarmManager.oneShot` and `AndroidAlarmManager.periodic` have
+    an optional `rescheduleOnReboot` parameter which specifies whether the new
+    alarm should be rescheduled to run after a reboot (default: false). If set
+    to false, the alarm will not survive a device reboot.
+  * Requires AndroidManifest.xml to be updated to include the following
+    entries:
+
+    ```xml
+    <!--Within the application tag body-->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+
+    <!--Within the manifest tag body-->
+    <receiver
+        android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
+        android:enabled="false">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED"></action>
+        </intent-filter>
+    </receiver>
+
+    ```
+
 ## 0.4.0
 * **Breaking change**. Migrated the underlying AlarmService to utilize a
   BroadcastReceiver with a JobIntentService instead of a Service to handle
diff --git a/packages/android_alarm_manager/README.md b/packages/android_alarm_manager/README.md
index bcbb007aac8d..33aeacd5adae 100644
--- a/packages/android_alarm_manager/README.md
+++ b/packages/android_alarm_manager/README.md
@@ -8,7 +8,13 @@ Dart code in the background when alarms fire.
 ## Getting Started
 
 After importing this plugin to your project as usual, add the following to your
-`AndroidManifest.xml`:
+`AndroidManifest.xml` within the `<manifest></manifest>` tags:
+
+```xml
+<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+```
+
+Next, within the `<application></application>` tags, add:
 
 ```xml
 <service
@@ -18,6 +24,14 @@ After importing this plugin to your project as usual, add the following to your
 <receiver
     android:name="io.flutter.plugins.androidalarmmanager.AlarmBroadcastReceiver"
     android:exported="false"/>
+<receiver
+    android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
+    android:enabled="false">
+    <intent-filter>
+        <action android:name="android.intent.action.BOOT_COMPLETED"></action>
+    </intent-filter>
+</receiver>
+
 ```
 
 Then in Dart code add:
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
index 85637cf2e4dd..6d1d3a7b6086 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
@@ -18,16 +18,23 @@
 import io.flutter.view.FlutterNativeView;
 import io.flutter.view.FlutterRunArguments;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class AlarmService extends JobIntentService {
   public static final String TAG = "AlarmService";
-  private static final String SHARED_PREFERENCES_KEY = "io.flutter.android_alarm_manager_plugin";
   private static final String CALLBACK_HANDLE_KEY = "callback_handle";
+  private static final String PERSISTENT_ALARMS_SET_KEY = "persistent_alarm_ids";
+  private static final String SHARED_PREFERENCES_KEY = "io.flutter.android_alarm_manager_plugin";
   private static final int JOB_ID = 1984; // Random job ID.
+  private static final Object sPersistentAlarmsLock = new Object();
   private static AtomicBoolean sStarted = new AtomicBoolean(false);
   private static List<Intent> sAlarmQueue = Collections.synchronizedList(new LinkedList<Intent>());
   private static FlutterNativeView sBackgroundFlutterView;
@@ -168,7 +175,20 @@ private static void scheduleAlarm(
       boolean wakeup,
       long startMillis,
       long intervalMillis,
+      boolean rescheduleOnReboot,
       long callbackHandle) {
+    if (rescheduleOnReboot) {
+      addPersistentAlarm(
+          context,
+          requestCode,
+          repeating,
+          exact,
+          wakeup,
+          startMillis,
+          intervalMillis,
+          callbackHandle);
+    }
+
     // Create an Intent for the alarm and set the desired Dart callback handle.
     Intent alarm = new Intent(context, AlarmBroadcastReceiver.class);
     alarm.putExtra("callbackHandle", callbackHandle);
@@ -204,9 +224,19 @@ public static void setOneShot(
       boolean exact,
       boolean wakeup,
       long startMillis,
+      boolean rescheduleOnReboot,
       long callbackHandle) {
     final boolean repeating = false;
-    scheduleAlarm(context, requestCode, repeating, exact, wakeup, startMillis, 0, callbackHandle);
+    scheduleAlarm(
+        context,
+        requestCode,
+        repeating,
+        exact,
+        wakeup,
+        startMillis,
+        0,
+        rescheduleOnReboot,
+        callbackHandle);
   }
 
   public static void setPeriodic(
@@ -216,6 +246,7 @@ public static void setPeriodic(
       boolean wakeup,
       long startMillis,
       long intervalMillis,
+      boolean rescheduleOnReboot,
       long callbackHandle) {
     final boolean repeating = true;
     scheduleAlarm(
@@ -226,10 +257,15 @@ public static void setPeriodic(
         wakeup,
         startMillis,
         intervalMillis,
+        rescheduleOnReboot,
         callbackHandle);
   }
 
   public static void cancel(Context context, int requestCode) {
+    // Clear the alarm if it was set to be rescheduled after reboots.
+    clearPersistentAlarm(context, requestCode);
+
+    // Cancel the alarm with the system alarm service.
     Intent alarm = new Intent(context, AlarmBroadcastReceiver.class);
     PendingIntent existingIntent =
         PendingIntent.getBroadcast(context, requestCode, alarm, PendingIntent.FLAG_NO_CREATE);
@@ -240,4 +276,110 @@ public static void cancel(Context context, int requestCode) {
     AlarmManager manager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
     manager.cancel(existingIntent);
   }
+
+  private static String getPersistentAlarmKey(int requestCode) {
+    return "android_alarm_manager/persistent_alarm_" + Integer.toString(requestCode);
+  }
+
+  private static void addPersistentAlarm(
+      Context context,
+      int requestCode,
+      boolean repeating,
+      boolean exact,
+      boolean wakeup,
+      long startMillis,
+      long intervalMillis,
+      long callbackHandle) {
+    HashMap<String, Object> alarmSettings = new HashMap<>();
+    alarmSettings.put("repeating", repeating);
+    alarmSettings.put("exact", exact);
+    alarmSettings.put("wakeup", wakeup);
+    alarmSettings.put("startMillis", startMillis);
+    alarmSettings.put("intervalMillis", intervalMillis);
+    alarmSettings.put("callbackHandle", callbackHandle);
+    JSONObject obj = new JSONObject(alarmSettings);
+    String key = getPersistentAlarmKey(requestCode);
+    SharedPreferences p = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
+
+    synchronized (sPersistentAlarmsLock) {
+      Set<String> persistentAlarms = p.getStringSet(PERSISTENT_ALARMS_SET_KEY, null);
+      if (persistentAlarms == null) {
+        persistentAlarms = new HashSet<>();
+      }
+      if (persistentAlarms.isEmpty()) {
+        RebootBroadcastReceiver.enableRescheduleOnReboot(context);
+      }
+      persistentAlarms.add(Integer.toString(requestCode));
+      p.edit()
+          .putString(key, obj.toString())
+          .putStringSet(PERSISTENT_ALARMS_SET_KEY, persistentAlarms)
+          .commit();
+    }
+  }
+
+  private static void clearPersistentAlarm(Context context, int requestCode) {
+    SharedPreferences p = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
+    synchronized (sPersistentAlarmsLock) {
+      Set<String> persistentAlarms = p.getStringSet(PERSISTENT_ALARMS_SET_KEY, null);
+      if ((persistentAlarms == null) || !persistentAlarms.contains(requestCode)) {
+        return;
+      }
+      persistentAlarms.remove(requestCode);
+      String key = getPersistentAlarmKey(requestCode);
+      p.edit().remove(key).putStringSet(PERSISTENT_ALARMS_SET_KEY, persistentAlarms).commit();
+
+      if (persistentAlarms.isEmpty()) {
+        RebootBroadcastReceiver.disableRescheduleOnReboot(context);
+      }
+    }
+  }
+
+  public static void reschedulePersistentAlarms(Context context) {
+    synchronized (sPersistentAlarmsLock) {
+      SharedPreferences p = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
+      Set<String> persistentAlarms = p.getStringSet(PERSISTENT_ALARMS_SET_KEY, null);
+      // No alarms to reschedule.
+      if (persistentAlarms == null) {
+        return;
+      }
+
+      Iterator<String> it = persistentAlarms.iterator();
+      while (it.hasNext()) {
+        int requestCode = Integer.parseInt(it.next());
+        String key = getPersistentAlarmKey(requestCode);
+        String json = p.getString(key, null);
+        if (json == null) {
+          Log.e(
+              TAG, "Data for alarm request code " + Integer.toString(requestCode) + " is invalid.");
+          continue;
+        }
+        try {
+          JSONObject alarm = new JSONObject(json);
+          boolean repeating = alarm.getBoolean("repeating");
+          boolean exact = alarm.getBoolean("exact");
+          boolean wakeup = alarm.getBoolean("wakeup");
+          long startMillis = alarm.getLong("startMillis");
+          long intervalMillis = alarm.getLong("intervalMillis");
+          long callbackHandle = alarm.getLong("callbackHandle");
+          scheduleAlarm(
+              context,
+              requestCode,
+              repeating,
+              exact,
+              wakeup,
+              startMillis,
+              intervalMillis,
+              false,
+              callbackHandle);
+        } catch (JSONException e) {
+          Log.e(
+              TAG,
+              "Data for alarm request code "
+                  + Integer.toString(requestCode)
+                  + " is invalid: "
+                  + json);
+        }
+      }
+    }
+  }
 }
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
index b0060c146950..594ac35908c7 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
@@ -81,8 +81,10 @@ private void oneShot(JSONArray arguments) throws JSONException {
     boolean exact = arguments.getBoolean(1);
     boolean wakeup = arguments.getBoolean(2);
     long startMillis = arguments.getLong(3);
-    long callbackHandle = arguments.getLong(4);
-    AlarmService.setOneShot(mContext, requestCode, exact, wakeup, startMillis, callbackHandle);
+    boolean rescheduleOnReboot = arguments.getBoolean(4);
+    long callbackHandle = arguments.getLong(5);
+    AlarmService.setOneShot(
+        mContext, requestCode, exact, wakeup, startMillis, rescheduleOnReboot, callbackHandle);
   }
 
   private void periodic(JSONArray arguments) throws JSONException {
@@ -91,9 +93,17 @@ private void periodic(JSONArray arguments) throws JSONException {
     boolean wakeup = arguments.getBoolean(2);
     long startMillis = arguments.getLong(3);
     long intervalMillis = arguments.getLong(4);
-    long callbackHandle = arguments.getLong(5);
+    boolean rescheduleOnReboot = arguments.getBoolean(5);
+    long callbackHandle = arguments.getLong(6);
     AlarmService.setPeriodic(
-        mContext, requestCode, exact, wakeup, startMillis, intervalMillis, callbackHandle);
+        mContext,
+        requestCode,
+        exact,
+        wakeup,
+        startMillis,
+        intervalMillis,
+        rescheduleOnReboot,
+        callbackHandle);
   }
 
   private void cancel(JSONArray arguments) throws JSONException {
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/RebootBroadcastReceiver.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/RebootBroadcastReceiver.java
new file mode 100644
index 000000000000..91836ccbdaad
--- /dev/null
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/RebootBroadcastReceiver.java
@@ -0,0 +1,36 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.androidalarmmanager;
+
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.util.Log;
+
+public class RebootBroadcastReceiver extends BroadcastReceiver {
+  @Override
+  public void onReceive(Context context, Intent intent) {
+    if (intent.getAction().equals("android.intent.action.BOOT_COMPLETED")) {
+      Log.i("AlarmService", "Rescheduling after boot!");
+      AlarmService.reschedulePersistentAlarms(context);
+    }
+  }
+
+  public static void enableRescheduleOnReboot(Context context) {
+    scheduleOnReboot(context, PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+  }
+
+  public static void disableRescheduleOnReboot(Context context) {
+    scheduleOnReboot(context, PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
+  }
+
+  private static void scheduleOnReboot(Context context, int state) {
+    ComponentName receiver = new ComponentName(context, RebootBroadcastReceiver.class);
+    PackageManager pm = context.getPackageManager();
+    pm.setComponentEnabledSetting(receiver, state, PackageManager.DONT_KILL_APP);
+  }
+}
diff --git a/packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml b/packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml
index e1724dac19ad..862e20924a0d 100644
--- a/packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.flutter.plugins.androidalarmmanagerexample">
 
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
@@ -29,5 +30,12 @@
         <receiver
             android:name="io.flutter.plugins.androidalarmmanager.AlarmBroadcastReceiver"
             android:exported="false"/>
+        <receiver
+            android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"></action>
+            </intent-filter>
+        </receiver>
     </application>
 </manifest>
diff --git a/packages/android_alarm_manager/lib/android_alarm_manager.dart b/packages/android_alarm_manager/lib/android_alarm_manager.dart
index 36aba4e250b7..9354a1b34840 100644
--- a/packages/android_alarm_manager/lib/android_alarm_manager.dart
+++ b/packages/android_alarm_manager/lib/android_alarm_manager.dart
@@ -97,6 +97,10 @@ class AndroidAlarmManager {
   /// alarm fires. If `wakeup` is false (the default), the device will not be
   /// woken up to service the alarm.
   ///
+  /// If `rescheduleOnReboot` is passed as `true`, the alarm will be persisted
+  /// across reboots. If `rescheduleOnReboot` is false (the default), the alarm
+  /// will not be rescheduled after a reboot and will not be executed.
+  ///
   /// Returns a [Future] that resolves to `true` on success and `false` on
   /// failure.
   static Future<bool> oneShot(
@@ -105,6 +109,7 @@ class AndroidAlarmManager {
     dynamic Function() callback, {
     bool exact = false,
     bool wakeup = false,
+    bool rescheduleOnReboot = false,
   }) async {
     final int now = DateTime.now().millisecondsSinceEpoch;
     final int first = now + delay.inMilliseconds;
@@ -120,6 +125,7 @@ class AndroidAlarmManager {
       exact,
       wakeup,
       first,
+      rescheduleOnReboot,
       handle.toRawHandle(),
     ]);
     return (r == null) ? false : r;
@@ -145,6 +151,10 @@ class AndroidAlarmManager {
   /// alarm fires. If `wakeup` is false (the default), the device will not be
   /// woken up to service the alarm.
   ///
+  /// If `rescheduleOnReboot` is passed as `true`, the alarm will be persisted
+  /// across reboots. If `rescheduleOnReboot` is false (the default), the alarm
+  /// will not be rescheduled after a reboot and will not be executed.
+  ///
   /// Returns a [Future] that resolves to `true` on success and `false` on
   /// failure.
   static Future<bool> periodic(
@@ -153,6 +163,7 @@ class AndroidAlarmManager {
     dynamic Function() callback, {
     bool exact = false,
     bool wakeup = false,
+    bool rescheduleOnReboot = false,
   }) async {
     final int now = DateTime.now().millisecondsSinceEpoch;
     final int period = duration.inMilliseconds;
@@ -164,8 +175,15 @@ class AndroidAlarmManager {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
-    final dynamic r = await _channel.invokeMethod('Alarm.periodic',
-        <dynamic>[id, exact, wakeup, first, period, handle.toRawHandle()]);
+    final dynamic r = await _channel.invokeMethod('Alarm.periodic', <dynamic>[
+      id,
+      exact,
+      wakeup,
+      first,
+      period,
+      rescheduleOnReboot,
+      handle.toRawHandle()
+    ]);
     return (r == null) ? false : r;
   }
 
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index b12ab8c69563..5d3006a85aef 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -1,7 +1,7 @@
 name: android_alarm_manager
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.4.0
+version: 0.4.1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 

From d9495c9b83846618f9d3df9fc71316d0c2c82224 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Mon, 4 Feb 2019 16:22:33 -0800
Subject: [PATCH 099/410] Update NSNull check with directly checking the
 expected type.  (#1148)

---
 packages/webview_flutter/ios/Classes/FlutterWebView.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m
index b65899fdbae4..f8e16a22077d 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.m
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m
@@ -72,7 +72,7 @@ - (instancetype)initWithFrame:(CGRect)frame
     [self applySettings:settings];
 
     NSString* initialUrl = args[@"initialUrl"];
-    if (initialUrl && ![initialUrl isKindOfClass:[NSNull class]]) {
+    if ([initialUrl isKindOfClass:[NSString class]]) {
       [self loadUrl:initialUrl];
     }
   }

From ac2a88a19bbf7237c3c28c2d0d4ae1c684f2ccf0 Mon Sep 17 00:00:00 2001
From: davidair <davidair@users.noreply.github.com>
Date: Tue, 5 Feb 2019 14:09:12 -0500
Subject: [PATCH 100/410] Updating the example to match the new API (#1155)

---
 packages/firebase_auth/CHANGELOG.md | 4 ++++
 packages/firebase_auth/README.md    | 9 ++++++---
 packages/firebase_auth/pubspec.yaml | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index d4d9174a4a83..b3b2cff91f77 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.0+2
+
+* Update Google sign-in example in the README.
+
 ## 0.8.0+1
 
 * Update a broken dependency.
diff --git a/packages/firebase_auth/README.md b/packages/firebase_auth/README.md
index 9e08bff99deb..166d52475d83 100755
--- a/packages/firebase_auth/README.md
+++ b/packages/firebase_auth/README.md
@@ -61,12 +61,15 @@ final FirebaseAuth _auth = FirebaseAuth.instance;
 You can now use the Firebase `_auth` to authenticate in your Dart code, e.g.
 ```dart
 Future<FirebaseUser> _handleSignIn() async {
-  GoogleSignInAccount googleUser = await _googleSignIn.signIn();
-  GoogleSignInAuthentication googleAuth = await googleUser.authentication;
-  FirebaseUser user = await _auth.signInWithGoogle(
+  final GoogleSignInAccount googleUser = await _googleSignIn.signIn();
+  final GoogleSignInAuthentication googleAuth = await googleUser.authentication;
+
+  final AuthCredential credential = GoogleAuthProvider.getCredential(
     accessToken: googleAuth.accessToken,
     idToken: googleAuth.idToken,
   );
+  
+  final FirebaseUser user = await _auth.signInWithCredential(credential);
   print("signed in " + user.displayName);
   return user;
 }
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 84458354470c..8466b83c0b64 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.0+1"
+version: "0.8.0+2"
 
 flutter:
   plugin:

From f34a4e29db15b8181393791ccf4d44f5edd631c1 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Wed, 6 Feb 2019 10:55:19 -0800
Subject: [PATCH 101/410] Workaround to fix the camera positioning issue on the
 google map view (#1157)

A temporary workaround to fix the camera positioning issue mentioned in [flutter/flutter#24806](https://github.com/flutter/flutter/issues/24806)
A follow-up issue has been opened to track the 'real' fix.(https://github.com/flutter/flutter/issues/27550)
---
 packages/google_maps_flutter/CHANGELOG.md        |  4 ++++
 .../ios/Classes/GoogleMapController.m            | 16 ++++++++++++++++
 packages/google_maps_flutter/pubspec.yaml        |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 48a9093528ac..e274d3399c3b 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0+1
+
+* Fixed a bug which the camera is not positioned correctly at map initialization(temporary workaround)(https://github.com/flutter/flutter/issues/27550).
+
 ## 0.2.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index acd99fad984b..6fbcad81e149 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -49,6 +49,11 @@ @implementation FLTGoogleMapController {
   FlutterMethodChannel* _channel;
   BOOL _trackCameraPosition;
   NSObject<FlutterPluginRegistrar>* _registrar;
+  // Used for the temporary workaround for a bug that the camera is not properly positioned at
+  // initialization. https://github.com/flutter/flutter/issues/24806
+  // TODO(cyanglaz): Remove this temporary fix once the Maps SDK issue is resolved.
+  // https://github.com/flutter/flutter/issues/27550
+  BOOL _cameraDidInitialSetup;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -75,6 +80,7 @@ - (instancetype)initWithFrame:(CGRect)frame
     }];
     _mapView.delegate = weakSelf;
     _registrar = registrar;
+    _cameraDidInitialSetup = NO;
   }
   return self;
 }
@@ -217,6 +223,16 @@ - (void)mapView:(GMSMapView*)mapView willMove:(BOOL)gesture {
 }
 
 - (void)mapView:(GMSMapView*)mapView didChangeCameraPosition:(GMSCameraPosition*)position {
+  if (!_cameraDidInitialSetup) {
+    // We suspected a bug in the iOS Google Maps SDK caused the camera is not properly positioned at
+    // initialization. https://github.com/flutter/flutter/issues/24806
+    // This temporary workaround fix is provided while the actual fix in the Google Maps SDK is
+    // still being investigated.
+    // TODO(cyanglaz): Remove this temporary fix once the Maps SDK issue is resolved.
+    // https://github.com/flutter/flutter/issues/27550
+    _cameraDidInitialSetup = YES;
+    [mapView moveCamera:[GMSCameraUpdate setCamera:_mapView.camera]];
+  }
   if (_trackCameraPosition) {
     [_channel invokeMethod:@"camera#onMove" arguments:@{@"position" : positionToJson(position)}];
   }
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index a581265191bd..af96fda7adfc 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.2.0
+version: 0.2.0+1
 
 dependencies:
   flutter:

From a100fbf92610e7e82bc217aed2e83dcbdf3d35fd Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Wed, 6 Feb 2019 13:57:06 -0800
Subject: [PATCH 102/410] Expose nslocale and expose currencySymbol instead of
 currencyCode to match android (#1162)

---
 .../ios/in_app_purchase_pluginTests/Stubs.m   |  4 +-
 .../TranslatorTest.m                          | 11 ++++-
 .../ios/Classes/FIAObjectTranslator.h         |  6 +++
 .../ios/Classes/FIAObjectTranslator.m         | 31 +++++++-----
 .../sku_details_wrapper.g.dart                | 37 ++++++++++++--
 .../sk_product_wrapper.dart                   | 49 ++++++++++++-------
 .../sk_product_wrapper.g.dart                 | 12 ++++-
 .../store_kit_wrappers/sk_product_test.dart   | 26 +++++++---
 .../store_kit_wrappers/sk_request_test.dart   | 15 +++---
 9 files changed, 140 insertions(+), 51 deletions(-)

diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
index e7a30e11b93f..a3b08e26342e 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
@@ -23,7 +23,7 @@ - (instancetype)initWithMap:(NSDictionary *)map {
   self = [super init];
   if (self) {
     [self setValue:map[@"price"] ?: [NSNull null] forKey:@"price"];
-    NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"];
+    NSLocale *locale = NSLocale.systemLocale;
     [self setValue:locale ?: [NSNull null] forKey:@"priceLocale"];
     [self setValue:map[@"numberOfPeriods"] ?: @(0) forKey:@"numberOfPeriods"];
     SKProductSubscriptionPeriodStub *subscriptionPeriodSub =
@@ -46,7 +46,7 @@ - (instancetype)initWithMap:(NSDictionary *)map {
     [self setValue:map[@"localizedTitle"] ?: [NSNull null] forKey:@"localizedTitle"];
     [self setValue:map[@"downloadable"] ?: @NO forKey:@"downloadable"];
     [self setValue:map[@"price"] ?: [NSNull null] forKey:@"price"];
-    NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"];
+    NSLocale *locale = NSLocale.systemLocale;
     [self setValue:locale ?: [NSNull null] forKey:@"priceLocale"];
     [self setValue:map[@"downloadContentLengths"] ?: @(0) forKey:@"downloadContentLengths"];
     SKProductSubscriptionPeriodStub *period =
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
index fa4cd1700daf..10bf67f5a364 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
@@ -12,6 +12,7 @@ @interface TranslatorTest : XCTestCase
 @property(strong, nonatomic) NSDictionary *discountMap;
 @property(strong, nonatomic) NSDictionary *productMap;
 @property(strong, nonatomic) NSDictionary *productResponseMap;
+@property(strong, nonatomic) NSDictionary *localeMap;
 
 @end
 
@@ -21,14 +22,14 @@ - (void)setUp {
   self.periodMap = @{@"numberOfUnits" : @(0), @"unit" : @(0)};
   self.discountMap = @{
     @"price" : @1.0,
-    @"currencyCode" : @"USD",
+    @"priceLocale" : [NSLocale.systemLocale toMap],
     @"numberOfPeriods" : @1,
     @"subscriptionPeriod" : self.periodMap,
     @"paymentMode" : @1
   };
   self.productMap = @{
     @"price" : @1.0,
-    @"currencyCode" : @"USD",
+    @"priceLocale" : [NSLocale.systemLocale toMap],
     @"productIdentifier" : @"123",
     @"localizedTitle" : @"title",
     @"localizedDescription" : @"des",
@@ -69,4 +70,10 @@ - (void)testProductResponseToMap {
   XCTAssertEqualObjects(map, self.productResponseMap);
 }
 
+- (void)testLocaleToMap {
+  NSLocale *system = NSLocale.systemLocale;
+  NSDictionary *map = [system toMap];
+  XCTAssertEqualObjects(map[@"currencySymbol"], system.currencySymbol);
+}
+
 @end
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
index 260dc15ab3fe..77c4bd89a77d 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
@@ -31,4 +31,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface NSLocale (Coder)
+
+- (nullable NSDictionary *)toMap;
+
+@end
+
 NS_ASSUME_NONNULL_END
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
index 277dc1fcd235..d8b98448233e 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
@@ -19,12 +19,10 @@ - (NSDictionary *)toMap {
     @"downloadContentVersion" : self.downloadContentVersion ?: [NSNull null]
 
   }];
-  if (@available(iOS 10.0, *)) {
-    // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this
-    // expanded to a map. Matching android to only get the currencyCode for now.
-    // https://github.com/flutter/flutter/issues/26610
-    [map setObject:self.priceLocale.currencyCode ?: [NSNull null] forKey:@"currencyCode"];
-  }
+  // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this
+  // expanded to a map. Matching android to only get the currencySymbol for now.
+  // https://github.com/flutter/flutter/issues/26610
+  [map setObject:[self.priceLocale toMap] ?: [NSNull null] forKey:@"priceLocale"];
   if (@available(iOS 11.2, *)) {
     [map setObject:[self.subscriptionPeriod toMap] ?: [NSNull null] forKey:@"subscriptionPeriod"];
   }
@@ -58,12 +56,10 @@ - (NSDictionary *)toMap {
     @"paymentMode" : @(self.paymentMode)
   }];
 
-  if (@available(iOS 10.0, *)) {
-    // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this
-    // expanded to a map. Matching android to only get the currencyCode for now.
-    // https://github.com/flutter/flutter/issues/26610
-    [map setObject:self.priceLocale.currencyCode ?: [NSNull null] forKey:@"currencyCode"];
-  }
+  // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this
+  // expanded to a map. Matching android to only get the currencySymbol for now.
+  // https://github.com/flutter/flutter/issues/26610
+  [map setObject:[self.priceLocale toMap] ?: [NSNull null] forKey:@"priceLocale"];
   return map;
 }
 
@@ -83,3 +79,14 @@ - (NSDictionary *)toMap {
 }
 
 @end
+
+@implementation NSLocale (Coder)
+
+- (nullable NSDictionary *)toMap {
+  NSMutableDictionary *map = [[NSMutableDictionary alloc] init];
+  [map setObject:[self objectForKey:NSLocaleCurrencySymbol] ?: [NSNull null]
+          forKey:@"currencySymbol"];
+  return map;
+}
+
+@end
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
index 631cd15c22e1..1c6ab07ce9b0 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
@@ -20,15 +20,46 @@ SkuDetailsWrapper _$SkuDetailsWrapperFromJson(Map json) {
       sku: json['sku'] as String,
       subscriptionPeriod: json['subscriptionPeriod'] as String,
       title: json['title'] as String,
-      type: const SkuTypeConverter().fromJson(json['type'] as String),
+      type: _$enumDecode(_$SkuTypeEnumMap, json['type']),
       isRewarded: json['isRewarded'] as bool);
 }
 
+T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    throw ArgumentError('A value must be provided. Supported values: '
+        '${enumValues.values.join(', ')}');
+  }
+  return enumValues.entries
+      .singleWhere((e) => e.value == source,
+          orElse: () => throw ArgumentError(
+              '`$source` is not one of the supported values: '
+              '${enumValues.values.join(', ')}'))
+      .key;
+}
+
+const _$SkuTypeEnumMap = <SkuType, dynamic>{
+  SkuType.inapp: 'inapp',
+  SkuType.subs: 'subs'
+};
+
 SkuDetailsResponseWrapper _$SkuDetailsResponseWrapperFromJson(Map json) {
   return SkuDetailsResponseWrapper(
-      responseCode: const BillingResponseConverter()
-          .fromJson(json['responseCode'] as int),
+      responseCode:
+          _$enumDecode(_$BillingResponseEnumMap, json['responseCode']),
       skuDetailsList: (json['skuDetailsList'] as List)
           .map((e) => SkuDetailsWrapper.fromJson(e as Map))
           .toList());
 }
+
+const _$BillingResponseEnumMap = <BillingResponse, dynamic>{
+  BillingResponse.featureNotSupported: -2,
+  BillingResponse.ok: 0,
+  BillingResponse.userCanceled: 1,
+  BillingResponse.serviceUnavailable: 2,
+  BillingResponse.billingUnavailable: 3,
+  BillingResponse.itemUnavailable: 4,
+  BillingResponse.developerError: 5,
+  BillingResponse.error: 6,
+  BillingResponse.itemAlreadyOwned: 7,
+  BillingResponse.itemNotOwned: 8
+};
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
index 110a03f5d2e4..7b09fd1acce6 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
@@ -107,14 +107,12 @@ enum ProductDiscountPaymentMode {
 
 /// Dart wrapper around StoreKit's [SKProductDiscount](https://developer.apple.com/documentation/storekit/skproductdiscount?language=objc).
 ///
-/// Most of the fields are identical to OBJC SKProduct.
-/// The only difference is instead of the locale object, we only exposed currencyCode for simplicity.
 /// It is used as a property in [SKProductWrapper].
 @JsonSerializable(nullable: true)
 class SKProductDiscountWrapper {
   SKProductDiscountWrapper(
       {@required this.price,
-      @required this.currencyCode,
+      @required this.priceLocale,
       @required this.numberOfPeriods,
       @required this.paymentMode,
       @required this.subscriptionPeriod});
@@ -128,14 +126,11 @@ class SKProductDiscountWrapper {
     return _$SKProductDiscountWrapperFromJson(map);
   }
 
-  /// The discounted price, in the currency that is defined in [currencyCode].
+  /// The discounted price, in the currency that is defined in [priceLocale].
   final double price;
 
-  // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this expanded to
-  //                 a map. Matching android to only get the currencyCode for now.
-  //                 https://github.com/flutter/flutter/issues/26610
-  /// The currencyCode for the [price], e.g USD for U.S. dollars.
-  final String currencyCode;
+  /// Includes locale information about the price, e.g. `$` as the currency symbol for US locale.
+  final PriceLocaleWrapper priceLocale;
 
   /// The object represent the discount period length.
   ///
@@ -154,8 +149,6 @@ class SKProductDiscountWrapper {
 
 /// Dart wrapper around StoreKit's [SKProduct](https://developer.apple.com/documentation/storekit/skproduct?language=objc).
 ///
-/// Most of the fields are identical to OBJC SKProduct.
-/// The only difference is instead of the locale object, we only exposed currencyCode for simplicity.
 /// A list of [SKProductWrapper] is returned in the [SKRequestMaker.startProductRequest] method, and
 /// should be stored for use when making a payment.
 @JsonSerializable(nullable: true)
@@ -164,7 +157,7 @@ class SKProductWrapper {
     @required this.productIdentifier,
     @required this.localizedTitle,
     @required this.localizedDescription,
-    @required this.currencyCode,
+    @required this.priceLocale,
     @required this.downloadContentVersion,
     @required this.subscriptionGroupIdentifier,
     @required this.price,
@@ -196,11 +189,8 @@ class SKProductWrapper {
   /// It is localized based on the current locale.
   final String localizedDescription;
 
-  // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this expanded to
-  //                 a map. Matching android to only get the currencyCode for now.
-  //                 https://github.com/flutter/flutter/issues/26610
-  /// The currencyCode for the price, e.g USD for U.S. dollars.
-  final String currencyCode;
+  /// Includes locale information about the price, e.g. `$` as the currency symbol for US locale.
+  final PriceLocaleWrapper priceLocale;
 
   /// The version of the downloadable content.
   ///
@@ -214,7 +204,7 @@ class SKProductWrapper {
   /// Check [SubscriptionGroup](https://developer.apple.com/app-store/subscriptions/) for more details about subscription group.
   final String subscriptionGroupIdentifier;
 
-  /// The price of the product, in the currency that is defined in [currencyCode].
+  /// The price of the product, in the currency that is defined in [priceLocale].
   final double price;
 
   /// Whether the AppStore has downloadable content for this product.
@@ -242,3 +232,26 @@ class SKProductWrapper {
   /// and their units and duration do not have to be matched.
   final SKProductDiscountWrapper introductoryPrice;
 }
+
+/// Object that indicates the locale of the price
+///
+/// It is a thin wrapper of [NSLocale](https://developer.apple.com/documentation/foundation/nslocale?language=objc).
+// TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this expanded.
+//                 Matching android to only get the currencySymbol for now.
+//                 https://github.com/flutter/flutter/issues/26610
+@JsonSerializable()
+class PriceLocaleWrapper {
+  PriceLocaleWrapper({@required this.currencySymbol});
+
+  /// Constructing an instance from a map from the Objective-C layer.
+  ///
+  /// This method should only be used with `map` values returned by [SKProductWrapper.fromJson] and [SKProductDiscountWrapper.fromJson].
+  /// The `map` parameter must not be null.
+  factory PriceLocaleWrapper.fromJson(Map map) {
+    assert(map != null);
+    return _$PriceLocaleWrapperFromJson(map);
+  }
+
+  ///The currency symbol for the locale, e.g. $ for US locale.
+  final String currencySymbol;
+}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
index 8799d65f61f7..52467266d948 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
@@ -54,7 +54,9 @@ const _$SubscriptionPeriodUnitEnumMap = <SubscriptionPeriodUnit, dynamic>{
 SKProductDiscountWrapper _$SKProductDiscountWrapperFromJson(Map json) {
   return SKProductDiscountWrapper(
       price: (json['price'] as num)?.toDouble(),
-      currencyCode: json['currencyCode'] as String,
+      priceLocale: json['priceLocale'] == null
+          ? null
+          : PriceLocaleWrapper.fromJson(json['priceLocale'] as Map),
       numberOfPeriods: json['numberOfPeriods'] as int,
       paymentMode: _$enumDecodeNullable(
           _$ProductDiscountPaymentModeEnumMap, json['paymentMode']),
@@ -76,7 +78,9 @@ SKProductWrapper _$SKProductWrapperFromJson(Map json) {
       productIdentifier: json['productIdentifier'] as String,
       localizedTitle: json['localizedTitle'] as String,
       localizedDescription: json['localizedDescription'] as String,
-      currencyCode: json['currencyCode'] as String,
+      priceLocale: json['priceLocale'] == null
+          ? null
+          : PriceLocaleWrapper.fromJson(json['priceLocale'] as Map),
       downloadContentVersion: json['downloadContentVersion'] as String,
       subscriptionGroupIdentifier:
           json['subscriptionGroupIdentifier'] as String,
@@ -94,3 +98,7 @@ SKProductWrapper _$SKProductWrapperFromJson(Map json) {
           : SKProductDiscountWrapper.fromJson(
               json['introductoryPrice'] as Map));
 }
+
+PriceLocaleWrapper _$PriceLocaleWrapperFromJson(Map json) {
+  return PriceLocaleWrapper(currencySymbol: json['currencySymbol'] as String);
+}
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
index f691e7a73a18..df3695ad1fda 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
@@ -6,13 +6,16 @@ import 'package:test/test.dart';
 import 'package:in_app_purchase/src/store_kit_wrappers/sk_product_wrapper.dart';
 
 void main() {
+  final Map<String, dynamic> localeMap = <String, dynamic>{
+    'currencySymbol': '\$'
+  };
   final Map<String, dynamic> subMap = <String, dynamic>{
     'numberOfUnits': 1,
     'unit': 2
   };
   final Map<String, dynamic> discountMap = <String, dynamic>{
     'price': 1.0,
-    'currencyCode': 'USD',
+    'priceLocale': localeMap,
     'numberOfPeriods': 1,
     'paymentMode': 2,
     'subscriptionPeriod': subMap,
@@ -21,7 +24,7 @@ void main() {
     'productIdentifier': 'id',
     'localizedTitle': 'title',
     'localizedDescription': 'description',
-    'currencyCode': 'USD',
+    'priceLocale': localeMap,
     'downloadContentVersion': 'version',
     'subscriptionGroupIdentifier': 'com.group',
     'price': 1.0,
@@ -37,6 +40,11 @@ void main() {
   };
 
   group('product request wrapper test', () {
+    void testMatchLocale(
+        PriceLocaleWrapper wrapper, Map<String, dynamic> localeMap) {
+      expect(wrapper.currencySymbol, localeMap['currencySymbol']);
+    }
+
     test(
         'SKProductSubscriptionPeriodWrapper should have property values consistent with map',
         () {
@@ -61,7 +69,7 @@ void main() {
       final SKProductDiscountWrapper wrapper =
           SKProductDiscountWrapper.fromJson(discountMap);
       expect(wrapper.price, discountMap['price']);
-      expect(wrapper.currencyCode, discountMap['currencyCode']);
+      testMatchLocale(wrapper.priceLocale, discountMap['priceLocale']);
       expect(wrapper.numberOfPeriods, discountMap['numberOfPeriods']);
       expect(wrapper.paymentMode,
           ProductDiscountPaymentMode.values[discountMap['paymentMode']]);
@@ -79,7 +87,7 @@ void main() {
       final SKProductDiscountWrapper wrapper =
           SKProductDiscountWrapper.fromJson(<String, dynamic>{});
       expect(wrapper.price, null);
-      expect(wrapper.currencyCode, null);
+      expect(wrapper.priceLocale, null);
       expect(wrapper.numberOfPeriods, null);
       expect(wrapper.paymentMode, null);
       expect(wrapper.subscriptionPeriod, null);
@@ -89,8 +97,8 @@ void main() {
         SKProductWrapper wrapper, Map<String, dynamic> productMap) {
       expect(wrapper.productIdentifier, productMap['productIdentifier']);
       expect(wrapper.localizedTitle, productMap['localizedTitle']);
+      testMatchLocale(wrapper.priceLocale, productMap['priceLocale']);
       expect(wrapper.localizedDescription, productMap['localizedDescription']);
-      expect(wrapper.currencyCode, productMap['currencyCode']);
       expect(
           wrapper.downloadContentVersion, productMap['downloadContentVersion']);
       expect(wrapper.subscriptionGroupIdentifier,
@@ -121,6 +129,7 @@ void main() {
               .values[productMap['subscriptionPeriod']['unit']]);
       expect(wrapper.subscriptionPeriod.numberOfUnits,
           productMap['subscriptionPeriod']['numberOfUnits']);
+      expect(wrapper.price, discountMap['price']);
     }
 
     test('SKProductWrapper should have property values consistent with map',
@@ -136,7 +145,7 @@ void main() {
       expect(wrapper.productIdentifier, null);
       expect(wrapper.localizedTitle, null);
       expect(wrapper.localizedDescription, null);
-      expect(wrapper.currencyCode, null);
+      expect(wrapper.priceLocale, null);
       expect(wrapper.downloadContentVersion, null);
       expect(wrapper.subscriptionGroupIdentifier, null);
       expect(wrapper.price, null);
@@ -163,5 +172,10 @@ void main() {
       expect(wrapper.products.length, 0);
       expect(wrapper.invalidProductIdentifiers.length, 0);
     });
+
+    test('LocaleWrapper should have property values consistent with map', () {
+      final PriceLocaleWrapper wrapper = PriceLocaleWrapper.fromJson(localeMap);
+      testMatchLocale(wrapper, localeMap);
+    });
   });
 }
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
index a03e056f45f1..2db357355889 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
@@ -11,13 +11,16 @@ import '../stub_in_app_purchase_platform.dart';
 void main() {
   final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
 
+  final Map<String, dynamic> localeMap = <String, dynamic>{
+    'currencySymbol': '\$'
+  };
   final Map<String, dynamic> subMap = <String, dynamic>{
     'numberOfUnits': 1,
     'unit': 2
   };
   final Map<String, dynamic> discountMap = <String, dynamic>{
     'price': 1.0,
-    'currencyCode': 'USD',
+    'priceLocale': localeMap,
     'numberOfPeriods': 1,
     'paymentMode': 2,
     'subscriptionPeriod': subMap,
@@ -26,7 +29,7 @@ void main() {
     'productIdentifier': 'id',
     'localizedTitle': 'title',
     'localizedDescription': 'description',
-    'currencyCode': 'USD',
+    'priceLocale': localeMap,
     'downloadContentVersion': 'version',
     'subscriptionGroupIdentifier': 'com.group',
     'price': 1.0,
@@ -57,12 +60,12 @@ void main() {
         isNotEmpty,
       );
       expect(
-        response.products.first.currencyCode,
-        'USD',
+        response.products.first.priceLocale.currencySymbol,
+        '\$',
       );
       expect(
-        response.products.first.currencyCode,
-        isNot('USDA'),
+        response.products.first.priceLocale.currencySymbol,
+        isNot('A'),
       );
       expect(
         response.invalidProductIdentifiers,

From 09a5a36e08ce20e52f789776dc38cc3eba858298 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Wed, 6 Feb 2019 17:40:45 -0800
Subject: [PATCH 103/410] IAP add payment translators in objc (#1126)

---
 packages/firebase_auth/CHANGELOG.md           |  4 -
 packages/firebase_auth/README.md              |  9 +-
 packages/firebase_auth/pubspec.yaml           |  2 +-
 .../ios/in_app_purchase_pluginTests/Stubs.h   | 17 ++++
 .../ios/in_app_purchase_pluginTests/Stubs.m   | 67 +++++++++++++
 .../TranslatorTest.m                          | 98 +++++++++++++++++++
 .../ios/Classes/FIAObjectTranslator.h         | 30 ++++++
 .../ios/Classes/FIAObjectTranslator.m         | 94 ++++++++++++++++++
 8 files changed, 310 insertions(+), 11 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index b3b2cff91f77..d4d9174a4a83 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 0.8.0+2
-
-* Update Google sign-in example in the README.
-
 ## 0.8.0+1
 
 * Update a broken dependency.
diff --git a/packages/firebase_auth/README.md b/packages/firebase_auth/README.md
index 166d52475d83..9e08bff99deb 100755
--- a/packages/firebase_auth/README.md
+++ b/packages/firebase_auth/README.md
@@ -61,15 +61,12 @@ final FirebaseAuth _auth = FirebaseAuth.instance;
 You can now use the Firebase `_auth` to authenticate in your Dart code, e.g.
 ```dart
 Future<FirebaseUser> _handleSignIn() async {
-  final GoogleSignInAccount googleUser = await _googleSignIn.signIn();
-  final GoogleSignInAuthentication googleAuth = await googleUser.authentication;
-
-  final AuthCredential credential = GoogleAuthProvider.getCredential(
+  GoogleSignInAccount googleUser = await _googleSignIn.signIn();
+  GoogleSignInAuthentication googleAuth = await googleUser.authentication;
+  FirebaseUser user = await _auth.signInWithGoogle(
     accessToken: googleAuth.accessToken,
     idToken: googleAuth.idToken,
   );
-  
-  final FirebaseUser user = await _auth.signInWithCredential(credential);
   print("signed in " + user.displayName);
   return user;
 }
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 8466b83c0b64..84458354470c 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.0+2"
+version: "0.8.0+1"
 
 flutter:
   plugin:
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
index 0756ef266f00..e194e450a33e 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
@@ -31,4 +31,21 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface InAppPurchasePluginStub : InAppPurchasePlugin
 @end
+
+@interface SKPaymentTransactionStub : SKPaymentTransaction
+- (instancetype)initWithMap:(NSDictionary *)map;
+@end
+
+@interface SKDownloadStub : SKDownload
+- (instancetype)initWithMap:(NSDictionary *)map;
+@end
+
+@interface SKMutablePaymentStub : SKMutablePayment
+- (instancetype)initWithMap:(NSDictionary *)map;
+@end
+
+@interface NSErrorStub : NSError
+- (instancetype)initWithMap:(NSDictionary *)map;
+@end
+
 NS_ASSUME_NONNULL_END
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
index a3b08e26342e..39defa632c06 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
@@ -129,3 +129,70 @@ - (SKProductRequestStub *)getProductRequestWithIdentifiers:(NSSet *)identifiers
 }
 
 @end
+
+@implementation SKPaymentTransactionStub
+
+- (instancetype)initWithID:(NSString *)identifier {
+  self = [super init];
+  if (self) {
+    [self setValue:identifier forKey:@"transactionIdentifier"];
+  }
+  return self;
+}
+
+- (instancetype)initWithMap:(NSDictionary *)map {
+  self = [super init];
+  if (self) {
+    [self setValue:map[@"transactionIdentifier"] forKey:@"transactionIdentifier"];
+    [self setValue:map[@"transactionState"] forKey:@"transactionState"];
+    if (map[@"originalTransaction"] && !
+                                       [map[@"originalTransaction"] isKindOfClass:[NSNull class]]) {
+      [self setValue:[[SKPaymentTransactionStub alloc] initWithMap:map[@"originalTransaction"]]
+              forKey:@"originalTransaction"];
+    }
+    [self setValue:map[@"error"] ? [[NSErrorStub alloc] initWithMap:map[@"error"]] : [NSNull null]
+            forKey:@"error"];
+    [self setValue:[NSDate dateWithTimeIntervalSince1970:[map[@"transactionTimeStamp"] doubleValue]]
+            forKey:@"transactionDate"];
+    NSMutableArray *downloads = [NSMutableArray new];
+    for (NSDictionary *downloadMap in map[@"downloads"]) {
+      [downloads addObject:[[SKDownloadStub alloc] initWithMap:downloadMap]];
+    }
+    [self setValue:downloads forKey:@"downloads"];
+  }
+  return self;
+}
+
+@end
+
+@implementation SKDownloadStub
+
+- (instancetype)initWithMap:(NSDictionary *)map {
+  self = [super init];
+  if (self) {
+    [self setValue:map[@"state"] forKey:@"downloadState"];
+    [self setValue:map[@"contentIdentifier"] ?: [NSNull null] forKey:@"contentIdentifier"];
+    [self setValue:map[@"contentLength"] ?: [NSNull null] forKey:@"contentLength"];
+    [self setValue:[NSURL URLWithString:map[@"contentURL"]] ?: [NSNull null] forKey:@"contentURL"];
+    [self setValue:map[@"error"] ? [[NSErrorStub alloc] initWithMap:map[@"error"]] : [NSNull null]
+            forKey:@"error"];
+    [self setValue:map[@"progress"] ?: [NSNull null] forKey:@"progress"];
+    [self setValue:map[@"timeRemaining"] ?: [NSNull null] forKey:@"timeRemaining"];
+    [self setValue:[[SKPaymentTransactionStub alloc] initWithID:map[@"transactionID"]]
+                       ?: [NSNull null]
+            forKey:@"transaction"];
+  }
+  return self;
+}
+
+@end
+
+@implementation NSErrorStub
+
+- (instancetype)initWithMap:(NSDictionary *)map {
+  return [self initWithDomain:[map objectForKey:@"domain"]
+                         code:[[map objectForKey:@"code"] integerValue]
+                     userInfo:[map objectForKey:@"userInfo"]];
+}
+
+@end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
index 10bf67f5a364..9864d335ed99 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
@@ -12,6 +12,10 @@ @interface TranslatorTest : XCTestCase
 @property(strong, nonatomic) NSDictionary *discountMap;
 @property(strong, nonatomic) NSDictionary *productMap;
 @property(strong, nonatomic) NSDictionary *productResponseMap;
+@property(strong, nonatomic) NSDictionary *downloadMap;
+@property(strong, nonatomic) NSDictionary *paymentMap;
+@property(strong, nonatomic) NSDictionary *transactionMap;
+@property(strong, nonatomic) NSDictionary *errorMap;
 @property(strong, nonatomic) NSDictionary *localeMap;
 
 @end
@@ -42,6 +46,72 @@ - (void)setUp {
   };
   self.productResponseMap =
       @{@"products" : @[ self.productMap ], @"invalidProductIdentifiers" : @[]};
+  self.downloadMap = @{
+    @"state" : @(0),
+    @"contentIdentifier" : [NSNull null],
+    @"contentLength" : @(2),
+    @"contentURL" : @"https://flutter.io",
+    @"contentVersion" : [NSNull null],
+    @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+    @"progress" : @(0.5),
+    @"timeRemaining" : @(100),
+    @"downloadTimeUnKnown" : @(NO),
+    @"transactionID" : [NSNull null],
+  };
+  self.paymentMap = @{
+    @"productIdentifier" : @"123",
+    @"requestData" : @"abcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefgh",
+    @"quantity" : @(2),
+    @"applicationUsername" : @"app user name",
+    @"simulatesAskToBuyInSandbox" : @(NO)
+  };
+  NSDictionary *originalTransactionMap = @{
+    @"transactionIdentifier" : @"567",
+    @"transactionState" : @(SKPaymentTransactionStatePurchasing),
+    @"payment" : [NSNull null],
+    @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+    @"transactionTimeStamp" : @([NSDate date].timeIntervalSince1970),
+    @"originalTransaction" : [NSNull null],
+    @"downloads" : @[ @{
+      @"state" : @(0),
+      @"contentIdentifier" : [NSNull null],
+      @"contentLength" : @(2),
+      @"contentURL" : @"https://flutter.io",
+      @"contentVersion" : [NSNull null],
+      @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+      @"progress" : @(0.5),
+      @"timeRemaining" : @(100),
+      @"downloadTimeUnKnown" : @(NO),
+      @"transactionID" : @"567",
+    } ]
+  };
+  self.transactionMap = @{
+    @"transactionIdentifier" : @"567",
+    @"transactionState" : @(SKPaymentTransactionStatePurchasing),
+    @"payment" : [NSNull null],
+    @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+    @"transactionTimeStamp" : @([NSDate date].timeIntervalSince1970),
+    @"originalTransaction" : originalTransactionMap,
+    @"downloads" : @[ @{
+      @"state" : @(0),
+      @"contentIdentifier" : [NSNull null],
+      @"contentLength" : @(2),
+      @"contentURL" : @"https://flutter.io",
+      @"contentVersion" : [NSNull null],
+      @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+      @"progress" : @(0.5),
+      @"timeRemaining" : @(100),
+      @"downloadTimeUnKnown" : @(NO),
+      @"transactionID" : @"567",
+    } ]
+  };
+  self.errorMap = @{
+    @"code" : @(123),
+    @"domain" : @"test_domain",
+    @"userInfo" : @{
+      @"key" : @"value",
+    }
+  };
 }
 
 - (void)testSKProductSubscriptionPeriodStubToMap {
@@ -70,6 +140,34 @@ - (void)testProductResponseToMap {
   XCTAssertEqualObjects(map, self.productResponseMap);
 }
 
+- (void)testDownloadToMap {
+  // bug with state, downloadTimeUnKnown, transaction and contentIdentifer in KVC, cannot test these
+  // fields.
+  SKDownloadStub *download = [[SKDownloadStub alloc] initWithMap:self.downloadMap];
+  NSDictionary *map = [download toMap];
+  XCTAssertEqualObjects(map, self.downloadMap);
+}
+
+- (void)testPaymentToMap {
+  SKMutablePayment *payment = [[SKMutablePayment alloc] initWithMap:self.paymentMap];
+  NSDictionary *map = [payment toMap];
+  XCTAssertEqualObjects(map, self.paymentMap);
+}
+
+- (void)testPaymentTransactionToMap {
+  // payment is not KVC, cannot test payment field.
+  SKPaymentTransactionStub *paymentTransaction =
+      [[SKPaymentTransactionStub alloc] initWithMap:self.transactionMap];
+  NSDictionary *map = [paymentTransaction toMap];
+  XCTAssertEqualObjects(map, self.transactionMap);
+}
+
+- (void)testError {
+  NSErrorStub *error = [[NSErrorStub alloc] initWithMap:self.errorMap];
+  NSDictionary *map = [error toMap];
+  XCTAssertEqualObjects(map, self.errorMap);
+}
+
 - (void)testLocaleToMap {
   NSLocale *system = NSLocale.systemLocale;
   NSDictionary *map = [system toMap];
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
index 77c4bd89a77d..ce05ad0d23e6 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
@@ -31,6 +31,36 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface SKPayment (Coder)
+
+- (NSDictionary *)toMap;
+
+@end
+
+@interface SKMutablePayment (Coder)
+
+- (instancetype)initWithMap:(NSDictionary *)map;
+
+@end
+
+@interface SKPaymentTransaction (Coder)
+
+- (NSDictionary *)toMap;
+
+@end
+
+@interface SKDownload (Coder)
+
+- (NSDictionary *)toMap;
+
+@end
+
+@interface NSError (Coder)
+
+- (NSDictionary *)toMap;
+
+@end
+
 @interface NSLocale (Coder)
 
 - (nullable NSDictionary *)toMap;
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
index d8b98448233e..d142c7bc7902 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
@@ -80,6 +80,25 @@ - (NSDictionary *)toMap {
 
 @end
 
+@implementation SKPayment (Coder)
+
+- (NSDictionary *)toMap {
+  NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
+    @"productIdentifier" : self.productIdentifier ?: [NSNull null],
+    @"requestData" : self.requestData ? [[NSString alloc] initWithData:self.requestData
+                                                              encoding:NSUTF8StringEncoding]
+                                      : [NSNull null],
+    @"quantity" : @(self.quantity),
+    @"applicationUsername" : self.applicationUsername ?: [NSNull null]
+  }];
+  if (@available(iOS 8.3, *)) {
+    [map setObject:@(self.simulatesAskToBuyInSandbox) forKey:@"simulatesAskToBuyInSandbox"];
+  }
+  return map;
+}
+
+@end
+
 @implementation NSLocale (Coder)
 
 - (nullable NSDictionary *)toMap {
@@ -90,3 +109,78 @@ - (nullable NSDictionary *)toMap {
 }
 
 @end
+
+@implementation SKMutablePayment (Coder)
+
+- (instancetype)initWithMap:(NSDictionary *)map {
+  self = [self init];
+  if (self) {
+    self.productIdentifier = map[@"productIdentifier"];
+    NSString *utf8String = map[@"requestData"];
+    self.requestData = [utf8String dataUsingEncoding:NSUTF8StringEncoding];
+    self.quantity = [map[@"quantity"] integerValue];
+    self.applicationUsername = map[@"applicationUsername"];
+    if (@available(iOS 8.3, *)) {
+      self.simulatesAskToBuyInSandbox = [map[@"simulatesAskToBuyInSandbox"] boolValue];
+    }
+  }
+  return self;
+}
+
+@end
+
+@implementation SKPaymentTransaction (Coder)
+
+- (NSDictionary *)toMap {
+  NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
+    @"error" : [self.error toMap] ?: [NSNull null],
+    @"payment" : self.payment ? [self.payment toMap] : [NSNull null],
+    @"originalTransaction" : self.originalTransaction ? [self.originalTransaction toMap]
+                                                      : [NSNull null],
+    @"transactionTimeStamp" : self.transactionDate ? @(self.transactionDate.timeIntervalSince1970)
+                                                   : [NSNull null],
+    @"transactionIdentifier" : self.transactionIdentifier ?: [NSNull null],
+    @"transactionState" : @(self.transactionState)
+  }];
+  NSMutableArray *downloads = [NSMutableArray new];
+  for (SKDownload *download in self.downloads) {
+    [downloads addObject:[download toMap]];
+  }
+  [map setObject:downloads forKey:@"downloads"];
+  return map;
+}
+
+@end
+
+@implementation SKDownload (Coder)
+
+- (NSDictionary *)toMap {
+  NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
+    @"contentLength" : @(self.contentLength),
+    @"contentIdentifier" : self.contentIdentifier ?: [NSNull null],
+    @"contentURL" : self.contentURL.absoluteString ?: [NSNull null],
+    @"contentVersion" : self.contentVersion ?: [NSNull null],
+    @"error" : [self.error toMap] ?: @{},
+    @"progress" : @(self.progress),
+    @"timeRemaining" : @(self.timeRemaining),
+    @"downloadTimeUnKnown" : @(self.timeRemaining == SKDownloadTimeRemainingUnknown),
+    @"transactionID" : self.transaction.transactionIdentifier ?: [NSNull null]
+  }];
+  if (@available(iOS 12.0, *)) {
+    [map setObject:@(self.state) forKey:@"state"];
+  } else {
+    [map setObject:@(self.downloadState) forKey:@"state"];
+  }
+  return map;
+}
+
+@end
+
+@implementation NSError (Coder)
+
+- (NSDictionary *)toMap {
+  return
+      @{@"code" : @(self.code), @"domain" : self.domain ?: @"", @"userInfo" : self.userInfo ?: @{}};
+}
+
+@end

From d0e615cf28618076b57a6022fdfec454418184e1 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Wed, 6 Feb 2019 18:38:43 -0800
Subject: [PATCH 104/410] Revert "IAP add payment translators in objc (#1126)"
 (#1171)

This reverts commit 09a5a36e08ce20e52f789776dc38cc3eba858298.
---
 packages/firebase_auth/CHANGELOG.md           |  4 +
 packages/firebase_auth/README.md              |  9 +-
 packages/firebase_auth/pubspec.yaml           |  2 +-
 .../ios/in_app_purchase_pluginTests/Stubs.h   | 17 ----
 .../ios/in_app_purchase_pluginTests/Stubs.m   | 67 -------------
 .../TranslatorTest.m                          | 98 -------------------
 .../ios/Classes/FIAObjectTranslator.h         | 30 ------
 .../ios/Classes/FIAObjectTranslator.m         | 94 ------------------
 8 files changed, 11 insertions(+), 310 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index d4d9174a4a83..b3b2cff91f77 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.0+2
+
+* Update Google sign-in example in the README.
+
 ## 0.8.0+1
 
 * Update a broken dependency.
diff --git a/packages/firebase_auth/README.md b/packages/firebase_auth/README.md
index 9e08bff99deb..166d52475d83 100755
--- a/packages/firebase_auth/README.md
+++ b/packages/firebase_auth/README.md
@@ -61,12 +61,15 @@ final FirebaseAuth _auth = FirebaseAuth.instance;
 You can now use the Firebase `_auth` to authenticate in your Dart code, e.g.
 ```dart
 Future<FirebaseUser> _handleSignIn() async {
-  GoogleSignInAccount googleUser = await _googleSignIn.signIn();
-  GoogleSignInAuthentication googleAuth = await googleUser.authentication;
-  FirebaseUser user = await _auth.signInWithGoogle(
+  final GoogleSignInAccount googleUser = await _googleSignIn.signIn();
+  final GoogleSignInAuthentication googleAuth = await googleUser.authentication;
+
+  final AuthCredential credential = GoogleAuthProvider.getCredential(
     accessToken: googleAuth.accessToken,
     idToken: googleAuth.idToken,
   );
+  
+  final FirebaseUser user = await _auth.signInWithCredential(credential);
   print("signed in " + user.displayName);
   return user;
 }
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 84458354470c..8466b83c0b64 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.0+1"
+version: "0.8.0+2"
 
 flutter:
   plugin:
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
index e194e450a33e..0756ef266f00 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
@@ -31,21 +31,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface InAppPurchasePluginStub : InAppPurchasePlugin
 @end
-
-@interface SKPaymentTransactionStub : SKPaymentTransaction
-- (instancetype)initWithMap:(NSDictionary *)map;
-@end
-
-@interface SKDownloadStub : SKDownload
-- (instancetype)initWithMap:(NSDictionary *)map;
-@end
-
-@interface SKMutablePaymentStub : SKMutablePayment
-- (instancetype)initWithMap:(NSDictionary *)map;
-@end
-
-@interface NSErrorStub : NSError
-- (instancetype)initWithMap:(NSDictionary *)map;
-@end
-
 NS_ASSUME_NONNULL_END
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
index 39defa632c06..a3b08e26342e 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
@@ -129,70 +129,3 @@ - (SKProductRequestStub *)getProductRequestWithIdentifiers:(NSSet *)identifiers
 }
 
 @end
-
-@implementation SKPaymentTransactionStub
-
-- (instancetype)initWithID:(NSString *)identifier {
-  self = [super init];
-  if (self) {
-    [self setValue:identifier forKey:@"transactionIdentifier"];
-  }
-  return self;
-}
-
-- (instancetype)initWithMap:(NSDictionary *)map {
-  self = [super init];
-  if (self) {
-    [self setValue:map[@"transactionIdentifier"] forKey:@"transactionIdentifier"];
-    [self setValue:map[@"transactionState"] forKey:@"transactionState"];
-    if (map[@"originalTransaction"] && !
-                                       [map[@"originalTransaction"] isKindOfClass:[NSNull class]]) {
-      [self setValue:[[SKPaymentTransactionStub alloc] initWithMap:map[@"originalTransaction"]]
-              forKey:@"originalTransaction"];
-    }
-    [self setValue:map[@"error"] ? [[NSErrorStub alloc] initWithMap:map[@"error"]] : [NSNull null]
-            forKey:@"error"];
-    [self setValue:[NSDate dateWithTimeIntervalSince1970:[map[@"transactionTimeStamp"] doubleValue]]
-            forKey:@"transactionDate"];
-    NSMutableArray *downloads = [NSMutableArray new];
-    for (NSDictionary *downloadMap in map[@"downloads"]) {
-      [downloads addObject:[[SKDownloadStub alloc] initWithMap:downloadMap]];
-    }
-    [self setValue:downloads forKey:@"downloads"];
-  }
-  return self;
-}
-
-@end
-
-@implementation SKDownloadStub
-
-- (instancetype)initWithMap:(NSDictionary *)map {
-  self = [super init];
-  if (self) {
-    [self setValue:map[@"state"] forKey:@"downloadState"];
-    [self setValue:map[@"contentIdentifier"] ?: [NSNull null] forKey:@"contentIdentifier"];
-    [self setValue:map[@"contentLength"] ?: [NSNull null] forKey:@"contentLength"];
-    [self setValue:[NSURL URLWithString:map[@"contentURL"]] ?: [NSNull null] forKey:@"contentURL"];
-    [self setValue:map[@"error"] ? [[NSErrorStub alloc] initWithMap:map[@"error"]] : [NSNull null]
-            forKey:@"error"];
-    [self setValue:map[@"progress"] ?: [NSNull null] forKey:@"progress"];
-    [self setValue:map[@"timeRemaining"] ?: [NSNull null] forKey:@"timeRemaining"];
-    [self setValue:[[SKPaymentTransactionStub alloc] initWithID:map[@"transactionID"]]
-                       ?: [NSNull null]
-            forKey:@"transaction"];
-  }
-  return self;
-}
-
-@end
-
-@implementation NSErrorStub
-
-- (instancetype)initWithMap:(NSDictionary *)map {
-  return [self initWithDomain:[map objectForKey:@"domain"]
-                         code:[[map objectForKey:@"code"] integerValue]
-                     userInfo:[map objectForKey:@"userInfo"]];
-}
-
-@end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
index 9864d335ed99..10bf67f5a364 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
@@ -12,10 +12,6 @@ @interface TranslatorTest : XCTestCase
 @property(strong, nonatomic) NSDictionary *discountMap;
 @property(strong, nonatomic) NSDictionary *productMap;
 @property(strong, nonatomic) NSDictionary *productResponseMap;
-@property(strong, nonatomic) NSDictionary *downloadMap;
-@property(strong, nonatomic) NSDictionary *paymentMap;
-@property(strong, nonatomic) NSDictionary *transactionMap;
-@property(strong, nonatomic) NSDictionary *errorMap;
 @property(strong, nonatomic) NSDictionary *localeMap;
 
 @end
@@ -46,72 +42,6 @@ - (void)setUp {
   };
   self.productResponseMap =
       @{@"products" : @[ self.productMap ], @"invalidProductIdentifiers" : @[]};
-  self.downloadMap = @{
-    @"state" : @(0),
-    @"contentIdentifier" : [NSNull null],
-    @"contentLength" : @(2),
-    @"contentURL" : @"https://flutter.io",
-    @"contentVersion" : [NSNull null],
-    @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
-    @"progress" : @(0.5),
-    @"timeRemaining" : @(100),
-    @"downloadTimeUnKnown" : @(NO),
-    @"transactionID" : [NSNull null],
-  };
-  self.paymentMap = @{
-    @"productIdentifier" : @"123",
-    @"requestData" : @"abcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefgh",
-    @"quantity" : @(2),
-    @"applicationUsername" : @"app user name",
-    @"simulatesAskToBuyInSandbox" : @(NO)
-  };
-  NSDictionary *originalTransactionMap = @{
-    @"transactionIdentifier" : @"567",
-    @"transactionState" : @(SKPaymentTransactionStatePurchasing),
-    @"payment" : [NSNull null],
-    @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
-    @"transactionTimeStamp" : @([NSDate date].timeIntervalSince1970),
-    @"originalTransaction" : [NSNull null],
-    @"downloads" : @[ @{
-      @"state" : @(0),
-      @"contentIdentifier" : [NSNull null],
-      @"contentLength" : @(2),
-      @"contentURL" : @"https://flutter.io",
-      @"contentVersion" : [NSNull null],
-      @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
-      @"progress" : @(0.5),
-      @"timeRemaining" : @(100),
-      @"downloadTimeUnKnown" : @(NO),
-      @"transactionID" : @"567",
-    } ]
-  };
-  self.transactionMap = @{
-    @"transactionIdentifier" : @"567",
-    @"transactionState" : @(SKPaymentTransactionStatePurchasing),
-    @"payment" : [NSNull null],
-    @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
-    @"transactionTimeStamp" : @([NSDate date].timeIntervalSince1970),
-    @"originalTransaction" : originalTransactionMap,
-    @"downloads" : @[ @{
-      @"state" : @(0),
-      @"contentIdentifier" : [NSNull null],
-      @"contentLength" : @(2),
-      @"contentURL" : @"https://flutter.io",
-      @"contentVersion" : [NSNull null],
-      @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
-      @"progress" : @(0.5),
-      @"timeRemaining" : @(100),
-      @"downloadTimeUnKnown" : @(NO),
-      @"transactionID" : @"567",
-    } ]
-  };
-  self.errorMap = @{
-    @"code" : @(123),
-    @"domain" : @"test_domain",
-    @"userInfo" : @{
-      @"key" : @"value",
-    }
-  };
 }
 
 - (void)testSKProductSubscriptionPeriodStubToMap {
@@ -140,34 +70,6 @@ - (void)testProductResponseToMap {
   XCTAssertEqualObjects(map, self.productResponseMap);
 }
 
-- (void)testDownloadToMap {
-  // bug with state, downloadTimeUnKnown, transaction and contentIdentifer in KVC, cannot test these
-  // fields.
-  SKDownloadStub *download = [[SKDownloadStub alloc] initWithMap:self.downloadMap];
-  NSDictionary *map = [download toMap];
-  XCTAssertEqualObjects(map, self.downloadMap);
-}
-
-- (void)testPaymentToMap {
-  SKMutablePayment *payment = [[SKMutablePayment alloc] initWithMap:self.paymentMap];
-  NSDictionary *map = [payment toMap];
-  XCTAssertEqualObjects(map, self.paymentMap);
-}
-
-- (void)testPaymentTransactionToMap {
-  // payment is not KVC, cannot test payment field.
-  SKPaymentTransactionStub *paymentTransaction =
-      [[SKPaymentTransactionStub alloc] initWithMap:self.transactionMap];
-  NSDictionary *map = [paymentTransaction toMap];
-  XCTAssertEqualObjects(map, self.transactionMap);
-}
-
-- (void)testError {
-  NSErrorStub *error = [[NSErrorStub alloc] initWithMap:self.errorMap];
-  NSDictionary *map = [error toMap];
-  XCTAssertEqualObjects(map, self.errorMap);
-}
-
 - (void)testLocaleToMap {
   NSLocale *system = NSLocale.systemLocale;
   NSDictionary *map = [system toMap];
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
index ce05ad0d23e6..77c4bd89a77d 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
@@ -31,36 +31,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface SKPayment (Coder)
-
-- (NSDictionary *)toMap;
-
-@end
-
-@interface SKMutablePayment (Coder)
-
-- (instancetype)initWithMap:(NSDictionary *)map;
-
-@end
-
-@interface SKPaymentTransaction (Coder)
-
-- (NSDictionary *)toMap;
-
-@end
-
-@interface SKDownload (Coder)
-
-- (NSDictionary *)toMap;
-
-@end
-
-@interface NSError (Coder)
-
-- (NSDictionary *)toMap;
-
-@end
-
 @interface NSLocale (Coder)
 
 - (nullable NSDictionary *)toMap;
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
index d142c7bc7902..d8b98448233e 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
@@ -80,25 +80,6 @@ - (NSDictionary *)toMap {
 
 @end
 
-@implementation SKPayment (Coder)
-
-- (NSDictionary *)toMap {
-  NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
-    @"productIdentifier" : self.productIdentifier ?: [NSNull null],
-    @"requestData" : self.requestData ? [[NSString alloc] initWithData:self.requestData
-                                                              encoding:NSUTF8StringEncoding]
-                                      : [NSNull null],
-    @"quantity" : @(self.quantity),
-    @"applicationUsername" : self.applicationUsername ?: [NSNull null]
-  }];
-  if (@available(iOS 8.3, *)) {
-    [map setObject:@(self.simulatesAskToBuyInSandbox) forKey:@"simulatesAskToBuyInSandbox"];
-  }
-  return map;
-}
-
-@end
-
 @implementation NSLocale (Coder)
 
 - (nullable NSDictionary *)toMap {
@@ -109,78 +90,3 @@ - (nullable NSDictionary *)toMap {
 }
 
 @end
-
-@implementation SKMutablePayment (Coder)
-
-- (instancetype)initWithMap:(NSDictionary *)map {
-  self = [self init];
-  if (self) {
-    self.productIdentifier = map[@"productIdentifier"];
-    NSString *utf8String = map[@"requestData"];
-    self.requestData = [utf8String dataUsingEncoding:NSUTF8StringEncoding];
-    self.quantity = [map[@"quantity"] integerValue];
-    self.applicationUsername = map[@"applicationUsername"];
-    if (@available(iOS 8.3, *)) {
-      self.simulatesAskToBuyInSandbox = [map[@"simulatesAskToBuyInSandbox"] boolValue];
-    }
-  }
-  return self;
-}
-
-@end
-
-@implementation SKPaymentTransaction (Coder)
-
-- (NSDictionary *)toMap {
-  NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
-    @"error" : [self.error toMap] ?: [NSNull null],
-    @"payment" : self.payment ? [self.payment toMap] : [NSNull null],
-    @"originalTransaction" : self.originalTransaction ? [self.originalTransaction toMap]
-                                                      : [NSNull null],
-    @"transactionTimeStamp" : self.transactionDate ? @(self.transactionDate.timeIntervalSince1970)
-                                                   : [NSNull null],
-    @"transactionIdentifier" : self.transactionIdentifier ?: [NSNull null],
-    @"transactionState" : @(self.transactionState)
-  }];
-  NSMutableArray *downloads = [NSMutableArray new];
-  for (SKDownload *download in self.downloads) {
-    [downloads addObject:[download toMap]];
-  }
-  [map setObject:downloads forKey:@"downloads"];
-  return map;
-}
-
-@end
-
-@implementation SKDownload (Coder)
-
-- (NSDictionary *)toMap {
-  NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
-    @"contentLength" : @(self.contentLength),
-    @"contentIdentifier" : self.contentIdentifier ?: [NSNull null],
-    @"contentURL" : self.contentURL.absoluteString ?: [NSNull null],
-    @"contentVersion" : self.contentVersion ?: [NSNull null],
-    @"error" : [self.error toMap] ?: @{},
-    @"progress" : @(self.progress),
-    @"timeRemaining" : @(self.timeRemaining),
-    @"downloadTimeUnKnown" : @(self.timeRemaining == SKDownloadTimeRemainingUnknown),
-    @"transactionID" : self.transaction.transactionIdentifier ?: [NSNull null]
-  }];
-  if (@available(iOS 12.0, *)) {
-    [map setObject:@(self.state) forKey:@"state"];
-  } else {
-    [map setObject:@(self.downloadState) forKey:@"state"];
-  }
-  return map;
-}
-
-@end
-
-@implementation NSError (Coder)
-
-- (NSDictionary *)toMap {
-  return
-      @{@"code" : @(self.code), @"domain" : self.domain ?: @"", @"userInfo" : self.userInfo ?: @{}};
-}
-
-@end

From 832ab832fa2861445a5aaaa692a0e6a1ad1af8aa Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Thu, 7 Feb 2019 12:36:33 -0800
Subject: [PATCH 105/410] Iap add payment objc translators (#1172)

---
 .../ios/in_app_purchase_pluginTests/Stubs.h   | 17 ++++
 .../ios/in_app_purchase_pluginTests/Stubs.m   | 67 +++++++++++++
 .../TranslatorTest.m                          | 97 +++++++++++++++++++
 .../ios/Classes/FIAObjectTranslator.h         | 30 ++++++
 .../ios/Classes/FIAObjectTranslator.m         | 94 ++++++++++++++++++
 5 files changed, 305 insertions(+)

diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
index 0756ef266f00..e194e450a33e 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
@@ -31,4 +31,21 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface InAppPurchasePluginStub : InAppPurchasePlugin
 @end
+
+@interface SKPaymentTransactionStub : SKPaymentTransaction
+- (instancetype)initWithMap:(NSDictionary *)map;
+@end
+
+@interface SKDownloadStub : SKDownload
+- (instancetype)initWithMap:(NSDictionary *)map;
+@end
+
+@interface SKMutablePaymentStub : SKMutablePayment
+- (instancetype)initWithMap:(NSDictionary *)map;
+@end
+
+@interface NSErrorStub : NSError
+- (instancetype)initWithMap:(NSDictionary *)map;
+@end
+
 NS_ASSUME_NONNULL_END
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
index a3b08e26342e..39defa632c06 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
@@ -129,3 +129,70 @@ - (SKProductRequestStub *)getProductRequestWithIdentifiers:(NSSet *)identifiers
 }
 
 @end
+
+@implementation SKPaymentTransactionStub
+
+- (instancetype)initWithID:(NSString *)identifier {
+  self = [super init];
+  if (self) {
+    [self setValue:identifier forKey:@"transactionIdentifier"];
+  }
+  return self;
+}
+
+- (instancetype)initWithMap:(NSDictionary *)map {
+  self = [super init];
+  if (self) {
+    [self setValue:map[@"transactionIdentifier"] forKey:@"transactionIdentifier"];
+    [self setValue:map[@"transactionState"] forKey:@"transactionState"];
+    if (map[@"originalTransaction"] && !
+                                       [map[@"originalTransaction"] isKindOfClass:[NSNull class]]) {
+      [self setValue:[[SKPaymentTransactionStub alloc] initWithMap:map[@"originalTransaction"]]
+              forKey:@"originalTransaction"];
+    }
+    [self setValue:map[@"error"] ? [[NSErrorStub alloc] initWithMap:map[@"error"]] : [NSNull null]
+            forKey:@"error"];
+    [self setValue:[NSDate dateWithTimeIntervalSince1970:[map[@"transactionTimeStamp"] doubleValue]]
+            forKey:@"transactionDate"];
+    NSMutableArray *downloads = [NSMutableArray new];
+    for (NSDictionary *downloadMap in map[@"downloads"]) {
+      [downloads addObject:[[SKDownloadStub alloc] initWithMap:downloadMap]];
+    }
+    [self setValue:downloads forKey:@"downloads"];
+  }
+  return self;
+}
+
+@end
+
+@implementation SKDownloadStub
+
+- (instancetype)initWithMap:(NSDictionary *)map {
+  self = [super init];
+  if (self) {
+    [self setValue:map[@"state"] forKey:@"downloadState"];
+    [self setValue:map[@"contentIdentifier"] ?: [NSNull null] forKey:@"contentIdentifier"];
+    [self setValue:map[@"contentLength"] ?: [NSNull null] forKey:@"contentLength"];
+    [self setValue:[NSURL URLWithString:map[@"contentURL"]] ?: [NSNull null] forKey:@"contentURL"];
+    [self setValue:map[@"error"] ? [[NSErrorStub alloc] initWithMap:map[@"error"]] : [NSNull null]
+            forKey:@"error"];
+    [self setValue:map[@"progress"] ?: [NSNull null] forKey:@"progress"];
+    [self setValue:map[@"timeRemaining"] ?: [NSNull null] forKey:@"timeRemaining"];
+    [self setValue:[[SKPaymentTransactionStub alloc] initWithID:map[@"transactionID"]]
+                       ?: [NSNull null]
+            forKey:@"transaction"];
+  }
+  return self;
+}
+
+@end
+
+@implementation NSErrorStub
+
+- (instancetype)initWithMap:(NSDictionary *)map {
+  return [self initWithDomain:[map objectForKey:@"domain"]
+                         code:[[map objectForKey:@"code"] integerValue]
+                     userInfo:[map objectForKey:@"userInfo"]];
+}
+
+@end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
index 10bf67f5a364..91414af5104d 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
@@ -12,6 +12,10 @@ @interface TranslatorTest : XCTestCase
 @property(strong, nonatomic) NSDictionary *discountMap;
 @property(strong, nonatomic) NSDictionary *productMap;
 @property(strong, nonatomic) NSDictionary *productResponseMap;
+@property(strong, nonatomic) NSDictionary *downloadMap;
+@property(strong, nonatomic) NSDictionary *paymentMap;
+@property(strong, nonatomic) NSDictionary *transactionMap;
+@property(strong, nonatomic) NSDictionary *errorMap;
 @property(strong, nonatomic) NSDictionary *localeMap;
 
 @end
@@ -42,6 +46,72 @@ - (void)setUp {
   };
   self.productResponseMap =
       @{@"products" : @[ self.productMap ], @"invalidProductIdentifiers" : @[]};
+  self.downloadMap = @{
+    @"state" : @(0),
+    @"contentIdentifier" : [NSNull null],
+    @"contentLength" : @(2),
+    @"contentURL" : @"https://flutter.io",
+    @"contentVersion" : [NSNull null],
+    @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+    @"progress" : @(0.5),
+    @"timeRemaining" : @(100),
+    @"downloadTimeUnKnown" : @(NO),
+    @"transactionID" : [NSNull null],
+  };
+  self.paymentMap = @{
+    @"productIdentifier" : @"123",
+    @"requestData" : @"abcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefgh",
+    @"quantity" : @(2),
+    @"applicationUsername" : @"app user name",
+    @"simulatesAskToBuyInSandbox" : @(NO)
+  };
+  NSDictionary *originalTransactionMap = @{
+    @"transactionIdentifier" : @"567",
+    @"transactionState" : @(SKPaymentTransactionStatePurchasing),
+    @"payment" : [NSNull null],
+    @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+    @"transactionTimeStamp" : @([NSDate date].timeIntervalSince1970),
+    @"originalTransaction" : [NSNull null],
+    @"downloads" : @[ @{
+      @"state" : @(0),
+      @"contentIdentifier" : [NSNull null],
+      @"contentLength" : @(2),
+      @"contentURL" : @"https://flutter.io",
+      @"contentVersion" : [NSNull null],
+      @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+      @"progress" : @(0.5),
+      @"timeRemaining" : @(100),
+      @"downloadTimeUnKnown" : @(NO),
+      @"transactionID" : @"567",
+    } ]
+  };
+  self.transactionMap = @{
+    @"transactionIdentifier" : @"567",
+    @"transactionState" : @(SKPaymentTransactionStatePurchasing),
+    @"payment" : [NSNull null],
+    @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+    @"transactionTimeStamp" : @([NSDate date].timeIntervalSince1970),
+    @"originalTransaction" : originalTransactionMap,
+    @"downloads" : @[ @{
+      @"state" : @(0),
+      @"contentIdentifier" : [NSNull null],
+      @"contentLength" : @(2),
+      @"contentURL" : @"https://flutter.io",
+      @"contentVersion" : [NSNull null],
+      @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+      @"progress" : @(0.5),
+      @"timeRemaining" : @(100),
+      @"downloadTimeUnKnown" : @(NO),
+      @"transactionID" : @"567",
+    } ]
+  };
+  self.errorMap = @{
+    @"code" : @(123),
+    @"domain" : @"test_domain",
+    @"userInfo" : @{
+      @"key" : @"value",
+    }
+  };
 }
 
 - (void)testSKProductSubscriptionPeriodStubToMap {
@@ -70,6 +140,33 @@ - (void)testProductResponseToMap {
   XCTAssertEqualObjects(map, self.productResponseMap);
 }
 
+- (void)testDownloadToMap {
+  // bug with state, downloadTimeUnKnown, transaction and contentIdentifer in KVC, cannot test these
+  // fields.
+  SKDownloadStub *download = [[SKDownloadStub alloc] initWithMap:self.downloadMap];
+  NSDictionary *map = [download toMap];
+  XCTAssertEqualObjects(map, self.downloadMap);
+}
+
+- (void)testPaymentToMap {
+  SKMutablePayment *payment = [[SKMutablePayment alloc] initWithMap:self.paymentMap];
+  NSDictionary *map = [payment toMap];
+  XCTAssertEqualObjects(map, self.paymentMap);
+}
+
+- (void)testPaymentTransactionToMap {
+  // payment is not KVC, cannot test payment field.
+  SKPaymentTransactionStub *paymentTransaction =
+      [[SKPaymentTransactionStub alloc] initWithMap:self.transactionMap];
+  NSDictionary *map = [paymentTransaction toMap];
+  XCTAssertEqualObjects(map, self.transactionMap);
+}
+
+- (void)testError {
+  NSErrorStub *error = [[NSErrorStub alloc] initWithMap:self.errorMap];
+  NSDictionary *map = [error toMap];
+  XCTAssertEqualObjects(map, self.errorMap);
+}
 - (void)testLocaleToMap {
   NSLocale *system = NSLocale.systemLocale;
   NSDictionary *map = [system toMap];
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
index 77c4bd89a77d..ce05ad0d23e6 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
@@ -31,6 +31,36 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface SKPayment (Coder)
+
+- (NSDictionary *)toMap;
+
+@end
+
+@interface SKMutablePayment (Coder)
+
+- (instancetype)initWithMap:(NSDictionary *)map;
+
+@end
+
+@interface SKPaymentTransaction (Coder)
+
+- (NSDictionary *)toMap;
+
+@end
+
+@interface SKDownload (Coder)
+
+- (NSDictionary *)toMap;
+
+@end
+
+@interface NSError (Coder)
+
+- (NSDictionary *)toMap;
+
+@end
+
 @interface NSLocale (Coder)
 
 - (nullable NSDictionary *)toMap;
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
index d8b98448233e..d142c7bc7902 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
@@ -80,6 +80,25 @@ - (NSDictionary *)toMap {
 
 @end
 
+@implementation SKPayment (Coder)
+
+- (NSDictionary *)toMap {
+  NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
+    @"productIdentifier" : self.productIdentifier ?: [NSNull null],
+    @"requestData" : self.requestData ? [[NSString alloc] initWithData:self.requestData
+                                                              encoding:NSUTF8StringEncoding]
+                                      : [NSNull null],
+    @"quantity" : @(self.quantity),
+    @"applicationUsername" : self.applicationUsername ?: [NSNull null]
+  }];
+  if (@available(iOS 8.3, *)) {
+    [map setObject:@(self.simulatesAskToBuyInSandbox) forKey:@"simulatesAskToBuyInSandbox"];
+  }
+  return map;
+}
+
+@end
+
 @implementation NSLocale (Coder)
 
 - (nullable NSDictionary *)toMap {
@@ -90,3 +109,78 @@ - (nullable NSDictionary *)toMap {
 }
 
 @end
+
+@implementation SKMutablePayment (Coder)
+
+- (instancetype)initWithMap:(NSDictionary *)map {
+  self = [self init];
+  if (self) {
+    self.productIdentifier = map[@"productIdentifier"];
+    NSString *utf8String = map[@"requestData"];
+    self.requestData = [utf8String dataUsingEncoding:NSUTF8StringEncoding];
+    self.quantity = [map[@"quantity"] integerValue];
+    self.applicationUsername = map[@"applicationUsername"];
+    if (@available(iOS 8.3, *)) {
+      self.simulatesAskToBuyInSandbox = [map[@"simulatesAskToBuyInSandbox"] boolValue];
+    }
+  }
+  return self;
+}
+
+@end
+
+@implementation SKPaymentTransaction (Coder)
+
+- (NSDictionary *)toMap {
+  NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
+    @"error" : [self.error toMap] ?: [NSNull null],
+    @"payment" : self.payment ? [self.payment toMap] : [NSNull null],
+    @"originalTransaction" : self.originalTransaction ? [self.originalTransaction toMap]
+                                                      : [NSNull null],
+    @"transactionTimeStamp" : self.transactionDate ? @(self.transactionDate.timeIntervalSince1970)
+                                                   : [NSNull null],
+    @"transactionIdentifier" : self.transactionIdentifier ?: [NSNull null],
+    @"transactionState" : @(self.transactionState)
+  }];
+  NSMutableArray *downloads = [NSMutableArray new];
+  for (SKDownload *download in self.downloads) {
+    [downloads addObject:[download toMap]];
+  }
+  [map setObject:downloads forKey:@"downloads"];
+  return map;
+}
+
+@end
+
+@implementation SKDownload (Coder)
+
+- (NSDictionary *)toMap {
+  NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
+    @"contentLength" : @(self.contentLength),
+    @"contentIdentifier" : self.contentIdentifier ?: [NSNull null],
+    @"contentURL" : self.contentURL.absoluteString ?: [NSNull null],
+    @"contentVersion" : self.contentVersion ?: [NSNull null],
+    @"error" : [self.error toMap] ?: @{},
+    @"progress" : @(self.progress),
+    @"timeRemaining" : @(self.timeRemaining),
+    @"downloadTimeUnKnown" : @(self.timeRemaining == SKDownloadTimeRemainingUnknown),
+    @"transactionID" : self.transaction.transactionIdentifier ?: [NSNull null]
+  }];
+  if (@available(iOS 12.0, *)) {
+    [map setObject:@(self.state) forKey:@"state"];
+  } else {
+    [map setObject:@(self.downloadState) forKey:@"state"];
+  }
+  return map;
+}
+
+@end
+
+@implementation NSError (Coder)
+
+- (NSDictionary *)toMap {
+  return
+      @{@"code" : @(self.code), @"domain" : self.domain ?: @"", @"userInfo" : self.userInfo ?: @{}};
+}
+
+@end

From 38f8198aedb1a42a54e158a4191d61a6acb6ed0e Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Thu, 7 Feb 2019 12:43:07 -0800
Subject: [PATCH 106/410] Allow clearing cookies for FlutterWebView (#1149)

---
 packages/webview_flutter/CHANGELOG.md         |  4 ++
 .../webviewflutter/FlutterCookieManager.java  | 54 ++++++++++++++++
 .../webviewflutter/WebViewFlutterPlugin.java  |  2 +
 .../webview_flutter/example/lib/main.dart     | 59 ++++++++++++++++++
 .../ios/Classes/FLTCookieManager.h            | 10 +++
 .../ios/Classes/FLTCookieManager.m            | 49 +++++++++++++++
 .../ios/Classes/WebViewFlutterPlugin.m        |  2 +
 .../webview_flutter/lib/webview_flutter.dart  | 26 ++++++++
 packages/webview_flutter/pubspec.yaml         |  2 +-
 .../test/webview_flutter_test.dart            | 62 +++++++++++++++++++
 10 files changed, 269 insertions(+), 1 deletion(-)
 create mode 100644 packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterCookieManager.java
 create mode 100644 packages/webview_flutter/ios/Classes/FLTCookieManager.h
 create mode 100644 packages/webview_flutter/ios/Classes/FLTCookieManager.m

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 07a69c0f3501..3ca357898633 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.2
+
+* Added CookieManager to interface with WebView cookies. Currently has the ability to clear cookies.
+
 ## 0.3.1
 
 * Added JavaScript channels to facilitate message passing from JavaScript code running inside
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterCookieManager.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterCookieManager.java
new file mode 100644
index 000000000000..5aa28fb7d00c
--- /dev/null
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterCookieManager.java
@@ -0,0 +1,54 @@
+package io.flutter.plugins.webviewflutter;
+
+import android.os.Build;
+import android.os.Build.VERSION_CODES;
+import android.webkit.CookieManager;
+import android.webkit.ValueCallback;
+import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
+import io.flutter.plugin.common.MethodChannel.Result;
+
+class FlutterCookieManager implements MethodCallHandler {
+
+  private FlutterCookieManager() {
+    // Do not instantiate.
+    // This class should only be used in context of a BinaryMessenger.
+    // Use FlutterCookieManager#registerWith instead.
+  }
+
+  static void registerWith(BinaryMessenger messenger) {
+    MethodChannel methodChannel = new MethodChannel(messenger, "plugins.flutter.io/cookie_manager");
+    FlutterCookieManager cookieManager = new FlutterCookieManager();
+    methodChannel.setMethodCallHandler(cookieManager);
+  }
+
+  @Override
+  public void onMethodCall(MethodCall methodCall, Result result) {
+    switch (methodCall.method) {
+      case "clearCookies":
+        clearCookies(result);
+        break;
+      default:
+        result.notImplemented();
+    }
+  }
+
+  private static void clearCookies(final Result result) {
+    CookieManager cookieManager = CookieManager.getInstance();
+    final boolean hasCookies = cookieManager.hasCookies();
+    if (Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
+      cookieManager.removeAllCookies(
+          new ValueCallback<Boolean>() {
+            @Override
+            public void onReceiveValue(Boolean value) {
+              result.success(hasCookies);
+            }
+          });
+    } else {
+      cookieManager.removeAllCookie();
+      result.success(hasCookies);
+    }
+  }
+}
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
index 43efc4a658a0..2200695e6814 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
@@ -4,11 +4,13 @@
 
 /** WebViewFlutterPlugin */
 public class WebViewFlutterPlugin {
+
   /** Plugin registration. */
   public static void registerWith(Registrar registrar) {
     registrar
         .platformViewRegistry()
         .registerViewFactory(
             "plugins.flutter.io/webview", new WebViewFactory(registrar.messenger()));
+    FlutterCookieManager.registerWith(registrar.messenger());
   }
 }
diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index d8a4e8c439d8..0536b7a5d247 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -75,11 +75,15 @@ class WebViewExample extends StatelessWidget {
 enum MenuOptions {
   showUserAgent,
   toast,
+  listCookies,
+  clearCookies,
 }
 
 class SampleMenu extends StatelessWidget {
   SampleMenu(this.controller);
+
   final Future<WebViewController> controller;
+  final CookieManager cookieManager = CookieManager();
 
   @override
   Widget build(BuildContext context) {
@@ -100,6 +104,12 @@ class SampleMenu extends StatelessWidget {
                   ),
                 );
                 break;
+              case MenuOptions.listCookies:
+                _onListCookies(controller.data, context);
+                break;
+              case MenuOptions.clearCookies:
+                _onClearCookies(context);
+                break;
             }
           },
           itemBuilder: (BuildContext context) => <PopupMenuItem<MenuOptions>>[
@@ -112,6 +122,14 @@ class SampleMenu extends StatelessWidget {
                   value: MenuOptions.toast,
                   child: Text('Make a toast'),
                 ),
+                const PopupMenuItem<MenuOptions>(
+                  value: MenuOptions.listCookies,
+                  child: Text('List cookies'),
+                ),
+                const PopupMenuItem<MenuOptions>(
+                  value: MenuOptions.clearCookies,
+                  child: Text('Clear cookies'),
+                ),
               ],
         );
       },
@@ -125,6 +143,47 @@ class SampleMenu extends StatelessWidget {
     controller.evaluateJavascript(
         'Toaster.postMessage("User Agent: " + navigator.userAgent);');
   }
+
+  void _onListCookies(
+      WebViewController controller, BuildContext context) async {
+    final String cookies =
+        await controller.evaluateJavascript('document.cookie');
+    Scaffold.of(context).showSnackBar(SnackBar(
+      content: Column(
+        mainAxisAlignment: MainAxisAlignment.end,
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          const Text('Cookies:'),
+          _getCookieList(cookies),
+        ],
+      ),
+    ));
+  }
+
+  void _onClearCookies(BuildContext context) async {
+    final bool hadCookies = await cookieManager.clearCookies();
+    String message = 'There were cookies. Now, they are gone!';
+    if (!hadCookies) {
+      message = 'There are no cookies.';
+    }
+    Scaffold.of(context).showSnackBar(SnackBar(
+      content: Text(message),
+    ));
+  }
+
+  Widget _getCookieList(String cookies) {
+    if (cookies == null || cookies == '""') {
+      return Container();
+    }
+    final List<String> cookieList = cookies.split(';');
+    final Iterable<Text> cookieWidgets =
+        cookieList.map((String cookie) => Text(cookie));
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.end,
+      mainAxisSize: MainAxisSize.min,
+      children: cookieWidgets.toList(),
+    );
+  }
 }
 
 class NavigationControls extends StatelessWidget {
diff --git a/packages/webview_flutter/ios/Classes/FLTCookieManager.h b/packages/webview_flutter/ios/Classes/FLTCookieManager.h
new file mode 100644
index 000000000000..30951b6d055b
--- /dev/null
+++ b/packages/webview_flutter/ios/Classes/FLTCookieManager.h
@@ -0,0 +1,10 @@
+#import <Flutter/Flutter.h>
+#import <WebKit/WebKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FLTCookieManager : NSObject <FlutterPlugin>
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/packages/webview_flutter/ios/Classes/FLTCookieManager.m b/packages/webview_flutter/ios/Classes/FLTCookieManager.m
new file mode 100644
index 000000000000..b3b29036a522
--- /dev/null
+++ b/packages/webview_flutter/ios/Classes/FLTCookieManager.m
@@ -0,0 +1,49 @@
+#import "FLTCookieManager.h"
+
+@implementation FLTCookieManager {
+}
+
++ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
+  FLTCookieManager *instance = [[FLTCookieManager alloc] init];
+
+  FlutterMethodChannel *channel =
+      [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/cookie_manager"
+                                  binaryMessenger:[registrar messenger]];
+  [registrar addMethodCallDelegate:instance channel:channel];
+}
+
+- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
+  if ([[call method] isEqualToString:@"clearCookies"]) {
+    [self clearCookies:result];
+  } else {
+    result(FlutterMethodNotImplemented);
+  }
+}
+
+- (void)clearCookies:(FlutterResult)result {
+  if (@available(iOS 9.0, *)) {
+    [self clearCookiesIos9AndLater:result];
+  } else {
+    // support for iOS8 tracked in https://github.com/flutter/flutter/issues/27624.
+    NSLog(@"Clearing cookies is not supported for Flutter WebViews prior to iOS 9.");
+  }
+}
+
+- (void)clearCookiesIos9AndLater:(FlutterResult)result {
+  NSSet *websiteDataTypes = [NSSet setWithArray:@[ WKWebsiteDataTypeCookies ]];
+  WKWebsiteDataStore *dataStore = [WKWebsiteDataStore defaultDataStore];
+
+  void (^deleteAndNotify)(NSArray<WKWebsiteDataRecord *> *) =
+      ^(NSArray<WKWebsiteDataRecord *> *cookies) {
+        BOOL hasCookies = cookies.count > 0;
+        [dataStore removeDataOfTypes:websiteDataTypes
+                      forDataRecords:cookies
+                   completionHandler:^{
+                     result(@(hasCookies));
+                   }];
+      };
+
+  [dataStore fetchDataRecordsOfTypes:websiteDataTypes completionHandler:deleteAndNotify];
+}
+
+@end
diff --git a/packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.m b/packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.m
index 89fd6008d3b1..cab9169df00a 100644
--- a/packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.m
+++ b/packages/webview_flutter/ios/Classes/WebViewFlutterPlugin.m
@@ -1,4 +1,5 @@
 #import "WebViewFlutterPlugin.h"
+#import "FLTCookieManager.h"
 #import "FlutterWebView.h"
 
 @implementation FLTWebViewFlutterPlugin
@@ -7,6 +8,7 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
   FLTWebViewFactory* webviewFactory =
       [[FLTWebViewFactory alloc] initWithMessenger:registrar.messenger];
   [registrar registerViewFactory:webviewFactory withId:@"plugins.flutter.io/webview"];
+  [FLTCookieManager registerWithRegistrar:registrar];
 }
 
 @end
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index 8d5a74686760..dbb5af0aa3b1 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -469,6 +469,32 @@ class WebViewController {
   }
 }
 
+/// Manages cookies pertaining to all [WebView]s.
+class CookieManager {
+  /// Creates a [CookieManager] -- returns the instance if it's already been called.
+  factory CookieManager() {
+    return _instance ??= CookieManager._();
+  }
+
+  CookieManager._();
+
+  static const MethodChannel _channel =
+      MethodChannel('plugins.flutter.io/cookie_manager');
+  static CookieManager _instance;
+
+  /// Clears all cookies.
+  ///
+  /// This is supported for >= IOS 9.
+  ///
+  /// Returns true if cookies were present before clearing, else false.
+  Future<bool> clearCookies() => _channel
+      // TODO(amirh): remove this when the invokeMethod update makes it to stable Flutter.
+      // https://github.com/flutter/flutter/issues/26431
+      // ignore: strong_mode_implicit_dynamic_method
+      .invokeMethod('clearCookies')
+      .then<bool>((dynamic result) => result);
+}
+
 // Throws an ArgumentError if `url` is not a valid URL string.
 void _validateUrlString(String url) {
   try {
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 329159e0eeab..4b982b64c7a3 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.1
+version: 0.3.2
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 
diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart
index 12b4831b5399..4a0eb1c514e4 100644
--- a/packages/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/test/webview_flutter_test.dart
@@ -15,13 +15,18 @@ void main() {
   final _FakePlatformViewsController fakePlatformViewsController =
       _FakePlatformViewsController();
 
+  final _FakeCookieManager _fakeCookieManager = _FakeCookieManager();
+
   setUpAll(() {
     SystemChannels.platform_views.setMockMethodCallHandler(
         fakePlatformViewsController.fakePlatformViewsMethodHandler);
+    SystemChannels.platform
+        .setMockMethodCallHandler(_fakeCookieManager.onMethodCall);
   });
 
   setUp(() {
     fakePlatformViewsController.reset();
+    _fakeCookieManager.reset();
   });
 
   testWidgets('Create WebView', (WidgetTester tester) async {
@@ -356,6 +361,31 @@ void main() {
     );
   });
 
+  testWidgets('Cookies can be cleared once', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const WebView(
+        initialUrl: 'https://flutter.io',
+      ),
+    );
+    final CookieManager cookieManager = CookieManager();
+    final bool hasCookies = await cookieManager.clearCookies();
+    expect(hasCookies, true);
+  });
+
+  testWidgets('Second cookie clear does not have cookies',
+      (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const WebView(
+        initialUrl: 'https://flutter.io',
+      ),
+    );
+    final CookieManager cookieManager = CookieManager();
+    final bool hasCookies = await cookieManager.clearCookies();
+    expect(hasCookies, true);
+    final bool hasCookiesSecond = await cookieManager.clearCookies();
+    expect(hasCookiesSecond, false);
+  });
+
   testWidgets('Initial JavaScript channels', (WidgetTester tester) async {
     await tester.pumpWidget(
       WebView(
@@ -639,3 +669,35 @@ Map<dynamic, dynamic> _decodeParams(Uint8List paramsMessage) {
   );
   return const StandardMessageCodec().decodeMessage(messageBytes);
 }
+
+class _FakeCookieManager {
+  _FakeCookieManager() {
+    final MethodChannel channel = const MethodChannel(
+      'plugins.flutter.io/cookie_manager',
+      StandardMethodCodec(),
+    );
+    channel.setMockMethodCallHandler(onMethodCall);
+  }
+
+  bool hasCookies = true;
+
+  Future<bool> onMethodCall(MethodCall call) {
+    switch (call.method) {
+      case 'clearCookies':
+        bool hadCookies = false;
+        if (hasCookies) {
+          hadCookies = true;
+          hasCookies = false;
+        }
+        return Future<bool>.sync(() {
+          return hadCookies;
+        });
+        break;
+    }
+    return Future<bool>.sync(() {});
+  }
+
+  void reset() {
+    hasCookies = true;
+  }
+}

From 4b037c122ea511d200a62fc4e998bf3b2a82a526 Mon Sep 17 00:00:00 2001
From: Mike N <mjn4000@gmail.com>
Date: Thu, 7 Feb 2019 13:28:16 -0800
Subject: [PATCH 107/410] =?UTF-8?q?FIx=20issue=20with=20calculating=20iOS?=
 =?UTF-8?q?=20image=20orientation=20in=20certain=20special=20c=E2=80=A6=20?=
 =?UTF-8?q?(#1135)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Uses accelerometer data to determine device orientation when the photo is taken.  Fixes flutter/flutter#26786 .

flutter/flutter#26786
---
 packages/camera/CHANGELOG.md               |  4 ++
 packages/camera/ios/Classes/CameraPlugin.m | 48 +++++++++++-----------
 packages/camera/pubspec.yaml               |  2 +-
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index e29b7bd6ebf3..23eedd0ee0e4 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.0+2
+
+* Fix issue with calculating iOS image orientation in certain edge cases.
+
 ## 0.3.0+1
 
 * Remove initial method call invocation from static camera method.
diff --git a/packages/camera/ios/Classes/CameraPlugin.m b/packages/camera/ios/Classes/CameraPlugin.m
index 3f6fda8f3f90..d54b55e1060f 100644
--- a/packages/camera/ios/Classes/CameraPlugin.m
+++ b/packages/camera/ios/Classes/CameraPlugin.m
@@ -92,31 +92,30 @@ - (void)captureOutput:(AVCapturePhotoOutput *)output
 }
 
 - (UIImageOrientation)getImageRotation {
-  // Get the true device orientation out of the accelerometer.
-  const CMQuaternion orientation = _motionManager.deviceMotion.attitude.quaternion;
-  const double roll =
-      atan2(2 * (orientation.w * orientation.x + orientation.y * orientation.z),
-            1 - (2 * (orientation.x * orientation.x + orientation.y * orientation.y)));
-  const double pitch = asin(2 * (orientation.w * orientation.y - orientation.z * orientation.x));
-  const bool vertical = fabs(pitch) <= M_PI_4;
-  const bool pointedRight = pitch >= 0;
-  const bool tiltedUp = roll >= 0;
-  // Pixel input defaults to horizontal pointed left, as if the phone was held
-  // with the home button on the right. Rotate the photo accordingly based on
-  // the orientation the photo should really be displayed as. To make this
-  // extra confusing, the landscape orientations also need to be mirrored
-  // based on whether they were taken with the front facing camera.
-  if (vertical && tiltedUp) {              // [^]
-    return UIImageOrientationRight;        // rotate existing image 90* cw
-  } else if (vertical && !tiltedUp) {      // [v]
-    return UIImageOrientationLeft;         // rotate existing image 90* ccw
-  } else if (!vertical && pointedRight) {  // [>]
-    return _cameraPosition == AVCaptureDevicePositionBack ? UIImageOrientationDown /*rotate 180* */
-                                                          : UIImageOrientationUp /*do not rotate*/;
-  } else if (!vertical && !pointedRight) {  // [<]
+  float const threshold = 45.0;
+  BOOL (^isNearValue)(float value1, float value2) = ^BOOL(float value1, float value2) {
+    return fabsf(value1 - value2) < threshold;
+  };
+  BOOL (^isNearValueABS)(float value1, float value2) = ^BOOL(float value1, float value2) {
+    return isNearValue(fabsf(value1), fabsf(value2));
+  };
+  float yxAtan = (atan2(_motionManager.accelerometerData.acceleration.y,
+                        _motionManager.accelerometerData.acceleration.x)) *
+                 180 / M_PI;
+  if (isNearValue(-90.0, yxAtan)) {
+    return UIImageOrientationRight;
+  } else if (isNearValueABS(180.0, yxAtan)) {
     return _cameraPosition == AVCaptureDevicePositionBack ? UIImageOrientationUp
                                                           : UIImageOrientationDown;
+  } else if (isNearValueABS(0.0, yxAtan)) {
+    return _cameraPosition == AVCaptureDevicePositionBack ? UIImageOrientationDown /*rotate 180* */
+                                                          : UIImageOrientationUp /*do not rotate*/;
+  } else if (isNearValue(90.0, yxAtan)) {
+    return UIImageOrientationLeft;
   }
+  // If none of the above, then the device is likely facing straight down or straight up -- just
+  // pick something arbitrary
+  // TODO: Maybe use the UIInterfaceOrientation if in these scenarios
   return UIImageOrientationUp;
 }
 @end
@@ -222,8 +221,7 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
   [_capturePhotoOutput setHighResolutionCaptureEnabled:YES];
   [_captureSession addOutput:_capturePhotoOutput];
   _motionManager = [[CMMotionManager alloc] init];
-  [_motionManager startDeviceMotionUpdatesUsingReferenceFrame:
-                      CMAttitudeReferenceFrameXArbitraryCorrectedZVertical];
+  [_motionManager startAccelerometerUpdates];
   return self;
 }
 
@@ -387,7 +385,7 @@ - (void)dealloc {
   if (_latestPixelBuffer) {
     CFRelease(_latestPixelBuffer);
   }
-  [_motionManager stopDeviceMotionUpdates];
+  [_motionManager stopAccelerometerUpdates];
 }
 
 - (CVPixelBufferRef)copyPixelBuffer {
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index eaf4db20680f..8fc800083724 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -1,7 +1,7 @@
 name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed and capturing images.
-version: 0.3.0+1
+version: 0.3.0+2
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From 79eeec566518f137085109b33996ef7b5f28bc57 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Thu, 7 Feb 2019 16:08:02 -0800
Subject: [PATCH 108/410] Expose exception on the signIn method in Google sign
 in.(#1180)

The app will still crash. Missing configuration is fatal. An app like this should never be released. A crash would be a good reminder for user to provide a proper fix before shipping the product.
After this fix, a proper error message is shown to users.
---
 packages/google_sign_in/CHANGELOG.md                     | 4 ++++
 packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m | 7 ++++++-
 packages/google_sign_in/pubspec.yaml                     | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md
index 28b7df523c5b..d1da1336cc38 100644
--- a/packages/google_sign_in/CHANGELOG.md
+++ b/packages/google_sign_in/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.0+1
+
+* Added a better error message for iOS when the app is missing necessary URL schemes.
+
 ## 4.0.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m b/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m
index 58401cd11696..7f913f713d45 100644
--- a/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m
+++ b/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m
@@ -96,7 +96,12 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     result(@([[GIDSignIn sharedInstance] hasAuthInKeychain]));
   } else if ([call.method isEqualToString:@"signIn"]) {
     if ([self setAccountRequest:result]) {
-      [[GIDSignIn sharedInstance] signIn];
+      @try {
+        [[GIDSignIn sharedInstance] signIn];
+      } @catch (NSException *e) {
+        result([FlutterError errorWithCode:@"google_sign_in" message:e.reason details:e.name]);
+        [e raise];
+      }
     }
   } else if ([call.method isEqualToString:@"getTokens"]) {
     GIDGoogleUser *currentUser = [GIDSignIn sharedInstance].currentUser;
diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml
index 52a53b865d19..92e80ab5caba 100755
--- a/packages/google_sign_in/pubspec.yaml
+++ b/packages/google_sign_in/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in
-version: 4.0.0
+version: 4.0.0+1
 
 flutter:
   plugin:

From 51696552700af8692fd7d595237fc9c4e273de93 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Thu, 7 Feb 2019 17:26:49 -0800
Subject: [PATCH 109/410] Add a gradle warning to the AndroidX plugins (#1138)

This warning is only printed once per plugin on build failure.

flutter/flutter#27106
---
 packages/android_alarm_manager/CHANGELOG.md       |  6 ++++++
 .../android_alarm_manager/android/build.gradle    | 13 +++++++++++++
 packages/android_alarm_manager/pubspec.yaml       |  2 +-
 packages/android_intent/CHANGELOG.md              |  5 +++++
 packages/android_intent/android/build.gradle      | 13 +++++++++++++
 packages/android_intent/pubspec.yaml              |  2 +-
 packages/battery/CHANGELOG.md                     |  5 +++++
 packages/battery/android/build.gradle             | 13 +++++++++++++
 packages/battery/pubspec.yaml                     |  2 +-
 packages/camera/CHANGELOG.md                      |  5 +++++
 packages/camera/android/build.gradle              | 13 +++++++++++++
 packages/camera/pubspec.yaml                      |  2 +-
 packages/cloud_firestore/CHANGELOG.md             |  6 ++++++
 packages/cloud_firestore/android/build.gradle     | 13 +++++++++++++
 packages/cloud_firestore/pubspec.yaml             |  2 +-
 packages/cloud_functions/CHANGELOG.md             |  6 ++++++
 packages/cloud_functions/android/build.gradle     | 13 +++++++++++++
 packages/cloud_functions/pubspec.yaml             |  2 +-
 packages/connectivity/CHANGELOG.md                |  5 +++++
 packages/connectivity/android/build.gradle        | 13 +++++++++++++
 packages/connectivity/pubspec.yaml                |  2 +-
 packages/device_info/CHANGELOG.md                 |  5 +++++
 packages/device_info/android/build.gradle         | 13 +++++++++++++
 packages/device_info/pubspec.yaml                 |  2 +-
 packages/firebase_admob/CHANGELOG.md              |  6 ++++++
 packages/firebase_admob/android/build.gradle      | 13 +++++++++++++
 packages/firebase_admob/pubspec.yaml              |  2 +-
 packages/firebase_analytics/CHANGELOG.md          |  5 +++++
 packages/firebase_analytics/android/build.gradle  | 13 +++++++++++++
 packages/firebase_analytics/pubspec.yaml          |  2 +-
 packages/firebase_auth/CHANGELOG.md               |  5 +++++
 packages/firebase_auth/android/build.gradle       | 14 ++++++++++++++
 packages/firebase_auth/example/pubspec.yaml       |  2 +-
 packages/firebase_auth/pubspec.yaml               |  2 +-
 packages/firebase_core/CHANGELOG.md               |  5 +++++
 packages/firebase_core/android/build.gradle       | 13 +++++++++++++
 packages/firebase_core/pubspec.yaml               |  2 +-
 packages/firebase_database/CHANGELOG.md           |  5 +++++
 packages/firebase_database/android/build.gradle   | 13 +++++++++++++
 packages/firebase_database/pubspec.yaml           |  2 +-
 packages/firebase_dynamic_links/CHANGELOG.md      |  6 ++++++
 .../firebase_dynamic_links/android/build.gradle   | 13 +++++++++++++
 packages/firebase_dynamic_links/pubspec.yaml      |  2 +-
 packages/firebase_messaging/CHANGELOG.md          |  5 +++++
 packages/firebase_messaging/android/build.gradle  | 13 +++++++++++++
 packages/firebase_messaging/pubspec.yaml          |  2 +-
 packages/firebase_ml_vision/CHANGELOG.md          |  7 ++++++-
 packages/firebase_ml_vision/android/build.gradle  | 14 +++++++++++++-
 packages/firebase_ml_vision/pubspec.yaml          |  2 +-
 packages/firebase_performance/CHANGELOG.md        |  6 ++++++
 .../firebase_performance/android/build.gradle     | 13 +++++++++++++
 packages/firebase_performance/pubspec.yaml        |  2 +-
 packages/firebase_remote_config/CHANGELOG.md      |  6 ++++++
 .../firebase_remote_config/android/build.gradle   | 13 +++++++++++++
 packages/firebase_remote_config/pubspec.yaml      |  2 +-
 packages/firebase_storage/CHANGELOG.md            |  5 +++++
 packages/firebase_storage/android/build.gradle    | 13 +++++++++++++
 packages/firebase_storage/pubspec.yaml            |  2 +-
 packages/google_maps_flutter/CHANGELOG.md         |  5 +++++
 packages/google_maps_flutter/android/build.gradle | 13 +++++++++++++
 packages/google_maps_flutter/pubspec.yaml         |  2 +-
 packages/google_sign_in/CHANGELOG.md              |  5 +++++
 packages/google_sign_in/android/build.gradle      | 13 +++++++++++++
 packages/google_sign_in/pubspec.yaml              |  2 +-
 packages/image_picker/CHANGELOG.md                |  5 +++++
 packages/image_picker/android/build.gradle        | 13 +++++++++++++
 packages/image_picker/pubspec.yaml                |  2 +-
 packages/in_app_purchase/android/build.gradle     | 13 +++++++++++++
 packages/local_auth/CHANGELOG.md                  |  5 +++++
 packages/local_auth/android/build.gradle          | 13 +++++++++++++
 packages/local_auth/pubspec.yaml                  |  2 +-
 packages/location_background/CHANGELOG.md         |  5 +++++
 packages/location_background/android/build.gradle | 13 +++++++++++++
 packages/location_background/pubspec.yaml         |  2 +-
 packages/package_info/CHANGELOG.md                |  5 +++++
 packages/package_info/android/build.gradle        | 13 +++++++++++++
 packages/package_info/pubspec.yaml                |  2 +-
 packages/path_provider/CHANGELOG.md               |  5 +++++
 packages/path_provider/android/build.gradle       | 13 +++++++++++++
 packages/path_provider/pubspec.yaml               |  2 +-
 packages/quick_actions/CHANGELOG.md               |  5 +++++
 packages/quick_actions/android/build.gradle       | 13 +++++++++++++
 packages/quick_actions/pubspec.yaml               |  2 +-
 packages/sensors/CHANGELOG.md                     |  5 +++++
 packages/sensors/android/build.gradle             | 13 +++++++++++++
 packages/sensors/pubspec.yaml                     |  2 +-
 packages/share/CHANGELOG.md                       |  5 +++++
 packages/share/android/build.gradle               | 13 +++++++++++++
 packages/share/pubspec.yaml                       |  2 +-
 packages/shared_preferences/CHANGELOG.md          |  5 +++++
 packages/shared_preferences/android/build.gradle  | 13 +++++++++++++
 packages/shared_preferences/pubspec.yaml          |  2 +-
 packages/url_launcher/CHANGELOG.md                |  5 +++++
 packages/url_launcher/android/build.gradle        | 15 ++++++++++++++-
 packages/url_launcher/pubspec.yaml                |  2 +-
 packages/video_player/CHANGELOG.md                |  5 +++++
 packages/video_player/android/build.gradle        | 13 +++++++++++++
 packages/video_player/pubspec.yaml                |  2 +-
 packages/webview_flutter/CHANGELOG.md             |  5 +++++
 packages/webview_flutter/android/build.gradle     | 13 +++++++++++++
 packages/webview_flutter/pubspec.yaml             |  2 +-
 101 files changed, 651 insertions(+), 37 deletions(-)

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index 0ec184f085f7..dc2fe4088280 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.1+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.4.1
 * Added support for setting alarms which persist across reboots.
   * Both `AndroidAlarmManager.oneShot` and `AndroidAlarmManager.periodic` have
@@ -23,6 +28,7 @@
     ```
 
 ## 0.4.0
+
 * **Breaking change**. Migrated the underlying AlarmService to utilize a
   BroadcastReceiver with a JobIntentService instead of a Service to handle
   processing of alarms. This requires AndroidManifest.xml to be updated to
diff --git a/packages/android_alarm_manager/android/build.gradle b/packages/android_alarm_manager/android/build.gradle
index b29e92fb3156..5f1f42c49379 100644
--- a/packages/android_alarm_manager/android/build.gradle
+++ b/packages/android_alarm_manager/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "android_alarm_manager";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.androidalarmmanager'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index 5d3006a85aef..209334e8ce66 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -1,7 +1,7 @@
 name: android_alarm_manager
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.4.1
+version: 0.4.1+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 
diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md
index b9df1dcc2166..d9932e048a3a 100644
--- a/packages/android_intent/CHANGELOG.md
+++ b/packages/android_intent/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.3.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/android_intent/android/build.gradle b/packages/android_intent/android/build.gradle
index 5bbedab51aa1..8b21464f4b19 100644
--- a/packages/android_intent/android/build.gradle
+++ b/packages/android_intent/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "android_intent";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.androidintent'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/android_intent/pubspec.yaml b/packages/android_intent/pubspec.yaml
index 1991d5217c78..44e468d60e1e 100644
--- a/packages/android_intent/pubspec.yaml
+++ b/packages/android_intent/pubspec.yaml
@@ -2,7 +2,7 @@ name: android_intent
 description: Flutter plugin for launching Android Intents. Not supported on iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent
-version: 0.3.0
+version: 0.3.0+1
 
 flutter:
   plugin:
diff --git a/packages/battery/CHANGELOG.md b/packages/battery/CHANGELOG.md
index e93ac1a9b599..abb56c56aa6d 100644
--- a/packages/battery/CHANGELOG.md
+++ b/packages/battery/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.3.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/battery/android/build.gradle b/packages/battery/android/build.gradle
index ff485fbc6b29..ed302d2969e2 100644
--- a/packages/battery/android/build.gradle
+++ b/packages/battery/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "battery";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.battery'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/battery/pubspec.yaml b/packages/battery/pubspec.yaml
index 56f80bc28cc3..51b4d5aebb79 100644
--- a/packages/battery/pubspec.yaml
+++ b/packages/battery/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for accessing information about the battery state
   (full, charging, discharging) on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/battery
-version: 0.3.0
+version: 0.3.0+1
 
 flutter:
   plugin:
diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 23eedd0ee0e4..aee29c63dca6 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.0+3
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.3.0+2
 
 * Fix issue with calculating iOS image orientation in certain edge cases.
diff --git a/packages/camera/android/build.gradle b/packages/camera/android/build.gradle
index 9c6001b0a5c9..fbce7b86f8f7 100644
--- a/packages/camera/android/build.gradle
+++ b/packages/camera/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "camera";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.camera'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 8fc800083724..5197d67f64a1 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -1,7 +1,7 @@
 name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed and capturing images.
-version: 0.3.0+2
+version: 0.3.0+3
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>
diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index f8b020662c63..86761c884ec3 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,4 +1,10 @@
+## 0.9.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.9.0
+
 * **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
diff --git a/packages/cloud_firestore/android/build.gradle b/packages/cloud_firestore/android/build.gradle
index bd8c9cba5d2c..34b58bb46f72 100755
--- a/packages/cloud_firestore/android/build.gradle
+++ b/packages/cloud_firestore/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "cloud_firestore";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.firebase.firestore'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 31e02101578e..98a6600f722c 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.0
+version: 0.9.0+1
 
 flutter:
   plugin:
diff --git a/packages/cloud_functions/CHANGELOG.md b/packages/cloud_functions/CHANGELOG.md
index a4ff66466c7b..109160f13283 100644
--- a/packages/cloud_functions/CHANGELOG.md
+++ b/packages/cloud_functions/CHANGELOG.md
@@ -1,4 +1,10 @@
+## 0.1.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.1.0
+
 * **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
diff --git a/packages/cloud_functions/android/build.gradle b/packages/cloud_functions/android/build.gradle
index deb98ba76478..8352b929797d 100644
--- a/packages/cloud_functions/android/build.gradle
+++ b/packages/cloud_functions/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "cloud_functions";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.firebase.cloudfunctions.cloudfunctions'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/cloud_functions/pubspec.yaml b/packages/cloud_functions/pubspec.yaml
index 40ee9cdc7de6..78ad901e200e 100644
--- a/packages/cloud_functions/pubspec.yaml
+++ b/packages/cloud_functions/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cloud_functions
 description: Flutter plugin for Cloud Functions.
-version: 0.1.0
+version: 0.1.0+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_functions
 
diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md
index 80bde632186f..411b2a698bb2 100644
--- a/packages/connectivity/CHANGELOG.md
+++ b/packages/connectivity/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.0+2
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.4.0+1
 
 * Updated `Connectivity` to a singleton.
diff --git a/packages/connectivity/android/build.gradle b/packages/connectivity/android/build.gradle
index b9b147b29b77..681eb0438b75 100644
--- a/packages/connectivity/android/build.gradle
+++ b/packages/connectivity/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "connectivity";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.connectivity'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml
index 49084bc65747..07e5dba9fcbf 100644
--- a/packages/connectivity/pubspec.yaml
+++ b/packages/connectivity/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi &
   mobile/cellular) connectivity on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
-version: 0.4.0+1
+version: 0.4.0+2
 
 flutter:
   plugin:
diff --git a/packages/device_info/CHANGELOG.md b/packages/device_info/CHANGELOG.md
index 2028425f57b8..0cd39ed0b6eb 100644
--- a/packages/device_info/CHANGELOG.md
+++ b/packages/device_info/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## 0.4.0
 
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
+## 0.4.0
+
 * **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
diff --git a/packages/device_info/android/build.gradle b/packages/device_info/android/build.gradle
index 92dc70f6ed72..df08280c0b1b 100644
--- a/packages/device_info/android/build.gradle
+++ b/packages/device_info/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "device_info";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.deviceinfo'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/device_info/pubspec.yaml b/packages/device_info/pubspec.yaml
index 81c059d6ffe2..762677c6a2e8 100644
--- a/packages/device_info/pubspec.yaml
+++ b/packages/device_info/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin providing detailed information about the device
   (make, model, etc.), and Android or iOS version the app is running on.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/device_info
-version: 0.4.0
+version: 0.4.0+1
 
 flutter:
   plugin:
diff --git a/packages/firebase_admob/CHANGELOG.md b/packages/firebase_admob/CHANGELOG.md
index 5ee94567af8d..6039575c141d 100644
--- a/packages/firebase_admob/CHANGELOG.md
+++ b/packages/firebase_admob/CHANGELOG.md
@@ -1,4 +1,10 @@
+## 0.8.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.8.0
+
 * **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
diff --git a/packages/firebase_admob/android/build.gradle b/packages/firebase_admob/android/build.gradle
index 9d3d707cc1b8..cd82b1bf15b0 100644
--- a/packages/firebase_admob/android/build.gradle
+++ b/packages/firebase_admob/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "firebase_admob";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.firebaseadmob'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/firebase_admob/pubspec.yaml b/packages/firebase_admob/pubspec.yaml
index 6cc739a5d42e..1237d729fd80 100644
--- a/packages/firebase_admob/pubspec.yaml
+++ b/packages/firebase_admob/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_admob
 description: Firebase AdMob plugin for Flutter applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_admob
-version: 0.8.0
+version: 0.8.0+1
 
 flutter:
   plugin:
diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index b3880e843947..e657960f5b7e 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.0.1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 2.0.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/firebase_analytics/android/build.gradle b/packages/firebase_analytics/android/build.gradle
index 7d9e329938a1..5031bfd92710 100755
--- a/packages/firebase_analytics/android/build.gradle
+++ b/packages/firebase_analytics/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "firebase_analytics";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.firebaseanalytics'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index d3cd02d1c23f..e8f889cfd166 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 2.0.0
+version: 2.0.1
 
 flutter:
   plugin:
diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index b3b2cff91f77..3a95b2c152e2 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.8.0+3
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.8.0+2
 
 * Update Google sign-in example in the README.
diff --git a/packages/firebase_auth/android/build.gradle b/packages/firebase_auth/android/build.gradle
index d45757f3cdd0..2150001cff02 100755
--- a/packages/firebase_auth/android/build.gradle
+++ b/packages/firebase_auth/android/build.gradle
@@ -1,3 +1,17 @@
+def PLUGIN = "firebase_auth";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
+
 group 'io.flutter.plugins.firebaseauth'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/example/pubspec.yaml
index 6537e88a331f..ed5d762da670 100755
--- a/packages/firebase_auth/example/pubspec.yaml
+++ b/packages/firebase_auth/example/pubspec.yaml
@@ -7,7 +7,7 @@ dependencies:
     sdk: flutter
   firebase_auth:
     path: ../
-  google_sign_in: ^3.0.4
+  google_sign_in: ^4.0.0
   firebase_core: ^0.3.0
 
 flutter:
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 8466b83c0b64..16ab145780bd 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.0+2"
+version: "0.8.0+3"
 
 flutter:
   plugin:
diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md
index 377b4a330e32..c792b1f33da0 100644
--- a/packages/firebase_core/CHANGELOG.md
+++ b/packages/firebase_core/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.3.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/firebase_core/android/build.gradle b/packages/firebase_core/android/build.gradle
index 568a19d644a1..9aaf4bf3d7a6 100644
--- a/packages/firebase_core/android/build.gradle
+++ b/packages/firebase_core/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "firebase_core";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.firebase.core'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml
index 0efe671c0041..5419620265c7 100644
--- a/packages/firebase_core/pubspec.yaml
+++ b/packages/firebase_core/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Core, enabling connecting to multiple
   Firebase apps.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_core
-version: 0.3.0
+version: 0.3.0+1
 
 flutter:
   plugin:
diff --git a/packages/firebase_database/CHANGELOG.md b/packages/firebase_database/CHANGELOG.md
index d037f64e42c2..42aa1e2d4027 100644
--- a/packages/firebase_database/CHANGELOG.md
+++ b/packages/firebase_database/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.0.1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 2.0.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/firebase_database/android/build.gradle b/packages/firebase_database/android/build.gradle
index 6304130ff5a6..f51f2acfb444 100755
--- a/packages/firebase_database/android/build.gradle
+++ b/packages/firebase_database/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "firebase_database";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.firebase.database'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/firebase_database/pubspec.yaml b/packages/firebase_database/pubspec.yaml
index 913c247b5189..75ade3194293 100755
--- a/packages/firebase_database/pubspec.yaml
+++ b/packages/firebase_database/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Database, a cloud-hosted NoSQL database
   with realtime data syncing across Android and iOS clients, and offline access.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_database
-version: 2.0.0
+version: 2.0.1
 
 flutter:
   plugin:
diff --git a/packages/firebase_dynamic_links/CHANGELOG.md b/packages/firebase_dynamic_links/CHANGELOG.md
index 4c309de85498..9414680bac01 100644
--- a/packages/firebase_dynamic_links/CHANGELOG.md
+++ b/packages/firebase_dynamic_links/CHANGELOG.md
@@ -1,4 +1,10 @@
+## 0.2.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.2.0
+
 * **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
diff --git a/packages/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/android/build.gradle
index 47c937902024..2077643d2db4 100644
--- a/packages/firebase_dynamic_links/android/build.gradle
+++ b/packages/firebase_dynamic_links/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "firebase_dynamic_links";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.firebasedynamiclinks'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/pubspec.yaml
index 9ba9ef6c1329..105010314af4 100644
--- a/packages/firebase_dynamic_links/pubspec.yaml
+++ b/packages/firebase_dynamic_links/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_dynamic_links
 description: Flutter plugin for Google Dynamic Links for Firebase, an app solution for creating
   and handling links across multiple platforms.
-version: 0.2.0
+version: 0.2.0+1
 
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_dynamic_links
diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index 3a8f1c59e740..a729641d0163 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 3.0.1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 3.0.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/firebase_messaging/android/build.gradle b/packages/firebase_messaging/android/build.gradle
index 6fe6bcac24d0..34c75c16a46b 100644
--- a/packages/firebase_messaging/android/build.gradle
+++ b/packages/firebase_messaging/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "firebase_messaging";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.firebasemessaging'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
index a9cdfb5d5f7c..98a1b578ab09 100644
--- a/packages/firebase_messaging/pubspec.yaml
+++ b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 3.0.0
+version: 3.0.1
 
 flutter:
   plugin:
diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 2bf3227ff497..dafd2fdb0219 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.4.0
 
 * **Breaking Change** Removal of base detector class `FirebaseVisionDetector`.
@@ -6,7 +11,7 @@
 
 ## 0.3.0
 
-* **Breaking Change** Migrate from the deprecated original Android Support
+* **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
   migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
diff --git a/packages/firebase_ml_vision/android/build.gradle b/packages/firebase_ml_vision/android/build.gradle
index ce0be9652cb5..395787374241 100644
--- a/packages/firebase_ml_vision/android/build.gradle
+++ b/packages/firebase_ml_vision/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "firebase_ml_vision";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.firebasemlvision'
 version '1.0-SNAPSHOT'
 
@@ -32,7 +45,6 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.android.support:support-v4:27.1.1'
         api 'com.google.firebase:firebase-ml-vision:17.0.1'
         api 'com.google.firebase:firebase-ml-vision-image-label-model:16.2.0'
         implementation 'androidx.annotation:annotation:1.0.0'
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index 80cbef6c6ecd..a41791ccc1b6 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_ml_vision
 description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.4.0
+version: 0.4.0+1
 
 dependencies:
   flutter:
diff --git a/packages/firebase_performance/CHANGELOG.md b/packages/firebase_performance/CHANGELOG.md
index 08be06d49bdf..f689650e5bb5 100644
--- a/packages/firebase_performance/CHANGELOG.md
+++ b/packages/firebase_performance/CHANGELOG.md
@@ -1,4 +1,10 @@
+## 0.1.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.1.0
+
 * **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
diff --git a/packages/firebase_performance/android/build.gradle b/packages/firebase_performance/android/build.gradle
index 285bf85093e9..d74a4b24bc6e 100644
--- a/packages/firebase_performance/android/build.gradle
+++ b/packages/firebase_performance/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "firebase_performance";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.firebaseperformance'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/firebase_performance/pubspec.yaml b/packages/firebase_performance/pubspec.yaml
index 7dfcc0b5b84b..c429248a1ca4 100644
--- a/packages/firebase_performance/pubspec.yaml
+++ b/packages/firebase_performance/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Google Performance Monitoring for Firebase, an a
   iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_performance
-version: 0.1.0
+version: 0.1.0+1
 
 dependencies:
   flutter:
diff --git a/packages/firebase_remote_config/CHANGELOG.md b/packages/firebase_remote_config/CHANGELOG.md
index e0f060b83655..9d312525f04e 100644
--- a/packages/firebase_remote_config/CHANGELOG.md
+++ b/packages/firebase_remote_config/CHANGELOG.md
@@ -1,4 +1,10 @@
+## 0.1.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.1.0
+
 * **Breaking change**. Migrate from the deprecated original Android Support
   Library to AndroidX. This shouldn't result in any functional changes, but it
   requires any Android apps using this plugin to [also
diff --git a/packages/firebase_remote_config/android/build.gradle b/packages/firebase_remote_config/android/build.gradle
index 2b48c7b41b4c..5994006e4d7a 100644
--- a/packages/firebase_remote_config/android/build.gradle
+++ b/packages/firebase_remote_config/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "firebase_remote_config";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.firebase.firebaseremoteconfig'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/pubspec.yaml
index b8aca7f0112e..867ff9f46de4 100644
--- a/packages/firebase_remote_config/pubspec.yaml
+++ b/packages/firebase_remote_config/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Remote Config. Update your application
   re-releasing.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_remote_config
-version: 0.1.0
+version: 0.1.0+1
 
 dependencies:
   flutter:
diff --git a/packages/firebase_storage/CHANGELOG.md b/packages/firebase_storage/CHANGELOG.md
index 20aa66481d6e..7736238b9612 100644
--- a/packages/firebase_storage/CHANGELOG.md
+++ b/packages/firebase_storage/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.0.1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 2.0.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/firebase_storage/android/build.gradle b/packages/firebase_storage/android/build.gradle
index 1defb76f1d89..0445829f8300 100755
--- a/packages/firebase_storage/android/build.gradle
+++ b/packages/firebase_storage/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "firebase_storage";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.firebase.storage'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/firebase_storage/pubspec.yaml b/packages/firebase_storage/pubspec.yaml
index 3cb69f00ec92..45fefeb7e61b 100755
--- a/packages/firebase_storage/pubspec.yaml
+++ b/packages/firebase_storage/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Storage, a powerful, simple, and
   cost-effective object storage service for Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_storage
-version: 2.0.0
+version: 2.0.1
 
 flutter:
   plugin:
diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index e274d3399c3b..85a6d530d795 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.0+2
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.2.0+1
 
 * Fixed a bug which the camera is not positioned correctly at map initialization(temporary workaround)(https://github.com/flutter/flutter/issues/27550).
diff --git a/packages/google_maps_flutter/android/build.gradle b/packages/google_maps_flutter/android/build.gradle
index 74ef7d1e292e..c5abb710ccea 100644
--- a/packages/google_maps_flutter/android/build.gradle
+++ b/packages/google_maps_flutter/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "google_maps_flutter";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.googlemaps'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index af96fda7adfc..f1ee54f78bc9 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.2.0+1
+version: 0.2.0+2
 
 dependencies:
   flutter:
diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md
index d1da1336cc38..b357d8cf0c12 100644
--- a/packages/google_sign_in/CHANGELOG.md
+++ b/packages/google_sign_in/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 4.0.1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 4.0.0+1
 
 * Added a better error message for iOS when the app is missing necessary URL schemes.
diff --git a/packages/google_sign_in/android/build.gradle b/packages/google_sign_in/android/build.gradle
index f51d723219ff..9162c3080e50 100755
--- a/packages/google_sign_in/android/build.gradle
+++ b/packages/google_sign_in/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "google_sign_in";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.googlesignin'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml
index 92e80ab5caba..23279a1e0a7f 100755
--- a/packages/google_sign_in/pubspec.yaml
+++ b/packages/google_sign_in/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in
-version: 4.0.0+1
+version: 4.0.1
 
 flutter:
   plugin:
diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index ee65ab4c29cf..f2ffce005561 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.5.0+2
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.5.0+1
 
 * Fix a crash when user calls the plugin in quick succession on Android.
diff --git a/packages/image_picker/android/build.gradle b/packages/image_picker/android/build.gradle
index f9a579843d40..7de0adc60eb9 100755
--- a/packages/image_picker/android/build.gradle
+++ b/packages/image_picker/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "image_picker";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.imagepicker'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 73e267977f92..607956edea58 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.0+1
+version: 0.5.0+2
 
 flutter:
   plugin:
diff --git a/packages/in_app_purchase/android/build.gradle b/packages/in_app_purchase/android/build.gradle
index c30115927f91..2f6ec7d92222 100644
--- a/packages/in_app_purchase/android/build.gradle
+++ b/packages/in_app_purchase/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "in_app_purchase";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.inapppurchase'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/local_auth/CHANGELOG.md b/packages/local_auth/CHANGELOG.md
index 843ae0df45ca..f1e64da1c16e 100644
--- a/packages/local_auth/CHANGELOG.md
+++ b/packages/local_auth/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.4.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/local_auth/android/build.gradle b/packages/local_auth/android/build.gradle
index 0cea02c1b04b..fd9893f94e29 100644
--- a/packages/local_auth/android/build.gradle
+++ b/packages/local_auth/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "local_auth";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.localauth'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/local_auth/pubspec.yaml b/packages/local_auth/pubspec.yaml
index f238b034a75a..93afb6299fc4 100644
--- a/packages/local_auth/pubspec.yaml
+++ b/packages/local_auth/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Android and iOS device authentication sensors
   such as Fingerprint Reader and Touch ID.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/local_auth
-version: 0.4.0
+version: 0.4.0+1
 
 flutter:
   plugin:
diff --git a/packages/location_background/CHANGELOG.md b/packages/location_background/CHANGELOG.md
index 50934f5f77e7..e9815106d525 100644
--- a/packages/location_background/CHANGELOG.md
+++ b/packages/location_background/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.1.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/location_background/android/build.gradle b/packages/location_background/android/build.gradle
index a8f26894aced..be694b19b05c 100644
--- a/packages/location_background/android/build.gradle
+++ b/packages/location_background/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "location_background";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'com.flutter.example.locationbackgroundplugin'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/location_background/pubspec.yaml b/packages/location_background/pubspec.yaml
index c838a834440b..5ecd21a51ef7 100644
--- a/packages/location_background/pubspec.yaml
+++ b/packages/location_background/pubspec.yaml
@@ -2,7 +2,7 @@ name: location_background_plugin
 description: A new flutter plugin project.
 author:  Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/location_background
-version: 0.1.0
+version: 0.1.0+1
 
 dependencies:
   flutter:
diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md
index 5060c31123b0..cfb22a9d112e 100644
--- a/packages/package_info/CHANGELOG.md
+++ b/packages/package_info/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.4.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/package_info/android/build.gradle b/packages/package_info/android/build.gradle
index d05fa363d3c1..2feb6adb735d 100644
--- a/packages/package_info/android/build.gradle
+++ b/packages/package_info/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "package_info";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.packageinfo'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml
index c91cb523fb9c..7fd707d05500 100644
--- a/packages/package_info/pubspec.yaml
+++ b/packages/package_info/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for querying information about the application
   package, such as CFBundleVersion on iOS or versionCode on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/package_info
-version: 0.4.0
+version: 0.4.0+1
 
 flutter:
   plugin:
diff --git a/packages/path_provider/CHANGELOG.md b/packages/path_provider/CHANGELOG.md
index 8a0499493851..b2578a43ba60 100644
--- a/packages/path_provider/CHANGELOG.md
+++ b/packages/path_provider/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.5.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.5.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/path_provider/android/build.gradle b/packages/path_provider/android/build.gradle
index a52b24f66378..191930fee299 100644
--- a/packages/path_provider/android/build.gradle
+++ b/packages/path_provider/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "path_provider";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.pathprovider'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/path_provider/pubspec.yaml b/packages/path_provider/pubspec.yaml
index 9156895d3f48..2d3304dcaa35 100644
--- a/packages/path_provider/pubspec.yaml
+++ b/packages/path_provider/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for getting commonly used locations on the Android &
   iOS file systems, such as the temp and app data directories.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider
-version: 0.5.0
+version: 0.5.0+1
 
 flutter:
   plugin:
diff --git a/packages/quick_actions/CHANGELOG.md b/packages/quick_actions/CHANGELOG.md
index 93a4c233fa70..bd87c4f3175c 100644
--- a/packages/quick_actions/CHANGELOG.md
+++ b/packages/quick_actions/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.3.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/quick_actions/android/build.gradle b/packages/quick_actions/android/build.gradle
index 648b654dbfcd..09576acb660b 100644
--- a/packages/quick_actions/android/build.gradle
+++ b/packages/quick_actions/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "quick_actions";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.quickactions'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/quick_actions/pubspec.yaml b/packages/quick_actions/pubspec.yaml
index 779a5f7731c9..17d31b8bca9a 100644
--- a/packages/quick_actions/pubspec.yaml
+++ b/packages/quick_actions/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for creating shortcuts on home screen, also known as
   Quick Actions on iOS and App Shortcuts on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/quick_actions
-version: 0.3.0
+version: 0.3.0+1
 
 flutter:
   plugin:
diff --git a/packages/sensors/CHANGELOG.md b/packages/sensors/CHANGELOG.md
index 9fccf527bbf5..a9a4a521cb33 100644
--- a/packages/sensors/CHANGELOG.md
+++ b/packages/sensors/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.4.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/sensors/android/build.gradle b/packages/sensors/android/build.gradle
index c42795200e62..56a76026f57a 100644
--- a/packages/sensors/android/build.gradle
+++ b/packages/sensors/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "sensors";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.sensors'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/sensors/pubspec.yaml b/packages/sensors/pubspec.yaml
index d89b15f25d2f..dcf0e26dbe00 100644
--- a/packages/sensors/pubspec.yaml
+++ b/packages/sensors/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for accessing the Android and iOS accelerometer and
   gyroscope sensors.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/sensors
-version: 0.4.0
+version: 0.4.0+1
 
 flutter:
   plugin:
diff --git a/packages/share/CHANGELOG.md b/packages/share/CHANGELOG.md
index b21c925ce3ef..802a5e34a113 100644
--- a/packages/share/CHANGELOG.md
+++ b/packages/share/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.6.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.6.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/share/android/build.gradle b/packages/share/android/build.gradle
index ff794c1e56d8..7e3700549674 100644
--- a/packages/share/android/build.gradle
+++ b/packages/share/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "share";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.share'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/share/pubspec.yaml b/packages/share/pubspec.yaml
index 5954a80994e1..e3b161b0ff87 100644
--- a/packages/share/pubspec.yaml
+++ b/packages/share/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for sharing content via the platform share UI, using
   the ACTION_SEND intent on Android and UIActivityViewController on iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/share
-version: 0.6.0
+version: 0.6.0+1
 
 flutter:
   plugin:
diff --git a/packages/shared_preferences/CHANGELOG.md b/packages/shared_preferences/CHANGELOG.md
index b0b8ec8948d1..992460fa253a 100644
--- a/packages/shared_preferences/CHANGELOG.md
+++ b/packages/shared_preferences/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.5.1+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.5.1
 
 * Use String to save double in Android.
diff --git a/packages/shared_preferences/android/build.gradle b/packages/shared_preferences/android/build.gradle
index 515d7ac12bab..d7a8ffcd7e9a 100644
--- a/packages/shared_preferences/android/build.gradle
+++ b/packages/shared_preferences/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "shared_preferences";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.sharedpreferences'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/shared_preferences/pubspec.yaml b/packages/shared_preferences/pubspec.yaml
index 4e9805cfdf35..3bbdbd731e53 100644
--- a/packages/shared_preferences/pubspec.yaml
+++ b/packages/shared_preferences/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for reading and writing simple key-value pairs.
   Wraps NSUserDefaults on iOS and SharedPreferences on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences
-version: 0.5.1
+version: 0.5.1+1
 
 flutter:
   plugin:
diff --git a/packages/url_launcher/CHANGELOG.md b/packages/url_launcher/CHANGELOG.md
index 2642d33d8b31..f771f875010a 100644
--- a/packages/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 5.0.1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 5.0.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/url_launcher/android/build.gradle b/packages/url_launcher/android/build.gradle
index 0d3a58d3f292..641b2e29f81a 100644
--- a/packages/url_launcher/android/build.gradle
+++ b/packages/url_launcher/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "url_launcher";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.urllauncher'
 version '1.0-SNAPSHOT'
 
@@ -31,4 +44,4 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
-}
+}
\ No newline at end of file
diff --git a/packages/url_launcher/pubspec.yaml b/packages/url_launcher/pubspec.yaml
index 77892fd9a35e..7b476e3a6037 100644
--- a/packages/url_launcher/pubspec.yaml
+++ b/packages/url_launcher/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher
-version: 5.0.0
+version: 5.0.1
 
 flutter:
   plugin:
diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md
index c9696e7c377d..6280b9ce47ed 100644
--- a/packages/video_player/CHANGELOG.md
+++ b/packages/video_player/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.10.0+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.10.0
 
 * **Breaking change**. Migrate from the deprecated original Android Support
diff --git a/packages/video_player/android/build.gradle b/packages/video_player/android/build.gradle
index a67f98e35a5e..0ab2a168f533 100644
--- a/packages/video_player/android/build.gradle
+++ b/packages/video_player/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "video_player";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.videoplayer'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml
index a16908070c1c..748c831e6e1d 100644
--- a/packages/video_player/pubspec.yaml
+++ b/packages/video_player/pubspec.yaml
@@ -2,7 +2,7 @@ name: video_player
 description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
-version: 0.10.0
+version: 0.10.0+1
 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player
 
 flutter:
diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 3ca357898633..a19fec80cae9 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.2+1
+
+* Log a more detailed warning at build time about the previous AndroidX
+  migration.
+
 ## 0.3.2
 
 * Added CookieManager to interface with WebView cookies. Currently has the ability to clear cookies.
diff --git a/packages/webview_flutter/android/build.gradle b/packages/webview_flutter/android/build.gradle
index 460446a90ed2..098c2f4bf388 100644
--- a/packages/webview_flutter/android/build.gradle
+++ b/packages/webview_flutter/android/build.gradle
@@ -1,3 +1,16 @@
+def PLUGIN = "webview_flutter";
+def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
+gradle.buildFinished { buildResult ->
+    if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
+        println '         *********************************************************'
+        println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
+        println '         See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
+        println '         This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
+        println '         *********************************************************'
+        rootProject.ext.set(ANDROIDX_WARNING, true);
+    }
+}
+
 group 'io.flutter.plugins.webviewflutter'
 version '1.0-SNAPSHOT'
 
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 4b982b64c7a3..4c658b69c5d9 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.2
+version: 0.3.2+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From 96235f97b8ebadde1c25000adae49ec192fb04be Mon Sep 17 00:00:00 2001
From: KyleWong <kangwang1988@users.noreply.github.com>
Date: Fri, 8 Feb 2019 15:05:29 +0800
Subject: [PATCH 110/410] Fix biometrics check error below ios11. (#1173)

* Fix biometrics check error below ios11.
---
 packages/local_auth/ios/Classes/LocalAuthPlugin.m | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/local_auth/ios/Classes/LocalAuthPlugin.m b/packages/local_auth/ios/Classes/LocalAuthPlugin.m
index 47b50e486a02..4b1e62aed652 100644
--- a/packages/local_auth/ios/Classes/LocalAuthPlugin.m
+++ b/packages/local_auth/ios/Classes/LocalAuthPlugin.m
@@ -77,6 +77,8 @@ - (void)getAvailableBiometrics:(FlutterResult)result {
         } else if (context.biometryType == LABiometryTypeTouchID) {
           [biometrics addObject:@"fingerprint"];
         }
+      } else {
+        [biometrics addObject:@"fingerprint"];
       }
     }
   } else if (authError.code == LAErrorTouchIDNotEnrolled) {

From 0132666982247a4562114382fb3f40019275703b Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Fri, 8 Feb 2019 11:11:53 -0800
Subject: [PATCH 111/410] remove extra space (#1185)

---
 packages/firebase_auth/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/firebase_auth/README.md b/packages/firebase_auth/README.md
index 166d52475d83..58657deabdd0 100755
--- a/packages/firebase_auth/README.md
+++ b/packages/firebase_auth/README.md
@@ -68,7 +68,7 @@ Future<FirebaseUser> _handleSignIn() async {
     accessToken: googleAuth.accessToken,
     idToken: googleAuth.idToken,
   );
-  
+
   final FirebaseUser user = await _auth.signInWithCredential(credential);
   print("signed in " + user.displayName);
   return user;

From ebb77584cede64abc55dbf2ff9928c3c891ffa4b Mon Sep 17 00:00:00 2001
From: aoi <aoinakanishi@users.noreply.github.com>
Date: Sat, 9 Feb 2019 04:52:57 +0900
Subject: [PATCH 112/410] Add Swift example to README.md for
 google_maps_flutter (#1161)

---
 packages/google_maps_flutter/README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/google_maps_flutter/README.md b/packages/google_maps_flutter/README.md
index eb2031446349..a00e69840464 100644
--- a/packages/google_maps_flutter/README.md
+++ b/packages/google_maps_flutter/README.md
@@ -57,6 +57,25 @@ Specify your API key in the application delegate `ios/Runner/AppDelegate.m`:
 @end
 ```
 
+Or in your swift code, specify your API key in the application delegate `ios/Runner/AppDelegate.swift`:
+
+```swift
+import UIKit
+import Flutter
+import GoogleMaps
+
+@UIApplicationMain
+@objc class AppDelegate: FlutterAppDelegate {
+  override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?
+  ) -> Bool {
+    GMSServices.provideAPIKey("YOUR KEY HERE")
+    GeneratedPluginRegistrant.register(with: self)
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+}
+```
 Opt-in to the embedded views preview by adding a boolean property to the app's `Info.plist` file
 with the key `io.flutter.embedded_views_preview` and the value `YES`.
 

From f8923c9d19f535914a3258657840dfa82cc838b4 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Fri, 8 Feb 2019 12:24:19 -0800
Subject: [PATCH 113/410] Fix image picker crash when used with android alarm
 manager (#1125)

Fixing [flutter/flutter#21972](https://github.com/flutter/flutter/issues/21972)
Android Alarm Manager will create a background flutter view to register plugins. When that happens, image_picker will be registered without an activity, which then caused crash.
So we escape the registration process when there is no activity in the registrar.
---
 packages/image_picker/CHANGELOG.md                       | 4 ++++
 .../flutter/plugins/imagepicker/ImagePickerPlugin.java   | 5 +++++
 .../plugins/imagepicker/ImagePickerPluginTest.java       | 9 +++++++++
 packages/image_picker/pubspec.yaml                       | 2 +-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index f2ffce005561..b7a9538fc714 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.0+3
+
+* Fixed am Android crash when Image Picker is registered without an activity.
+
 ## 0.5.0+2
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
index 36b44fc7e745..7e736b082df1 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
@@ -21,6 +21,11 @@ public class ImagePickerPlugin implements MethodChannel.MethodCallHandler {
   private final ImagePickerDelegate delegate;
 
   public static void registerWith(PluginRegistry.Registrar registrar) {
+    if (registrar.activity() == null) {
+      // If a background flutter view tries to register the plugin, there will be no activity from the registrar,
+      // we stop the registering process immediately because the ImagePicker requires an activity.
+      return;
+    }
     final MethodChannel channel = new MethodChannel(registrar.messenger(), CHANNEL);
 
     final File externalFilesDirectory =
diff --git a/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java b/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
index e2f2e9d1c178..23c888643c63 100644
--- a/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
+++ b/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
@@ -1,5 +1,6 @@
 package io.flutter.plugins.imagepicker;
 
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
@@ -95,6 +96,14 @@ public void onMethodCall_WhenSourceIsCamera_InvokesTakeImageWithCamera() {
     verifyZeroInteractions(mockResult);
   }
 
+  @Test
+  public void onResiter_WhenAcitivityIsNull_ShouldNotCrash() {
+    when(mockRegistrar.activity()).thenReturn(null);
+    ImagePickerPlugin.registerWith((mockRegistrar));
+    assertTrue(
+        "No exception thrown when ImagePickerPlugin.registerWith ran with activity = null", true);
+  }
+
   private MethodCall buildMethodCall(final int source) {
     final Map<String, Object> arguments = new HashMap<>();
     arguments.put("source", source);
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 607956edea58..226c9f1d5ae7 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.0+2
+version: 0.5.0+3
 
 flutter:
   plugin:

From 3c4541c5b228956d5cd30366bb03eff25c0f7abb Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 11 Feb 2019 06:41:51 -0800
Subject: [PATCH 114/410] Fix Firebase phone auth on Android (#1176)

Fixes flutter/flutter#27132
---
 packages/firebase_auth/CHANGELOG.md                        | 4 ++++
 .../flutter/plugins/firebaseauth/FirebaseAuthPlugin.java   | 7 +++++++
 packages/firebase_auth/pubspec.yaml                        | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index 3a95b2c152e2..dfaf7ecde8a7 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.1
+
+* Fixes Firebase auth phone sign-in for Android.
+
 ## 0.8.0+3
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
index e8fe96212726..e88b4b66cfc2 100755
--- a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
+++ b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
@@ -382,6 +382,13 @@ private AuthCredential getCredential(Map<String, Object> arguments) {
           credential = GithubAuthProvider.getCredential(token);
           break;
         }
+      case PhoneAuthProvider.PROVIDER_ID:
+        {
+          String accessToken = data.get("verificationId");
+          String smsCode = data.get("smsCode");
+          credential = PhoneAuthProvider.getCredential(accessToken, smsCode);
+          break;
+        }
       default:
         {
           credential = null;
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 16ab145780bd..405e7f1b75bf 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.0+3"
+version: "0.8.1"
 
 flutter:
   plugin:

From 7c34ac1917b34109022066e32d74f8f9eb52ce9d Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 11 Feb 2019 06:43:30 -0800
Subject: [PATCH 115/410] Add unit tests to connectivity plugin (#1175)

---
 packages/connectivity/CHANGELOG.md            |  4 +
 packages/connectivity/lib/connectivity.dart   | 23 +++---
 packages/connectivity/pubspec.yaml            |  7 +-
 .../connectivity/test/connectivity_test.dart  | 75 +++++++++++++++++++
 4 files changed, 99 insertions(+), 10 deletions(-)
 create mode 100644 packages/connectivity/test/connectivity_test.dart

diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md
index 411b2a698bb2..5f3a234b4f01 100644
--- a/packages/connectivity/CHANGELOG.md
+++ b/packages/connectivity/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.1
+
+* Add unit tests.
+
 ## 0.4.0+2
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/connectivity/lib/connectivity.dart b/packages/connectivity/lib/connectivity.dart
index 00df102b7ef1..2d7c9c8fa975 100644
--- a/packages/connectivity/lib/connectivity.dart
+++ b/packages/connectivity/lib/connectivity.dart
@@ -5,6 +5,7 @@
 import 'dart:async';
 
 import 'package:flutter/services.dart';
+import 'package:meta/meta.dart';
 
 /// Connection Status Check Result
 ///
@@ -13,12 +14,6 @@ import 'package:flutter/services.dart';
 /// None: Device not connected to any network
 enum ConnectivityResult { wifi, mobile, none }
 
-const MethodChannel _methodChannel =
-    MethodChannel('plugins.flutter.io/connectivity');
-
-const EventChannel _eventChannel =
-    EventChannel('plugins.flutter.io/connectivity_status');
-
 class Connectivity {
   /// Constructs a singleton instance of [Connectivity].
   ///
@@ -39,10 +34,20 @@ class Connectivity {
 
   Stream<ConnectivityResult> _onConnectivityChanged;
 
+  @visibleForTesting
+  static const MethodChannel methodChannel = MethodChannel(
+    'plugins.flutter.io/connectivity',
+  );
+
+  @visibleForTesting
+  static const EventChannel eventChannel = EventChannel(
+    'plugins.flutter.io/connectivity_status',
+  );
+
   /// Fires whenever the connectivity state changes.
   Stream<ConnectivityResult> get onConnectivityChanged {
     if (_onConnectivityChanged == null) {
-      _onConnectivityChanged = _eventChannel
+      _onConnectivityChanged = eventChannel
           .receiveBroadcastStream()
           .map((dynamic event) => _parseConnectivityResult(event));
     }
@@ -59,7 +64,7 @@ class Connectivity {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
-    final String result = await _methodChannel.invokeMethod('check');
+    final String result = await methodChannel.invokeMethod('check');
     return _parseConnectivityResult(result);
   }
 
@@ -73,7 +78,7 @@ class Connectivity {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
-    String wifiName = await _methodChannel.invokeMethod('wifiName');
+    String wifiName = await methodChannel.invokeMethod('wifiName');
     // as Android might return <unknown ssid>, uniforming result
     // our iOS implementation will return null
     if (wifiName == '<unknown ssid>') wifiName = null;
diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml
index 07e5dba9fcbf..28a8c089b813 100644
--- a/packages/connectivity/pubspec.yaml
+++ b/packages/connectivity/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi &
   mobile/cellular) connectivity on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
-version: 0.4.0+2
+version: 0.4.1
 
 flutter:
   plugin:
@@ -14,6 +14,11 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
+  meta: "^1.0.5"
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
diff --git a/packages/connectivity/test/connectivity_test.dart b/packages/connectivity/test/connectivity_test.dart
new file mode 100644
index 000000000000..134310af07b5
--- /dev/null
+++ b/packages/connectivity/test/connectivity_test.dart
@@ -0,0 +1,75 @@
+import 'package:flutter/services.dart';
+import 'package:connectivity/connectivity.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('$Connectivity', () {
+    final List<MethodCall> log = <MethodCall>[];
+
+    setUp(() async {
+      Connectivity.methodChannel
+          .setMockMethodCallHandler((MethodCall methodCall) async {
+        log.add(methodCall);
+        switch (methodCall.method) {
+          case 'check':
+            return 'wifi';
+          case 'wifiName':
+            return '1337wifi';
+          default:
+            return null;
+        }
+      });
+      log.clear();
+      MethodChannel(Connectivity.eventChannel.name)
+          .setMockMethodCallHandler((MethodCall methodCall) async {
+        switch (methodCall.method) {
+          case 'listen':
+            await BinaryMessages.handlePlatformMessage(
+              Connectivity.eventChannel.name,
+              Connectivity.eventChannel.codec.encodeSuccessEnvelope('wifi'),
+              (_) {},
+            );
+            break;
+          case 'cancel':
+          default:
+            return null;
+        }
+      });
+    });
+
+    test('onConnectivityChanged', () async {
+      final ConnectivityResult result =
+          await Connectivity().onConnectivityChanged.first;
+      expect(result, ConnectivityResult.wifi);
+    });
+
+    test('getWifiName', () async {
+      final String result = await Connectivity().getWifiName();
+      expect(result, '1337wifi');
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'wifiName',
+            arguments: null,
+          ),
+        ],
+      );
+    });
+
+    test('checkConnectivity', () async {
+      final ConnectivityResult result =
+          await Connectivity().checkConnectivity();
+      expect(result, ConnectivityResult.wifi);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'check',
+            arguments: null,
+          ),
+        ],
+      );
+    });
+  });
+}

From a822896c69cd0135aa7267aba6d825e9f4507fd3 Mon Sep 17 00:00:00 2001
From: Sarthak Verma <sarthak@artiosys.com>
Date: Mon, 11 Feb 2019 21:20:36 +0530
Subject: [PATCH 116/410] [connectivity] Added getWifiIP() (#895)

Adding getWifiIP() to obtain current wifi network's IP.
---
 AUTHORS                                       |  1 +
 packages/connectivity/CHANGELOG.md            |  4 ++
 .../connectivity/ConnectivityPlugin.java      | 23 ++++++++
 packages/connectivity/example/README.md       |  2 +-
 .../ios/Runner.xcodeproj/project.pbxproj      | 28 +++-------
 .../xcshareddata/WorkspaceSettings.xcsettings |  8 +++
 packages/connectivity/example/lib/main.dart   | 52 +++++++++++++++----
 .../ios/Classes/ConnectivityPlugin.m          | 37 +++++++++++++
 packages/connectivity/lib/connectivity.dart   |  5 ++
 packages/connectivity/pubspec.yaml            |  2 +-
 .../connectivity/test/connectivity_test.dart  | 16 ++++++
 11 files changed, 145 insertions(+), 33 deletions(-)
 create mode 100644 packages/connectivity/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

diff --git a/AUTHORS b/AUTHORS
index ba65f73098d9..adf87de0d69a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,3 +22,4 @@ Thomas Danner <thmsdnnr@gmail.com>
 Diego Velásquez <diego.velasquez.lopez@gmail.com>
 Hajime Nakamura <nkmrhj@gmail.com>
 Tuyển Vũ Xuân <netsoft1985@gmail.com>
+Sarthak Verma <sarthak@artiosys.com>
diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md
index 5f3a234b4f01..350889e2b9c4 100644
--- a/packages/connectivity/CHANGELOG.md
+++ b/packages/connectivity/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.2
+
+* Adding getWifiIP() to obtain current wifi network's IP.
+
 ## 0.4.1
 
 * Add unit tests.
diff --git a/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java b/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
index 45e0e2cef634..5694df6006ca 100644
--- a/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
+++ b/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
@@ -81,6 +81,9 @@ public void onMethodCall(MethodCall call, Result result) {
       case "wifiName":
         handleWifiName(call, result);
         break;
+      case "wifiIPAddress":
+        handleWifiIPAddress(call, result);
+        break;
       default:
         result.notImplemented();
         break;
@@ -111,6 +114,26 @@ private void handleWifiName(MethodCall call, final Result result) {
     result.success(ssid);
   }
 
+  private void handleWifiIPAddress(MethodCall call, final Result result) {
+    WifiManager wifiManager =
+        (WifiManager) registrar.context().getSystemService(Context.WIFI_SERVICE);
+
+    WifiInfo wifiInfo = null;
+    if (wifiManager != null) wifiInfo = wifiManager.getConnectionInfo();
+
+    String ip = null;
+    int i_ip = 0;
+    if (wifiInfo != null) i_ip = wifiInfo.getIpAddress();
+
+    if (i_ip != 0)
+      ip =
+          String.format(
+              "%d.%d.%d.%d",
+              (i_ip & 0xff), (i_ip >> 8 & 0xff), (i_ip >> 16 & 0xff), (i_ip >> 24 & 0xff));
+
+    result.success(ip);
+  }
+
   private BroadcastReceiver createReceiver(final EventSink events) {
     return new BroadcastReceiver() {
       @Override
diff --git a/packages/connectivity/example/README.md b/packages/connectivity/example/README.md
index 4283d65741c0..a7bac8c32e46 100644
--- a/packages/connectivity/example/README.md
+++ b/packages/connectivity/example/README.md
@@ -5,4 +5,4 @@ Demonstrates how to use the connectivity plugin.
 ## Getting Started
 
 For help getting started with Flutter, view our online
-[documentation](http://flutter.io/).
+[documentation](http://flutter.io/).
\ No newline at end of file
diff --git a/packages/connectivity/example/ios/Runner.xcodeproj/project.pbxproj b/packages/connectivity/example/ios/Runner.xcodeproj/project.pbxproj
index 71e16e6be0c3..78c4f7c8f116 100644
--- a/packages/connectivity/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/connectivity/example/ios/Runner.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
@@ -43,7 +42,6 @@
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -94,7 +92,6 @@
 			children = (
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -161,7 +158,6 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				6A2F146AD353BE7A0C3E797E /* [CP] Embed Pods Frameworks */,
-				3FF43AB810D11A6B26245FE5 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -213,7 +209,6 @@
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
@@ -243,28 +238,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		3FF43AB810D11A6B26245FE5 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		6A2F146AD353BE7A0C3E797E /* [CP] Embed Pods Frameworks */ = {
@@ -273,9 +256,12 @@
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
diff --git a/packages/connectivity/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/connectivity/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000000..949b67898200
--- /dev/null
+++ b/packages/connectivity/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+</dict>
+</plist>
diff --git a/packages/connectivity/example/lib/main.dart b/packages/connectivity/example/lib/main.dart
index ccb4ebe5001b..243412e1edd1 100644
--- a/packages/connectivity/example/lib/main.dart
+++ b/packages/connectivity/example/lib/main.dart
@@ -45,9 +45,7 @@ class _MyHomePageState extends State<MyHomePage> {
     super.initState();
     initConnectivity();
     _connectivitySubscription =
-        _connectivity.onConnectivityChanged.listen((ConnectivityResult result) {
-      setState(() => _connectionStatus = result.toString());
-    });
+        _connectivity.onConnectivityChanged.listen(_updateConnectionStatus);
   }
 
   @override
@@ -58,13 +56,12 @@ class _MyHomePageState extends State<MyHomePage> {
 
   // Platform messages are asynchronous, so we initialize in an async method.
   Future<void> initConnectivity() async {
-    String connectionStatus;
+    ConnectivityResult result;
     // Platform messages may fail, so we use a try/catch PlatformException.
     try {
-      connectionStatus = (await _connectivity.checkConnectivity()).toString();
+      result = await _connectivity.checkConnectivity();
     } on PlatformException catch (e) {
       print(e.toString());
-      connectionStatus = 'Failed to get connectivity.';
     }
 
     // If the widget was removed from the tree while the asynchronous platform
@@ -74,9 +71,7 @@ class _MyHomePageState extends State<MyHomePage> {
       return;
     }
 
-    setState(() {
-      _connectionStatus = connectionStatus;
-    });
+    _updateConnectionStatus(result);
   }
 
   @override
@@ -85,7 +80,44 @@ class _MyHomePageState extends State<MyHomePage> {
       appBar: AppBar(
         title: const Text('Plugin example app'),
       ),
-      body: Center(child: Text('Connection Status: $_connectionStatus\n')),
+      body: Center(child: Text('Connection Status: $_connectionStatus')),
     );
   }
+
+  Future<void> _updateConnectionStatus(ConnectivityResult result) async {
+    switch (result) {
+      case ConnectivityResult.wifi:
+        String wifiName, wifiIP;
+
+        try {
+          wifiName = (await _connectivity.getWifiName()).toString();
+        } on PlatformException catch (e) {
+          print(e.toString());
+
+          wifiName = "Failed to get Wifi Name";
+        }
+
+        try {
+          wifiIP = (await _connectivity.getWifiIP()).toString();
+        } on PlatformException catch (e) {
+          print(e.toString());
+
+          wifiName = "Failed to get Wifi IP";
+        }
+
+        setState(() {
+          _connectionStatus = '$result\n'
+              'Wifi Name: $wifiName\n'
+              'Wifi IP: $wifiIP\n';
+        });
+        break;
+      case ConnectivityResult.mobile:
+      case ConnectivityResult.none:
+        setState(() => _connectionStatus = result.toString());
+        break;
+      default:
+        setState(() => _connectionStatus = 'Failed to get connectivity.');
+        break;
+    }
+  }
 }
diff --git a/packages/connectivity/ios/Classes/ConnectivityPlugin.m b/packages/connectivity/ios/Classes/ConnectivityPlugin.m
index aa06353ec2da..722b797cff3a 100644
--- a/packages/connectivity/ios/Classes/ConnectivityPlugin.m
+++ b/packages/connectivity/ios/Classes/ConnectivityPlugin.m
@@ -8,6 +8,10 @@
 
 #import "SystemConfiguration/CaptiveNetwork.h"
 
+#include <ifaddrs.h>
+
+#include <arpa/inet.h>
+
 @interface FLTConnectivityPlugin () <FlutterStreamHandler>
 @end
 
@@ -43,6 +47,37 @@ - (NSString*)getWifiName {
   return wifiName;
 }
 
+- (NSString*)getWifiIP {
+  NSString* address = @"error";
+  struct ifaddrs* interfaces = NULL;
+  struct ifaddrs* temp_addr = NULL;
+  int success = 0;
+
+  // retrieve the current interfaces - returns 0 on success
+  success = getifaddrs(&interfaces);
+  if (success == 0) {
+    // Loop through linked list of interfaces
+    temp_addr = interfaces;
+    while (temp_addr != NULL) {
+      if (temp_addr->ifa_addr->sa_family == AF_INET) {
+        // Check if interface is en0 which is the wifi connection on the iPhone
+        if ([[NSString stringWithUTF8String:temp_addr->ifa_name] isEqualToString:@"en0"]) {
+          // Get NSString from C String
+          address = [NSString
+              stringWithUTF8String:inet_ntoa(((struct sockaddr_in*)temp_addr->ifa_addr)->sin_addr)];
+        }
+      }
+
+      temp_addr = temp_addr->ifa_next;
+    }
+  }
+
+  // Free memory
+  freeifaddrs(interfaces);
+
+  return address;
+}
+
 - (NSString*)statusFromReachability:(Reachability*)reachability {
   NetworkStatus status = [reachability currentReachabilityStatus];
   switch (status) {
@@ -65,6 +100,8 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     result([self statusFromReachability:[Reachability reachabilityForInternetConnection]]);
   } else if ([call.method isEqualToString:@"wifiName"]) {
     result([self getWifiName]);
+  } else if ([call.method isEqualToString:@"wifiIPAddress"]) {
+    result([self getWifiIP]);
   } else {
     result(FlutterMethodNotImplemented);
   }
diff --git a/packages/connectivity/lib/connectivity.dart b/packages/connectivity/lib/connectivity.dart
index 2d7c9c8fa975..fd444b008d97 100644
--- a/packages/connectivity/lib/connectivity.dart
+++ b/packages/connectivity/lib/connectivity.dart
@@ -84,6 +84,11 @@ class Connectivity {
     if (wifiName == '<unknown ssid>') wifiName = null;
     return wifiName;
   }
+
+  /// Obtains the IP address of the connected wifi network
+  Future<String> getWifiIP() async {
+    return await methodChannel.invokeMethod('wifiIPAddress');
+  }
 }
 
 ConnectivityResult _parseConnectivityResult(String state) {
diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml
index 28a8c089b813..4840b5d50ed3 100644
--- a/packages/connectivity/pubspec.yaml
+++ b/packages/connectivity/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi &
   mobile/cellular) connectivity on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
-version: 0.4.1
+version: 0.4.2
 
 flutter:
   plugin:
diff --git a/packages/connectivity/test/connectivity_test.dart b/packages/connectivity/test/connectivity_test.dart
index 134310af07b5..5dc2cbb0fa94 100644
--- a/packages/connectivity/test/connectivity_test.dart
+++ b/packages/connectivity/test/connectivity_test.dart
@@ -15,6 +15,8 @@ void main() {
             return 'wifi';
           case 'wifiName':
             return '1337wifi';
+          case 'wifiIPAddress':
+            return '127.0.0.1';
           default:
             return null;
         }
@@ -57,6 +59,20 @@ void main() {
       );
     });
 
+    test('getWifiIP', () async {
+      final String result = await Connectivity().getWifiIP();
+      expect(result, '127.0.0.1');
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'wifiIPAddress',
+            arguments: null,
+          ),
+        ],
+      );
+    });
+
     test('checkConnectivity', () async {
       final ConnectivityResult result =
           await Connectivity().checkConnectivity();

From 4a84bac13889b58865e500c7b13845e5fa03d9f1 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Mon, 11 Feb 2019 13:58:16 -0800
Subject: [PATCH 117/410] Mark some packages as unpublishable (#1193)

Skip publish checks on `publish_to: none` packages so that CI doesn't
fail with this change.

Related to flutter/flutter#27258
Works around dart-lang/pub#2004
---
 packages/in_app_purchase/pubspec.yaml     | 1 +
 packages/location_background/pubspec.yaml | 1 +
 script/check_publish.sh                   | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml
index 5cfdde171170..cffd35c77e7e 100644
--- a/packages/in_app_purchase/pubspec.yaml
+++ b/packages/in_app_purchase/pubspec.yaml
@@ -3,6 +3,7 @@ description: A Flutter plugin for in-app purchases.
 author:  Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase
 version: 0.0.2
+publish_to: none # Not ready to be uploaded
 
 dependencies:
   async: ^2.0.8
diff --git a/packages/location_background/pubspec.yaml b/packages/location_background/pubspec.yaml
index 5ecd21a51ef7..ed3b828a81c0 100644
--- a/packages/location_background/pubspec.yaml
+++ b/packages/location_background/pubspec.yaml
@@ -3,6 +3,7 @@ description: A new flutter plugin project.
 author:  Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/location_background
 version: 0.1.0+1
+publish_to: none
 
 dependencies:
   flutter:
diff --git a/script/check_publish.sh b/script/check_publish.sh
index c12b776301d5..39a6894cf5fa 100755
--- a/script/check_publish.sh
+++ b/script/check_publish.sh
@@ -15,7 +15,9 @@ function check_publish() {
   for package_name in "$@"; do
     local dir="$REPO_DIR/packages/$package_name"
     echo "Checking that $package_name can be published."
-    if (cd "$dir" && pub publish --dry-run > /dev/null); then
+    if [[ $(cd "$dir" && cat pubspec.yaml | grep -E "^publish_to: none") ]]; then
+      echo "Package $package_name is marked as unpublishable. Skipping."
+    elif (cd "$dir" && pub publish --dry-run > /dev/null); then
       echo "Package $package_name is able to be published."
     else
       error "Unable to publish $package_name"

From ec4bdd4166de427e10b0c98c84f7f01fd3fd8fa1 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Mon, 11 Feb 2019 15:07:49 -0800
Subject: [PATCH 118/410] Change from Rectangle<num>/Point<num> to Rect/Offset
 for ui convenience (#1163)

---
 packages/firebase_ml_vision/CHANGELOG.md      |   7 +
 .../firebasemlvision/BarcodeDetector.java     |  12 +-
 .../firebasemlvision/FaceDetector.java        |   8 +-
 .../firebasemlvision/TextRecognizer.java      |  12 +-
 .../ios/Classes/BarcodeDetector.m             |  12 +-
 .../ios/Classes/FaceDetector.m                |   8 +-
 .../ios/Classes/TextRecognizer.m              |  12 +-
 .../lib/firebase_ml_vision.dart               |   1 -
 .../lib/src/barcode_detector.dart             |  10 +-
 .../lib/src/face_detector.dart                |   8 +-
 .../lib/src/text_recognizer.dart              |  10 +-
 packages/firebase_ml_vision/pubspec.yaml      |   2 +-
 .../test/firebase_ml_vision_test.dart         | 183 +++++++++---------
 13 files changed, 145 insertions(+), 140 deletions(-)

diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index dafd2fdb0219..613a583a6eef 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.5.0
+
+* **Breaking Change** Change `Rectangle<int>` to `Rect` in Text/Face/Barcode results.
+* **Breaking Change** Change `Point<int>`/`Point<double>` to `Offset` in Text/Face/Barcode results.
+
+* Fixed bug where there were no corner points for `VisionText` or `Barcode` on iOS.
+
 ## 0.4.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/BarcodeDetector.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/BarcodeDetector.java
index 31d63b3c47a8..96c2f03762ec 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/BarcodeDetector.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/BarcodeDetector.java
@@ -60,16 +60,16 @@ public void onSuccess(List<FirebaseVisionBarcode> firebaseVisionBarcodes) {
 
                   Rect bounds = barcode.getBoundingBox();
                   if (bounds != null) {
-                    barcodeMap.put("left", bounds.left);
-                    barcodeMap.put("top", bounds.top);
-                    barcodeMap.put("width", bounds.width());
-                    barcodeMap.put("height", bounds.height());
+                    barcodeMap.put("left", (double) bounds.left);
+                    barcodeMap.put("top", (double) bounds.top);
+                    barcodeMap.put("width", (double) bounds.width());
+                    barcodeMap.put("height", (double) bounds.height());
                   }
 
-                  List<int[]> points = new ArrayList<>();
+                  List<double[]> points = new ArrayList<>();
                   if (barcode.getCornerPoints() != null) {
                     for (Point point : barcode.getCornerPoints()) {
-                      points.add(new int[] {point.x, point.y});
+                      points.add(new double[] {(double) point.x, (double) point.y});
                     }
                   }
                   barcodeMap.put("points", points);
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FaceDetector.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FaceDetector.java
index d857c0198b67..d81573f59d01 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FaceDetector.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FaceDetector.java
@@ -56,10 +56,10 @@ public void onSuccess(List<FirebaseVisionFace> firebaseVisionFaces) {
                 for (FirebaseVisionFace face : firebaseVisionFaces) {
                   Map<String, Object> faceData = new HashMap<>();
 
-                  faceData.put("left", face.getBoundingBox().left);
-                  faceData.put("top", face.getBoundingBox().top);
-                  faceData.put("width", face.getBoundingBox().width());
-                  faceData.put("height", face.getBoundingBox().height());
+                  faceData.put("left", (double) face.getBoundingBox().left);
+                  faceData.put("top", (double) face.getBoundingBox().top);
+                  faceData.put("width", (double) face.getBoundingBox().width());
+                  faceData.put("height", (double) face.getBoundingBox().height());
 
                   faceData.put("headEulerAngleY", face.getHeadEulerAngleY());
                   faceData.put("headEulerAngleZ", face.getHeadEulerAngleZ());
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/TextRecognizer.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/TextRecognizer.java
index ed967ca55f27..9f769c160df3 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/TextRecognizer.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/TextRecognizer.java
@@ -120,18 +120,18 @@ private void addData(
       String text) {
 
     if (boundingBox != null) {
-      addTo.put("left", boundingBox.left);
-      addTo.put("top", boundingBox.top);
-      addTo.put("width", boundingBox.width());
-      addTo.put("height", boundingBox.height());
+      addTo.put("left", (double) boundingBox.left);
+      addTo.put("top", (double) boundingBox.top);
+      addTo.put("width", (double) boundingBox.width());
+      addTo.put("height", (double) boundingBox.height());
     }
 
     addTo.put("confidence", confidence == null ? null : (double) confidence);
 
-    List<int[]> points = new ArrayList<>();
+    List<double[]> points = new ArrayList<>();
     if (cornerPoints != null) {
       for (Point point : cornerPoints) {
-        points.add(new int[] {point.x, point.y});
+        points.add(new double[] {(double) point.x, (double) point.y});
       }
     }
     addTo.put("points", points);
diff --git a/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m b/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m
index 6399ee8de9b3..fbe9713d56e6 100644
--- a/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m
+++ b/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m
@@ -32,16 +32,16 @@ + (void)handleDetection:(FIRVisionImage *)image
 NSDictionary *visionBarcodeToDictionary(FIRVisionBarcode *barcode) {
   __block NSMutableArray<NSArray *> *points = [NSMutableArray array];
 
-  for (NSValue *point in points) {
-    [points addObject:@[ @(((__bridge CGPoint *)point)->x), @(((__bridge CGPoint *)point)->y) ]];
+  for (NSValue *point in barcode.cornerPoints) {
+    [points addObject:@[ @(point.CGPointValue.x), @(point.CGPointValue.y) ]];
   }
   return @{
     @"rawValue" : barcode.rawValue,
     @"displayValue" : barcode.displayValue ? barcode.displayValue : [NSNull null],
-    @"left" : @((int)barcode.frame.origin.x),
-    @"top" : @((int)barcode.frame.origin.y),
-    @"width" : @((int)barcode.frame.size.width),
-    @"height" : @((int)barcode.frame.size.height),
+    @"left" : @(barcode.frame.origin.x),
+    @"top" : @(barcode.frame.origin.y),
+    @"width" : @(barcode.frame.size.width),
+    @"height" : @(barcode.frame.size.height),
     @"format" : @(barcode.format),
     @"valueType" : @(barcode.valueType),
     @"points" : points,
diff --git a/packages/firebase_ml_vision/ios/Classes/FaceDetector.m b/packages/firebase_ml_vision/ios/Classes/FaceDetector.m
index 602aaddf606e..790e12b37ac8 100644
--- a/packages/firebase_ml_vision/ios/Classes/FaceDetector.m
+++ b/packages/firebase_ml_vision/ios/Classes/FaceDetector.m
@@ -29,10 +29,10 @@ + (void)handleDetection:(FIRVisionImage *)image
                 face.hasRightEyeOpenProbability ? @(face.rightEyeOpenProbability) : [NSNull null];
 
             NSDictionary *data = @{
-              @"left" : @((int)face.frame.origin.x),
-              @"top" : @((int)face.frame.origin.y),
-              @"width" : @((int)face.frame.size.width),
-              @"height" : @((int)face.frame.size.height),
+              @"left" : @(face.frame.origin.x),
+              @"top" : @(face.frame.origin.y),
+              @"width" : @(face.frame.size.width),
+              @"height" : @(face.frame.size.height),
               @"headEulerAngleY" : face.hasHeadEulerAngleY ? @(face.headEulerAngleY)
                                                            : [NSNull null],
               @"headEulerAngleZ" : face.hasHeadEulerAngleZ ? @(face.headEulerAngleZ)
diff --git a/packages/firebase_ml_vision/ios/Classes/TextRecognizer.m b/packages/firebase_ml_vision/ios/Classes/TextRecognizer.m
index 9b0f5567db06..4732265966ce 100644
--- a/packages/firebase_ml_vision/ios/Classes/TextRecognizer.m
+++ b/packages/firebase_ml_vision/ios/Classes/TextRecognizer.m
@@ -79,8 +79,8 @@ + (void)addData:(NSMutableDictionary *)addTo
             text:(NSString *)text {
   __block NSMutableArray<NSArray *> *points = [NSMutableArray array];
 
-  for (NSValue *point in points) {
-    [points addObject:@[ @(((__bridge CGPoint *)point)->x), @(((__bridge CGPoint *)point)->y) ]];
+  for (NSValue *point in cornerPoints) {
+    [points addObject:@[ @(point.CGPointValue.x), @(point.CGPointValue.y) ]];
   }
 
   __block NSMutableArray<NSDictionary *> *allLanguageData = [NSMutableArray array];
@@ -93,10 +93,10 @@ + (void)addData:(NSMutableDictionary *)addTo
   [addTo addEntriesFromDictionary:@{
     @"confidence" : confidence ? confidence : [NSNull null],
     @"points" : points,
-    @"left" : @((int)frame.origin.x),
-    @"top" : @((int)frame.origin.y),
-    @"width" : @((int)frame.size.width),
-    @"height" : @((int)frame.size.height),
+    @"left" : @(frame.origin.x),
+    @"top" : @(frame.origin.y),
+    @"width" : @(frame.size.width),
+    @"height" : @(frame.size.height),
     @"recognizedLanguages" : allLanguageData,
     @"text" : text,
   }];
diff --git a/packages/firebase_ml_vision/lib/firebase_ml_vision.dart b/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
index 00f85da5bfe7..8dcbaa24a390 100644
--- a/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
+++ b/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
@@ -6,7 +6,6 @@ library firebase_ml_vision;
 
 import 'dart:async';
 import 'dart:io';
-import 'dart:math';
 import 'dart:typed_data';
 import 'dart:ui';
 
diff --git a/packages/firebase_ml_vision/lib/src/barcode_detector.dart b/packages/firebase_ml_vision/lib/src/barcode_detector.dart
index 7224e738b473..72ff8b165a9d 100644
--- a/packages/firebase_ml_vision/lib/src/barcode_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/barcode_detector.dart
@@ -231,7 +231,7 @@ class BarcodeDetectorOptions {
 class Barcode {
   Barcode._(Map<dynamic, dynamic> _data)
       : boundingBox = _data['left'] != null
-            ? Rectangle<int>(
+            ? Rect.fromLTWH(
                 _data['left'],
                 _data['top'],
                 _data['width'],
@@ -244,7 +244,7 @@ class Barcode {
         _cornerPoints = _data['points'] == null
             ? null
             : _data['points']
-                .map<Point<int>>((dynamic item) => Point<int>(
+                .map<Offset>((dynamic item) => Offset(
                       item[0],
                       item[1],
                     ))
@@ -268,12 +268,12 @@ class Barcode {
             ? null
             : BarcodeDriverLicense._(_data['driverLicense']);
 
-  final List<Point<int>> _cornerPoints;
+  final List<Offset> _cornerPoints;
 
   /// The bounding rectangle of the detected barcode.
   ///
   /// Could be null if the bounding rectangle can not be determined.
-  final Rectangle<int> boundingBox;
+  final Rect boundingBox;
 
   /// Barcode value as it was encoded in the barcode.
   ///
@@ -301,7 +301,7 @@ class Barcode {
   /// The four corner points in clockwise direction starting with top-left.
   ///
   /// Due to the possible perspective distortions, this is not necessarily a rectangle.
-  List<Point<int>> get cornerPoints => List<Point<int>>.from(_cornerPoints);
+  List<Offset> get cornerPoints => List<Offset>.from(_cornerPoints);
 
   /// The format type of the barcode value.
   ///
diff --git a/packages/firebase_ml_vision/lib/src/face_detector.dart b/packages/firebase_ml_vision/lib/src/face_detector.dart
index b08b1e4497e4..ad451ba0a104 100644
--- a/packages/firebase_ml_vision/lib/src/face_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/face_detector.dart
@@ -115,7 +115,7 @@ class FaceDetectorOptions {
 /// Represents a face detected by [FaceDetector].
 class Face {
   Face._(dynamic data)
-      : boundingBox = Rectangle<int>(
+      : boundingBox = Rect.fromLTWH(
           data['left'],
           data['top'],
           data['width'],
@@ -135,7 +135,7 @@ class Face {
               ? null
               : FaceLandmark._(
                   type,
-                  Point<double>(pos[0], pos[1]),
+                  Offset(pos[0], pos[1]),
                 );
         }));
 
@@ -144,7 +144,7 @@ class Face {
   /// The axis-aligned bounding rectangle of the detected face.
   ///
   /// The point (0, 0) is defined as the upper-left corner of the image.
-  final Rectangle<int> boundingBox;
+  final Rect boundingBox;
 
   /// The rotation of the face about the vertical axis of the image.
   ///
@@ -209,5 +209,5 @@ class FaceLandmark {
   /// Gets a 2D point for landmark position.
   ///
   /// The point (0, 0) is defined as the upper-left corner of the image.
-  final Point<double> position;
+  final Offset position;
 }
diff --git a/packages/firebase_ml_vision/lib/src/text_recognizer.dart b/packages/firebase_ml_vision/lib/src/text_recognizer.dart
index 1cfa9a6ced0c..8f6e1d8c2e1d 100644
--- a/packages/firebase_ml_vision/lib/src/text_recognizer.dart
+++ b/packages/firebase_ml_vision/lib/src/text_recognizer.dart
@@ -65,7 +65,7 @@ class RecognizedLanguage {
 abstract class TextContainer {
   TextContainer._(Map<dynamic, dynamic> data)
       : boundingBox = data['left'] != null
-            ? Rectangle<int>(
+            ? Rect.fromLTWH(
                 data['left'],
                 data['top'],
                 data['width'],
@@ -73,8 +73,8 @@ abstract class TextContainer {
               )
             : null,
         confidence = data['confidence'],
-        cornerPoints = List<Point<int>>.unmodifiable(
-            data['points'].map<Point<int>>((dynamic point) => Point<int>(
+        cornerPoints = List<Offset>.unmodifiable(
+            data['points'].map<Offset>((dynamic point) => Offset(
                   point[0],
                   point[1],
                 ))),
@@ -88,7 +88,7 @@ abstract class TextContainer {
   /// The point (0, 0) is defined as the upper-left corner of the image.
   ///
   /// Could be null even if text is found.
-  final Rectangle<int> boundingBox;
+  final Rect boundingBox;
 
   /// The confidence of the recognized text block.
   ///
@@ -102,7 +102,7 @@ abstract class TextContainer {
   /// rectangle. Parts of the region could be outside of the image.
   ///
   /// Could be empty even if text is found.
-  final List<Point<int>> cornerPoints;
+  final List<Offset> cornerPoints;
 
   /// All detected languages from recognized text.
   ///
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index a41791ccc1b6..463b759793c4 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_ml_vision
 description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.4.0+1
+version: 0.5.0
 
 dependencies:
   flutter:
diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index 8a9411cde6ee..e7f60cfa2466 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:math';
 import 'dart:typed_data';
 import 'dart:ui';
 
@@ -106,13 +105,13 @@ void main() {
             'rawValue': 'hello:raw',
             'displayValue': 'hello:display',
             'format': 0,
-            'left': 1,
-            'top': 2,
-            'width': 3,
-            'height': 4,
+            'left': 1.0,
+            'top': 2.0,
+            'width': 3.0,
+            'height': 4.0,
             'points': <dynamic>[
-              <dynamic>[5, 6],
-              <dynamic>[7, 8],
+              <dynamic>[5.0, 6.0],
+              <dynamic>[7.0, 8.0],
             ],
           },
         ];
@@ -141,12 +140,12 @@ void main() {
 
         final Barcode barcode = barcodes[0];
         expect(barcode.valueType, BarcodeValueType.unknown);
-        expect(barcode.boundingBox, const Rectangle<int>(1, 2, 3, 4));
+        expect(barcode.boundingBox, Rect.fromLTWH(1.0, 2.0, 3.0, 4.0));
         expect(barcode.rawValue, 'hello:raw');
         expect(barcode.displayValue, 'hello:display');
-        expect(barcode.cornerPoints, const <Point<int>>[
-          Point<int>(5, 6),
-          Point<int>(7, 8),
+        expect(barcode.cornerPoints, const <Offset>[
+          Offset(5.0, 6.0),
+          Offset(7.0, 8.0),
         ]);
       });
 
@@ -415,8 +414,8 @@ void main() {
             'valueType': 0,
             'format': 0,
             'points': <dynamic>[
-              <dynamic>[17, 18],
-              <dynamic>[19, 20],
+              <dynamic>[17.0, 18.0],
+              <dynamic>[19.0, 20.0],
             ],
           },
         ];
@@ -427,9 +426,9 @@ void main() {
         expect(barcode.boundingBox, null);
         expect(barcode.rawValue, 'potato:raw');
         expect(barcode.displayValue, 'potato:display');
-        expect(barcode.cornerPoints, const <Point<int>>[
-          Point<int>(17, 18),
-          Point<int>(19, 20),
+        expect(barcode.cornerPoints, const <Offset>[
+          Offset(17.0, 18.0),
+          Offset(19.0, 20.0),
         ]);
       });
 
@@ -502,10 +501,10 @@ void main() {
       setUp(() {
         testFaces = <dynamic>[
           <dynamic, dynamic>{
-            'left': 0,
-            'top': 1,
-            'width': 2,
-            'height': 3,
+            'left': 0.0,
+            'top': 1.0,
+            'width': 2.0,
+            'height': 3.0,
             'headEulerAngleY': 4.0,
             'headEulerAngleZ': 5.0,
             'leftEyeOpenProbability': 0.4,
@@ -567,7 +566,7 @@ void main() {
         ]);
 
         final Face face = faces[0];
-        expect(face.boundingBox, const Rectangle<int>(0, 1, 2, 3));
+        expect(face.boundingBox, Rect.fromLTWH(0.0, 1.0, 2.0, 3.0));
         expect(face.headEulerAngleY, 4.0);
         expect(face.headEulerAngleZ, 5.0);
         expect(face.leftEyeOpenProbability, 0.4);
@@ -579,20 +578,20 @@ void main() {
           expect(face.getLandmark(type).type, type);
         }
 
-        Point<double> p(FaceLandmarkType type) {
+        Offset p(FaceLandmarkType type) {
           return face.getLandmark(type).position;
         }
 
-        expect(p(FaceLandmarkType.bottomMouth), const Point<double>(0.1, 1.1));
-        expect(p(FaceLandmarkType.leftCheek), const Point<double>(2.1, 3.1));
-        expect(p(FaceLandmarkType.leftEar), const Point<double>(4.1, 5.1));
-        expect(p(FaceLandmarkType.leftEye), const Point<double>(6.1, 7.1));
-        expect(p(FaceLandmarkType.leftMouth), const Point<double>(8.1, 9.1));
-        expect(p(FaceLandmarkType.noseBase), const Point<double>(10.1, 11.1));
-        expect(p(FaceLandmarkType.rightCheek), const Point<double>(12.1, 13.1));
-        expect(p(FaceLandmarkType.rightEar), const Point<double>(14.1, 15.1));
-        expect(p(FaceLandmarkType.rightEye), const Point<double>(16.1, 17.1));
-        expect(p(FaceLandmarkType.rightMouth), const Point<double>(18.1, 19.1));
+        expect(p(FaceLandmarkType.bottomMouth), const Offset(0.1, 1.1));
+        expect(p(FaceLandmarkType.leftCheek), const Offset(2.1, 3.1));
+        expect(p(FaceLandmarkType.leftEar), const Offset(4.1, 5.1));
+        expect(p(FaceLandmarkType.leftEye), const Offset(6.1, 7.1));
+        expect(p(FaceLandmarkType.leftMouth), const Offset(8.1, 9.1));
+        expect(p(FaceLandmarkType.noseBase), const Offset(10.1, 11.1));
+        expect(p(FaceLandmarkType.rightCheek), const Offset(12.1, 13.1));
+        expect(p(FaceLandmarkType.rightEar), const Offset(14.1, 15.1));
+        expect(p(FaceLandmarkType.rightEye), const Offset(16.1, 17.1));
+        expect(p(FaceLandmarkType.rightMouth), const Offset(18.1, 19.1));
       });
 
       test('processImage with null landmark', () async {
@@ -806,13 +805,13 @@ void main() {
         final List<dynamic> elements = <dynamic>[
           <dynamic, dynamic>{
             'text': 'hello',
-            'left': 1,
-            'top': 2,
-            'width': 3,
-            'height': 4,
+            'left': 1.0,
+            'top': 2.0,
+            'width': 3.0,
+            'height': 4.0,
             'points': <dynamic>[
-              <dynamic>[5, 6],
-              <dynamic>[7, 8],
+              <dynamic>[5.0, 6.0],
+              <dynamic>[7.0, 8.0],
             ],
             'recognizedLanguages': <dynamic>[
               <dynamic, dynamic>{
@@ -826,13 +825,13 @@ void main() {
           },
           <dynamic, dynamic>{
             'text': 'my',
-            'left': 4,
-            'top': 3,
-            'width': 2,
-            'height': 1,
+            'left': 4.0,
+            'top': 3.0,
+            'width': 2.0,
+            'height': 1.0,
             'points': <dynamic>[
-              <dynamic>[6, 5],
-              <dynamic>[8, 7],
+              <dynamic>[6.0, 5.0],
+              <dynamic>[8.0, 7.0],
             ],
             'recognizedLanguages': <dynamic>[],
             'confidence': 0.2,
@@ -842,13 +841,13 @@ void main() {
         final List<dynamic> lines = <dynamic>[
           <dynamic, dynamic>{
             'text': 'friend',
-            'left': 5,
-            'top': 6,
-            'width': 7,
-            'height': 8,
+            'left': 5.0,
+            'top': 6.0,
+            'width': 7.0,
+            'height': 8.0,
             'points': <dynamic>[
-              <dynamic>[9, 10],
-              <dynamic>[11, 12],
+              <dynamic>[9.0, 10.0],
+              <dynamic>[11.0, 12.0],
             ],
             'recognizedLanguages': <dynamic>[
               <dynamic, dynamic>{
@@ -863,13 +862,13 @@ void main() {
           },
           <dynamic, dynamic>{
             'text': 'how',
-            'left': 8,
-            'top': 7,
-            'width': 4,
-            'height': 5,
+            'left': 8.0,
+            'top': 7.0,
+            'width': 4.0,
+            'height': 5.0,
             'points': <dynamic>[
-              <dynamic>[10, 9],
-              <dynamic>[12, 11],
+              <dynamic>[10.0, 9.0],
+              <dynamic>[12.0, 11.0],
             ],
             'recognizedLanguages': <dynamic>[],
             'elements': <dynamic>[],
@@ -880,13 +879,13 @@ void main() {
         final List<dynamic> blocks = <dynamic>[
           <dynamic, dynamic>{
             'text': 'friend',
-            'left': 13,
-            'top': 14,
-            'width': 15,
-            'height': 16,
+            'left': 13.0,
+            'top': 14.0,
+            'width': 15.0,
+            'height': 16.0,
             'points': <dynamic>[
-              <dynamic>[17, 18],
-              <dynamic>[19, 20],
+              <dynamic>[17.0, 18.0],
+              <dynamic>[19.0, 20.0],
             ],
             'recognizedLanguages': <dynamic>[
               <dynamic, dynamic>{
@@ -901,13 +900,13 @@ void main() {
           },
           <dynamic, dynamic>{
             'text': 'hello',
-            'left': 14,
-            'top': 13,
-            'width': 16,
-            'height': 15,
+            'left': 14.0,
+            'top': 13.0,
+            'width': 16.0,
+            'height': 15.0,
             'points': <dynamic>[
-              <dynamic>[18, 17],
-              <dynamic>[20, 19],
+              <dynamic>[18.0, 17.0],
+              <dynamic>[20.0, 19.0],
             ],
             'recognizedLanguages': <dynamic>[],
             'lines': <dynamic>[],
@@ -930,11 +929,11 @@ void main() {
           expect(text.blocks, hasLength(2));
 
           TextBlock block = text.blocks[0];
-          expect(block.boundingBox, const Rectangle<int>(13, 14, 15, 16));
+          expect(block.boundingBox, Rect.fromLTWH(13.0, 14.0, 15.0, 16.0));
           expect(block.text, 'friend');
-          expect(block.cornerPoints, const <Point<int>>[
-            Point<int>(17, 18),
-            Point<int>(19, 20),
+          expect(block.cornerPoints, const <Offset>[
+            Offset(17.0, 18.0),
+            Offset(19.0, 20.0),
           ]);
           expect(block.recognizedLanguages, hasLength(2));
           expect(block.recognizedLanguages[0].languageCode, 'ij');
@@ -942,11 +941,11 @@ void main() {
           expect(block.confidence, 0.5);
 
           block = text.blocks[1];
-          expect(block.boundingBox, const Rectangle<int>(14, 13, 16, 15));
+          expect(block.boundingBox, Rect.fromLTWH(14.0, 13.0, 16.0, 15.0));
           expect(block.text, 'hello');
-          expect(block.cornerPoints, const <Point<int>>[
-            Point<int>(18, 17),
-            Point<int>(20, 19),
+          expect(block.cornerPoints, const <Offset>[
+            Offset(18.0, 17.0),
+            Offset(20.0, 19.0),
           ]);
           expect(block.confidence, 0.6);
         });
@@ -957,11 +956,11 @@ void main() {
           final VisionText text = await recognizer.processImage(image);
 
           TextLine line = text.blocks[0].lines[0];
-          expect(line.boundingBox, const Rectangle<int>(5, 6, 7, 8));
+          expect(line.boundingBox, Rect.fromLTWH(5, 6, 7, 8));
           expect(line.text, 'friend');
-          expect(line.cornerPoints, const <Point<int>>[
-            Point<int>(9, 10),
-            Point<int>(11, 12),
+          expect(line.cornerPoints, const <Offset>[
+            Offset(9.0, 10.0),
+            Offset(11.0, 12.0),
           ]);
           expect(line.recognizedLanguages, hasLength(2));
           expect(line.recognizedLanguages[0].languageCode, 'ef');
@@ -969,11 +968,11 @@ void main() {
           expect(line.confidence, 0.3);
 
           line = text.blocks[0].lines[1];
-          expect(line.boundingBox, const Rectangle<int>(8, 7, 4, 5));
+          expect(line.boundingBox, Rect.fromLTWH(8.0, 7.0, 4.0, 5.0));
           expect(line.text, 'how');
-          expect(line.cornerPoints, const <Point<int>>[
-            Point<int>(10, 9),
-            Point<int>(12, 11),
+          expect(line.cornerPoints, const <Offset>[
+            Offset(10.0, 9.0),
+            Offset(12.0, 11.0),
           ]);
           expect(line.confidence, 0.4);
         });
@@ -984,11 +983,11 @@ void main() {
           final VisionText text = await recognizer.processImage(image);
 
           TextElement element = text.blocks[0].lines[0].elements[0];
-          expect(element.boundingBox, const Rectangle<int>(1, 2, 3, 4));
+          expect(element.boundingBox, Rect.fromLTWH(1.0, 2.0, 3.0, 4.0));
           expect(element.text, 'hello');
-          expect(element.cornerPoints, const <Point<int>>[
-            Point<int>(5, 6),
-            Point<int>(7, 8),
+          expect(element.cornerPoints, const <Offset>[
+            Offset(5.0, 6.0),
+            Offset(7.0, 8.0),
           ]);
           expect(element.recognizedLanguages, hasLength(2));
           expect(element.recognizedLanguages[0].languageCode, 'ab');
@@ -996,11 +995,11 @@ void main() {
           expect(element.confidence, 0.1);
 
           element = text.blocks[0].lines[0].elements[1];
-          expect(element.boundingBox, const Rectangle<int>(4, 3, 2, 1));
+          expect(element.boundingBox, Rect.fromLTWH(4.0, 3.0, 2.0, 1.0));
           expect(element.text, 'my');
-          expect(element.cornerPoints, const <Point<int>>[
-            Point<int>(6, 5),
-            Point<int>(8, 7),
+          expect(element.cornerPoints, const <Offset>[
+            Offset(6.0, 5.0),
+            Offset(8.0, 7.0),
           ]);
           expect(element.confidence, 0.2);
         });

From 2e5fbb9bd25da90fad337b98d131c305ae34e70a Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Mon, 11 Feb 2019 15:29:07 -0800
Subject: [PATCH 119/410] Fix the param map passed down to the platform channel
 when calling querySkuDetails (#1194)

---
 .../lib/src/billing_client_wrappers/billing_client_wrapper.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
index 9d1999961c2c..d0e5947ee4aa 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
@@ -88,7 +88,7 @@ class BillingClient {
   Future<SkuDetailsResponseWrapper> querySkuDetails(
       {@required SkuType skuType, @required List<String> skusList}) async {
     final Map<String, dynamic> arguments = <String, dynamic>{
-      'skuType': skuType.toString(),
+      'skuType': SkuTypeConverter().toJson(skuType),
       'skusList': skusList
     };
     return SkuDetailsResponseWrapper.fromJson(await channel.invokeMapMethod<

From 5a5fe6cef1c07004202fe99b9e9d537b94c4f430 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Mon, 11 Feb 2019 16:37:30 -0800
Subject: [PATCH 120/410] Fix bug where HttpMetric/Trace dictionaries weren't
 being initialized on iOS (#1195)

---
 packages/firebase_performance/CHANGELOG.md                    | 4 ++++
 .../ios/Classes/FirebasePerformancePlugin.m                   | 4 +++-
 packages/firebase_performance/pubspec.yaml                    | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_performance/CHANGELOG.md b/packages/firebase_performance/CHANGELOG.md
index f689650e5bb5..f80203aa84c1 100644
--- a/packages/firebase_performance/CHANGELOG.md
+++ b/packages/firebase_performance/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0+2
+
+* Fixed bug where `Traces` and `HttpMetrics` weren't being passed to Firebase on iOS.
+
 ## 0.1.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m b/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
index a15e5b46bfba..0fb7897797ad 100644
--- a/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
+++ b/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
@@ -25,8 +25,10 @@ - (instancetype)init {
   if (self) {
     if (![FIRApp defaultApp]) {
       [FIRApp configure];
-      _traces = [[NSMutableDictionary alloc] init];
     }
+
+    _traces = [[NSMutableDictionary alloc] init];
+    _httpMetrics = [[NSMutableDictionary alloc] init];
   }
 
   return self;
diff --git a/packages/firebase_performance/pubspec.yaml b/packages/firebase_performance/pubspec.yaml
index c429248a1ca4..1d8dc7a676ac 100644
--- a/packages/firebase_performance/pubspec.yaml
+++ b/packages/firebase_performance/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Google Performance Monitoring for Firebase, an a
   iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_performance
-version: 0.1.0+1
+version: 0.1.0+2
 
 dependencies:
   flutter:

From 9ab17cf75cb63b55201e1cb4b8ac82280c94aed4 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Mon, 11 Feb 2019 16:45:38 -0800
Subject: [PATCH 121/410] Fix bug causing black screen on some Android devices
 (#1177)

---
 packages/camera/CHANGELOG.md                      |  4 ++++
 .../io/flutter/plugins/camera/CameraPlugin.java   | 15 +++++++--------
 packages/camera/pubspec.yaml                      |  5 +++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index aee29c63dca6..709dfd605264 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.0+4
+
+* Fixed bug causing black screen on some Android devices.
+
 ## 0.3.0+3
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index 00c1862ca1fd..32597d09f536 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -292,16 +292,16 @@ private class Camera {
       registerEventChannel();
 
       try {
-        Size minPreviewSize;
+        int minHeight;
         switch (resolutionPreset) {
           case "high":
-            minPreviewSize = new Size(1024, 768);
+            minHeight = 720;
             break;
           case "medium":
-            minPreviewSize = new Size(640, 480);
+            minHeight = 480;
             break;
           case "low":
-            minPreviewSize = new Size(320, 240);
+            minHeight = 240;
             break;
           default:
             throw new IllegalArgumentException("Unknown preset: " + resolutionPreset);
@@ -317,7 +317,7 @@ private class Camera {
             characteristics.get(CameraCharacteristics.LENS_FACING)
                 == CameraMetadata.LENS_FACING_FRONT;
         computeBestCaptureSize(streamConfigurationMap);
-        computeBestPreviewAndRecordingSize(streamConfigurationMap, minPreviewSize, captureSize);
+        computeBestPreviewAndRecordingSize(streamConfigurationMap, minHeight, captureSize);
 
         if (cameraPermissionContinuation != null) {
           result.error("cameraPermission", "Camera permission request ongoing", null);
@@ -390,7 +390,7 @@ private boolean hasAudioPermission() {
     }
 
     private void computeBestPreviewAndRecordingSize(
-        StreamConfigurationMap streamConfigurationMap, Size minPreviewSize, Size captureSize) {
+        StreamConfigurationMap streamConfigurationMap, int minHeight, Size captureSize) {
       Size[] sizes = streamConfigurationMap.getOutputSizes(SurfaceTexture.class);
 
       // Preview size and video size should not be greater than screen resolution or 1080.
@@ -404,8 +404,7 @@ private void computeBestPreviewAndRecordingSize(
 
       List<Size> goodEnough = new ArrayList<>();
       for (Size s : sizes) {
-        if (minPreviewSize.getWidth() < s.getWidth()
-            && minPreviewSize.getHeight() < s.getHeight()
+        if (minHeight <= s.getHeight()
             && s.getWidth() <= screenWidth
             && s.getHeight() <= screenHeight
             && s.getHeight() <= 1080) {
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 5197d67f64a1..acdaa2ff90fb 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -1,7 +1,8 @@
 name: camera
 description: A Flutter plugin for getting information about and controlling the
-  camera on Android and iOS. Supports previewing the camera feed and capturing images.
-version: 0.3.0+3
+  camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
+  and streaming image buffers to dart.
+version: 0.3.0+4
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From db139b28895e52e69c1d1af10504937ecc054139 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Tue, 12 Feb 2019 10:51:29 -0800
Subject: [PATCH 122/410] Iap iOS add payment dart wrappers (#1178)

[iOS]
Dart wrappers for the required objects that are used when adding a payment.
The code for adding a payment will be in a following PR after this one if approved and merged.
[flutter/flutter#26328](https://github.com/flutter/flutter/issues/26328)
---
 .../sk_payment_queue_wrapper.dart             | 280 +++++++++++++++++-
 .../sk_payment_queue_wrapper.g.dart           |  83 ++++++
 .../sk_payment_queue_wrapper_test.dart        | 176 +++++++++++
 3 files changed, 538 insertions(+), 1 deletion(-)
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart

diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
index a006f802342b..2712998667bb 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
@@ -3,12 +3,290 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'package:flutter/foundation.dart';
+import 'package:in_app_purchase/src/channel.dart';
+import 'package:json_annotation/json_annotation.dart';
 
-import '../channel.dart';
+part 'sk_payment_queue_wrapper.g.dart';
 
 /// A wrapper around [`SKPaymentQueue`](https://developer.apple.com/documentation/storekit/skpaymentqueue?language=objc).
+///
+/// The payment queue contains payment related operations. It communicates with App Store and presents
+/// a user interface for the user to process and authorize the payment.
 class SKPaymentQueueWrapper {
   /// Calls [`-[SKPaymentQueue canMakePayments:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506139-canmakepayments?language=objc).
   static Future<bool> canMakePayments() async =>
       await channel.invokeMethod('-[SKPaymentQueue canMakePayments:]');
 }
+
+/// Dart wrapper around StoreKit's
+/// [SKPaymentTransactionState](https://developer.apple.com/documentation/storekit/skpaymenttransactionstate?language=objc).
+///
+/// Presents the state of a transaction. Used for handling a transaction based on different state.
+enum SKPaymentTransactionStateWrapper {
+  /// Indicates the transaction is being processed in App Store.
+  @JsonValue(0)
+  purchasing,
+
+  /// The payment is processed. You should provide the user the content they purchased.
+  @JsonValue(1)
+  purchased,
+
+  /// The transaction failed. Check the [SKPaymentTransactionWrapper.error] property from [SKPaymentTransactionWrapper] for details.
+  @JsonValue(2)
+  failed,
+
+  /// This transaction restores the content previously purchased by the user. The previous transaction information can be
+  /// obtained in [SKPaymentTransactionWrapper.originalTransaction] from [SKPaymentTransactionWrapper].
+  @JsonValue(3)
+  restored,
+
+  /// The transaction is in the queue but pending external action. Wait for another callback to get the final state.
+  @JsonValue(4)
+  deferred,
+}
+
+/// Dart wrapper around StoreKit's [SKPaymentTransaction](https://developer.apple.com/documentation/storekit/skpaymenttransaction?language=objc).
+///
+/// Created when a payment is added to the [SKPaymentQueueWrapper]. Transactions are delivered to your app when a payment is finished processing.
+/// Completed transactions provide a receipt and a transaction identifier that the app can use to save a permanent record of the processed payment.
+@JsonSerializable()
+class SKPaymentTransactionWrapper {
+  SKPaymentTransactionWrapper({
+    @required this.payment,
+    @required this.transactionState,
+    @required this.originalTransaction,
+    @required this.transactionTimeStamp,
+    @required this.transactionIdentifier,
+    @required this.downloads,
+    @required this.error,
+  });
+
+  /// Constructs an instance of this from a key value map of data.
+  ///
+  /// The map needs to have named string keys with values matching the names and
+  /// types of all of the members on this class.
+  /// The `map` parameter must not be null.
+  @visibleForTesting
+  factory SKPaymentTransactionWrapper.fromJson(Map map) {
+    if (map == null) {
+      return null;
+    }
+    return _$SKPaymentTransactionWrapperFromJson(map);
+  }
+
+  /// Current transaction state.
+  final SKPaymentTransactionStateWrapper transactionState;
+
+  /// The payment that is created and added to the payment queue which generated this transaction.
+  final SKPaymentWrapper payment;
+
+  /// The original Transaction, only available if the [transactionState] is [SKPaymentTransactionStateWrapper.restored].
+  ///
+  /// When the [transactionState] is [SKPaymentTransactionStateWrapper.restored], the current transaction object holds a new
+  /// [transactionIdentifier].
+  final SKPaymentTransactionWrapper originalTransaction;
+
+  /// The timestamp of the transaction.
+  ///
+  /// Milliseconds since epoch.
+  /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased] or [SKPaymentTransactionStateWrapper.restored].
+  final double transactionTimeStamp;
+
+  /// The unique string identifer of the transaction.
+  ///
+  /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased] or [SKPaymentTransactionStateWrapper.restored].
+  /// You may wish to record this string as part of an audit trail for App Store purchases.
+  /// The value of this string corresponds to the same property in the receipt.
+  final String transactionIdentifier;
+
+  /// An array of the [SKDownloadWrapper] object of this transaction.
+  ///
+  /// Only available if the transaction contains downloadable contents.
+  ///
+  /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased].
+  /// Must be used to download the transaction's content before the transaction is finished.
+  final List<SKDownloadWrapper> downloads;
+
+  /// The error object, only available if the [transactionState] is [SKPaymentTransactionStateWrapper.failed].
+  final SKError error;
+}
+
+/// Dart wrapper around StoreKit's [SKDownloadState](https://developer.apple.com/documentation/storekit/skdownloadstate?language=objc).
+///
+/// The state a download operation that can be in.
+enum SKDownloadState {
+  /// Indicates that downloadable content is waiting to start.
+  @JsonValue(0)
+  waiting,
+
+  /// The downloadable content is currently being downloaded
+  @JsonValue(1)
+  active,
+
+  /// The app paused the download.
+  @JsonValue(2)
+  pause,
+
+  /// The content is successfully downloaded.
+  @JsonValue(3)
+  finished,
+
+  /// Indicates that some error occurred while the content was being downloaded.
+  @JsonValue(4)
+  failed,
+
+  /// The app canceled the download.
+  @JsonValue(5)
+  cancelled,
+}
+
+/// Dart wrapper around StoreKit's [SKDownload](https://developer.apple.com/documentation/storekit/skdownload?language=objc).
+///
+/// When a product is created in the App Store Connect, one or more download contents can be associated with it.
+/// When the product is purchased, a List of [SKDownloadWrapper] object will be present in an [SKPaymentTransactionWrapper] object.
+/// To download the content, add the [SKDownloadWrapper] objects to the payment queue and wait for the content to be downloaded.
+/// You can also read the [contentURL] to get the URL of the downloaded content after the download completes.
+/// Note that all downloaded files must be processed before the completion of the [SKPaymentTransactionWrapper].
+/// After the transaction is complete, any [SKDownloadWrapper] object in the transaction will not be able to be added to the payment queue
+/// and the [contentURL ]of the [SKDownloadWrapper] object will be invalid.
+@JsonSerializable()
+class SKDownloadWrapper {
+  SKDownloadWrapper({
+    @required this.contentIdentifier,
+    @required this.state,
+    @required this.contentLength,
+    @required this.contentURL,
+    @required this.contentVersion,
+    @required this.transactionID,
+    @required this.progress,
+    @required this.timeRemaining,
+    @required this.downloadTimeUnknown,
+    @required this.error,
+  });
+
+  /// Constructs an instance of this from a key value map of data.
+  ///
+  /// The map needs to have named string keys with values matching the names and
+  /// types of all of the members on this class.
+  /// The `map` parameter must not be null.
+  @visibleForTesting
+  factory SKDownloadWrapper.fromJson(Map map) {
+    assert(map != null);
+    return _$SKDownloadWrapperFromJson(map);
+  }
+
+  /// Identifies the downloadable content.
+  ///
+  /// It is specified in the App Store Connect when the downloadable content is created.
+  final String contentIdentifier;
+
+  /// The current download state.
+  ///
+  /// When the state changes, one of the [SKTransactionObserverWrapper] subclasses' observing methods should be triggered.
+  /// The developer should properly handle the downloadable content based on the state.
+  final SKDownloadState state;
+
+  /// Length of the content in bytes.
+  final int contentLength;
+
+  /// The URL string of the content.
+  final String contentURL;
+
+  /// Version of the content formatted as a series of dot-separated integers.
+  final String contentVersion;
+
+  /// The transaction ID of the transaction that is associated with the downloadable content.
+  final String transactionID;
+
+  /// The download progress, between 0.0 to 1.0.
+  final double progress;
+
+  /// The estimated time remaining for the download; if no good estimate is able to be made,
+  /// [downloadTimeUnknown] will be set to true.
+  final double timeRemaining;
+
+  /// true if [timeRemaining] cannot be estimated.
+  final bool downloadTimeUnknown;
+
+  /// The error that prevented the downloading; only available if the [transactionState] is [SKPaymentTransactionStateWrapper.failed].
+  final SKError error;
+}
+
+/// Dart wrapper around StoreKit's [NSError](https://developer.apple.com/documentation/foundation/nserror?language=objc).
+@JsonSerializable()
+class SKError {
+  SKError(
+      {@required this.code, @required this.domain, @required this.userInfo});
+
+  /// Constructs an instance of this from a key-value map of data.
+  ///
+  /// The map needs to have named string keys with values matching the names and
+  /// types of all of the members on this class.
+  /// The `map` parameter must not be null.
+  @visibleForTesting
+  factory SKError.fromJson(Map map) {
+    assert(map != null);
+    return _$SKErrorFromJson(map);
+  }
+
+  /// Error [code](https://developer.apple.com/documentation/foundation/1448136-nserror_codes) defined in the Cocoa Framework.
+  final int code;
+
+  /// Error [domain](https://developer.apple.com/documentation/foundation/nscocoaerrordomain?language=objc) defined in the Cocoa Framework.
+  final String domain;
+
+  /// A map that contains more detailed information about the error. Any key of the map must be one of the [NSErrorUserInfoKey](https://developer.apple.com/documentation/foundation/nserroruserinfokey?language=objc).
+  final Map<String, dynamic> userInfo;
+}
+
+/// Dart wrapper around StoreKit's [SKPayment](https://developer.apple.com/documentation/storekit/skpayment?language=objc).
+///
+/// Used as the parameter to initiate a payment.
+/// In general, a developer should not need to create the payment object explicitly; instead, use
+/// [SKPaymentQueueWrapper.addPayment] directly with a product identifier to initiate a payment.
+@JsonSerializable()
+class SKPaymentWrapper {
+  SKPaymentWrapper(
+      {@required this.productIdentifier,
+      @required this.applicationUsername,
+      this.requestData,
+      this.quantity = 1,
+      this.simulatesAskToBuyInSandbox = false});
+
+  /// Constructs an instance of this from a key value map of data.
+  ///
+  /// The map needs to have named string keys with values matching the names and
+  /// types of all of the members on this class.
+  /// The `map` parameter must not be null.
+  @visibleForTesting
+  factory SKPaymentWrapper.fromJson(Map map) {
+    assert(map != null);
+    return _$SKPaymentWrapperFromJson(map);
+  }
+
+  /// The id for the product that the payment is for.
+  final String productIdentifier;
+
+  /// An opaque id for the user's account.
+  ///
+  /// Used to help the store detect irregular activity. See https://developer.apple.com/documentation/storekit/skpayment/1506116-applicationusername?language=objc for more details.
+  final String applicationUsername;
+
+  /// Reserved for future use.
+  ///
+  /// The value must be null before sending the payment. If the value is not null, the payment will be rejected.
+  /// Converted to String from NSData from ios platform using UTF8Encoding. The default is null.
+  // The iOS Platform provided this property but it is reserved for future use. We also provide this
+  // property to match the iOS platform; in case any future update for this property occurs, we do not need to
+  // add this property later.
+  final String requestData;
+
+  /// The amount of the product this payment is for. The default is 1. The minimum is 1. The maximum is 10.
+  final int quantity;
+
+  /// Produces an "ask to buy" flow in the sandbox if set to true. Default is false. I doesn't do it.
+  ///
+  /// For how to test in App Store sand box, see https://developer.apple.com/in-app-purchase/.
+  final bool simulatesAskToBuyInSandbox;
+}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
new file mode 100644
index 000000000000..67e81bd514fe
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
@@ -0,0 +1,83 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'sk_payment_queue_wrapper.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SKPaymentTransactionWrapper _$SKPaymentTransactionWrapperFromJson(Map json) {
+  return SKPaymentTransactionWrapper(
+      payment: SKPaymentWrapper.fromJson(json['payment'] as Map),
+      transactionState: _$enumDecode(
+          _$SKPaymentTransactionStateWrapperEnumMap, json['transactionState']),
+      originalTransaction: SKPaymentTransactionWrapper.fromJson(
+          json['originalTransaction'] as Map),
+      transactionTimeStamp: (json['transactionTimeStamp'] as num).toDouble(),
+      transactionIdentifier: json['transactionIdentifier'] as String,
+      downloads: (json['downloads'] as List)
+          .map((e) => SKDownloadWrapper.fromJson(e as Map))
+          .toList(),
+      error: SKError.fromJson(json['error'] as Map));
+}
+
+T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    throw ArgumentError('A value must be provided. Supported values: '
+        '${enumValues.values.join(', ')}');
+  }
+  return enumValues.entries
+      .singleWhere((e) => e.value == source,
+          orElse: () => throw ArgumentError(
+              '`$source` is not one of the supported values: '
+              '${enumValues.values.join(', ')}'))
+      .key;
+}
+
+const _$SKPaymentTransactionStateWrapperEnumMap =
+    <SKPaymentTransactionStateWrapper, dynamic>{
+  SKPaymentTransactionStateWrapper.purchasing: 0,
+  SKPaymentTransactionStateWrapper.purchased: 1,
+  SKPaymentTransactionStateWrapper.failed: 2,
+  SKPaymentTransactionStateWrapper.restored: 3,
+  SKPaymentTransactionStateWrapper.deferred: 4
+};
+
+SKDownloadWrapper _$SKDownloadWrapperFromJson(Map json) {
+  return SKDownloadWrapper(
+      contentIdentifier: json['contentIdentifier'] as String,
+      state: _$enumDecode(_$SKDownloadStateEnumMap, json['state']),
+      contentLength: json['contentLength'] as int,
+      contentURL: json['contentURL'] as String,
+      contentVersion: json['contentVersion'] as String,
+      transactionID: json['transactionID'] as String,
+      progress: (json['progress'] as num).toDouble(),
+      timeRemaining: (json['timeRemaining'] as num).toDouble(),
+      downloadTimeUnknown: json['downloadTimeUnknown'] as bool,
+      error: SKError.fromJson(json['error'] as Map));
+}
+
+const _$SKDownloadStateEnumMap = <SKDownloadState, dynamic>{
+  SKDownloadState.waiting: 0,
+  SKDownloadState.active: 1,
+  SKDownloadState.pause: 2,
+  SKDownloadState.finished: 3,
+  SKDownloadState.failed: 4,
+  SKDownloadState.cancelled: 5
+};
+
+SKError _$SKErrorFromJson(Map json) {
+  return SKError(
+      code: json['code'] as int,
+      domain: json['domain'] as String,
+      userInfo: Map<String, dynamic>.from(json['userInfo'] as Map));
+}
+
+SKPaymentWrapper _$SKPaymentWrapperFromJson(Map json) {
+  return SKPaymentWrapper(
+      productIdentifier: json['productIdentifier'] as String,
+      applicationUsername: json['applicationUsername'] as String,
+      requestData: json['requestData'] as String,
+      quantity: json['quantity'] as int,
+      simulatesAskToBuyInSandbox: json['simulatesAskToBuyInSandbox'] as bool);
+}
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
index 09f7bcbccc10..6f68ad067b09 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
@@ -10,6 +10,46 @@ import '../stub_in_app_purchase_platform.dart';
 
 void main() {
   final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
+  final dummyPayment = SKPaymentWrapper(
+      productIdentifier: 'prod-id',
+      applicationUsername: 'app-user-name',
+      requestData: 'fake-data-utf8',
+      quantity: 2,
+      simulatesAskToBuyInSandbox: true);
+  final SKError dummyError =
+      SKError(code: 111, domain: 'dummy-domain', userInfo: {'key': 'value'});
+  final SKDownloadWrapper dummyDownload = SKDownloadWrapper(
+    contentIdentifier: 'id',
+    state: SKDownloadState.failed,
+    contentLength: 32,
+    contentURL: 'https://download.com',
+    contentVersion: '0.0.1',
+    transactionID: 'tranID',
+    progress: 0.6,
+    timeRemaining: 1231231,
+    downloadTimeUnknown: false,
+    error: dummyError,
+  );
+  final SKPaymentTransactionWrapper dummyOriginalTransaction =
+      SKPaymentTransactionWrapper(
+    transactionState: SKPaymentTransactionStateWrapper.purchased,
+    payment: dummyPayment,
+    originalTransaction: null,
+    transactionTimeStamp: 1231231231.00,
+    transactionIdentifier: '123123',
+    downloads: [dummyDownload],
+    error: dummyError,
+  );
+  final SKPaymentTransactionWrapper dummyTransaction =
+      SKPaymentTransactionWrapper(
+    transactionState: SKPaymentTransactionStateWrapper.purchased,
+    payment: dummyPayment,
+    originalTransaction: dummyOriginalTransaction,
+    transactionTimeStamp: 1231231231.00,
+    transactionIdentifier: '123123',
+    downloads: [dummyDownload],
+    error: dummyError,
+  );
 
   setUpAll(() =>
       channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
@@ -27,4 +67,140 @@ void main() {
       expect(await SKPaymentQueueWrapper.canMakePayments(), isFalse);
     });
   });
+
+  group('Wrapper fromJson tests', () {
+    test('Should construct correct SKPaymentWrapper from json', () {
+      SKPaymentWrapper payment =
+          SKPaymentWrapper.fromJson(buildPaymentMap(dummyPayment));
+      testPayment(payment, dummyPayment);
+    });
+  });
+
+  test('Should construct correct SKError from json', () {
+    SKError error = SKError.fromJson(buildErrorMap(dummyError));
+    testSKError(error, dummyError);
+  });
+
+  test('Should construct correct SKDownloadWrapper from json', () {
+    SKDownloadWrapper download =
+        SKDownloadWrapper.fromJson(buildDownloadMap(dummyDownload));
+    testDownload(download, dummyDownload);
+  });
+
+  test('Should construct correct SKTransactionWrapper from json', () {
+    SKPaymentTransactionWrapper transaction =
+        SKPaymentTransactionWrapper.fromJson(
+            buildTransactionMap(dummyTransaction));
+    testTransaction(transaction, dummyTransaction);
+    if (transaction.originalTransaction != null) {
+      testTransaction(transaction.originalTransaction,
+          dummyTransaction.originalTransaction);
+    }
+  });
+}
+
+Map<String, dynamic> buildPaymentMap(SKPaymentWrapper paymentWrapper) {
+  return {
+    'productIdentifier': paymentWrapper.productIdentifier,
+    'applicationUsername': paymentWrapper.applicationUsername,
+    'requestData': paymentWrapper.requestData,
+    'quantity': paymentWrapper.quantity,
+    'simulatesAskToBuyInSandbox': paymentWrapper.simulatesAskToBuyInSandbox
+  };
+}
+
+Map<String, dynamic> buildErrorMap(SKError error) {
+  return {
+    'code': error.code,
+    'domain': error.domain,
+    'userInfo': error.userInfo,
+  };
+}
+
+Map<String, dynamic> buildDownloadMap(SKDownloadWrapper download) {
+  return {
+    'contentIdentifier': download.contentIdentifier,
+    'state': SKDownloadState.values.indexOf(download.state),
+    'contentLength': download.contentLength,
+    'contentURL': download.contentURL,
+    'contentVersion': download.contentVersion,
+    'transactionID': download.transactionID,
+    'progress': download.progress,
+    'timeRemaining': download.timeRemaining,
+    'downloadTimeUnknown': download.downloadTimeUnknown,
+    'error': buildErrorMap(download.error)
+  };
+}
+
+Map<String, dynamic> buildTransactionMap(
+    SKPaymentTransactionWrapper transaction) {
+  if (transaction == null) {
+    return null;
+  }
+  Map map = <String, dynamic>{
+    'transactionState': SKPaymentTransactionStateWrapper.values
+        .indexOf(SKPaymentTransactionStateWrapper.purchased),
+    'payment': buildPaymentMap(transaction.payment),
+    'originalTransaction': buildTransactionMap(transaction.originalTransaction),
+    'transactionTimeStamp': transaction.transactionTimeStamp,
+    'transactionIdentifier': transaction.transactionIdentifier,
+    'error': buildErrorMap(transaction.error),
+  };
+  List downloadList = transaction.downloads.map((SKDownloadWrapper download) {
+    return buildDownloadMap(download);
+  }).toList();
+  map['downloads'] = downloadList;
+  return map;
+}
+
+void testSKError(SKError error, SKError dummyError) {
+  expect(error.code, dummyError.code);
+  expect(error.domain, dummyError.domain);
+  expect(error.userInfo, dummyError.userInfo);
+}
+
+void testDownload(SKDownloadWrapper download, SKDownloadWrapper dummyDownload) {
+  expect(download.contentIdentifier, dummyDownload.contentIdentifier);
+  expect(download.state, dummyDownload.state);
+  expect(download.contentLength, dummyDownload.contentLength);
+  expect(download.contentURL, dummyDownload.contentURL);
+  expect(download.contentVersion, dummyDownload.contentVersion);
+  expect(download.transactionID, dummyDownload.transactionID);
+  expect(download.progress, dummyDownload.progress);
+  expect(download.timeRemaining, dummyDownload.timeRemaining);
+  expect(download.downloadTimeUnknown, dummyDownload.downloadTimeUnknown);
+  expect(download.error.code, dummyDownload.error.code);
+  expect(download.error.domain, dummyDownload.error.domain);
+  expect(download.error.userInfo, dummyDownload.error.userInfo);
+}
+
+void testPayment(SKPaymentWrapper payment, SKPaymentWrapper dummyPayment) {
+  expect(payment.productIdentifier, dummyPayment.productIdentifier);
+  expect(payment.applicationUsername, dummyPayment.applicationUsername);
+  expect(payment.requestData, dummyPayment.requestData);
+  expect(payment.quantity, dummyPayment.quantity);
+  expect(payment.simulatesAskToBuyInSandbox,
+      dummyPayment.simulatesAskToBuyInSandbox);
+}
+
+void testTransaction(SKPaymentTransactionWrapper transaction,
+    SKPaymentTransactionWrapper dummyTransaction) {
+  // payment
+  SKPaymentWrapper payment = transaction.payment;
+  SKPaymentWrapper dummyPayment = dummyTransaction.payment;
+  testPayment(payment, dummyPayment);
+  //download
+  SKDownloadWrapper download = transaction.downloads.first;
+  SKDownloadWrapper dummyDownload = dummyTransaction.downloads.first;
+  testDownload(download, dummyDownload);
+  //error
+  SKError error = transaction.error;
+  SKError dummyError = dummyTransaction.error;
+  testSKError(error, dummyError);
+
+  expect(transaction.transactionState, dummyTransaction.transactionState);
+  expect(
+      transaction.transactionTimeStamp, dummyTransaction.transactionTimeStamp);
+  expect(transaction.transactionIdentifier,
+      dummyTransaction.transactionIdentifier);
 }

From 4f024c7404c01e1f3b55be61704d2deb53f6ca41 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 13 Feb 2019 11:56:18 -0800
Subject: [PATCH 123/410] Introduce CODEOWNERS (#1205)

Introduce CODEOWNERS
---
 CODEOWNERS | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 CODEOWNERS

diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 000000000000..01d750c6ff32
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,24 @@
+# Below is a list of Flutter team members who are suggested reviewers
+# for contributions to plugins in this repository.
+#
+# These names are just suggestions. It is fine to have your changes
+# reviewed by someone else.
+
+packages/cloud_firestore/* @collinjackson @kroikie
+packages/firebase_auth/* @collinjackson @kroikie
+packages/firebase_messaging/* @collinjackson @kroikie
+packages/camera/* @bparrishMines @mklim
+packages/firebase_admob/* @amirh
+packages/firebase_ml_vision/* @bparrishMines
+packages/image_picker/* @cyanglaz
+packages/android_alarm_manager/* @bkonyi
+packages/google_maps_flutter/* @amirh
+packages/google_sign_in/* @cyanglaz @mehmetf
+packages/in_app_purchase/* @mklim
+packages/firebase_database/* @collinjackson @kroikie
+packages/firebase_storage/* @collinjackson @kroikie
+packages/package_info/* @cyanglaz
+packages/firebase_analytics/* @collinjackson @kroikie
+packages/connectivity/* @cyanglaz
+packages/webview_flutter/* @amirh
+

From 461ee634da7ecbb15dde05e3157b53d1e4cb4591 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Wed, 13 Feb 2019 13:27:07 -0800
Subject: [PATCH 124/410] WebView controller let's you clear cache (#1200)

* Web view clear cache

* Clear cache example

* Clear caches examples

* await before reload

* Fix docs
---
 packages/webview_flutter/CHANGELOG.md         |  4 ++
 .../webviewflutter/FlutterWebView.java        | 12 +++++
 .../webview_flutter/example/lib/main.dart     | 45 +++++++++++++++++++
 .../ios/Classes/FlutterWebView.m              | 18 ++++++++
 .../webview_flutter/lib/webview_flutter.dart  | 18 ++++++++
 .../test/webview_flutter_test.dart            | 22 +++++++++
 6 files changed, 119 insertions(+)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index a19fec80cae9..2a6c125ca662 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.3
+
+* Add clearCache method to WebView controller.
+
 ## 0.3.2+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index a6528cd34a8c..963bde9d215e 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.view.View;
+import android.webkit.WebStorage;
 import android.webkit.WebView;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
@@ -20,6 +21,8 @@ public class FlutterWebView implements PlatformView, MethodCallHandler {
   @SuppressWarnings("unchecked")
   FlutterWebView(Context context, BinaryMessenger messenger, int id, Map<String, Object> params) {
     webView = new WebView(context);
+    // Allow local storage.
+    webView.getSettings().setDomStorageEnabled(true);
 
     methodChannel = new MethodChannel(messenger, "plugins.flutter.io/webview_" + id);
     methodChannel.setMethodCallHandler(this);
@@ -77,6 +80,9 @@ public void onMethodCall(MethodCall methodCall, Result result) {
       case "removeJavascriptChannels":
         removeJavaScriptChannels(methodCall, result);
         break;
+      case "clearCache":
+        clearCache(result);
+        break;
       default:
         result.notImplemented();
     }
@@ -156,6 +162,12 @@ private void removeJavaScriptChannels(MethodCall methodCall, Result result) {
     result.success(null);
   }
 
+  private void clearCache(Result result) {
+    webView.clearCache(true);
+    WebStorage.getInstance().deleteAllData();
+    result.success(null);
+  }
+
   private void applySettings(Map<String, Object> settings) {
     for (String key : settings.keySet()) {
       switch (key) {
diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index 0536b7a5d247..4e3fe6cbdbdd 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -77,6 +77,9 @@ enum MenuOptions {
   toast,
   listCookies,
   clearCookies,
+  addToCache,
+  listCache,
+  clearCache,
 }
 
 class SampleMenu extends StatelessWidget {
@@ -110,6 +113,15 @@ class SampleMenu extends StatelessWidget {
               case MenuOptions.clearCookies:
                 _onClearCookies(context);
                 break;
+              case MenuOptions.addToCache:
+                _onAddToCache(controller.data, context);
+                break;
+              case MenuOptions.listCache:
+                _onListCache(controller.data, context);
+                break;
+              case MenuOptions.clearCache:
+                _onClearCache(controller.data, context);
+                break;
             }
           },
           itemBuilder: (BuildContext context) => <PopupMenuItem<MenuOptions>>[
@@ -130,6 +142,18 @@ class SampleMenu extends StatelessWidget {
                   value: MenuOptions.clearCookies,
                   child: Text('Clear cookies'),
                 ),
+                const PopupMenuItem<MenuOptions>(
+                  value: MenuOptions.addToCache,
+                  child: Text('Add to cache'),
+                ),
+                const PopupMenuItem<MenuOptions>(
+                  value: MenuOptions.listCache,
+                  child: Text('List cache'),
+                ),
+                const PopupMenuItem<MenuOptions>(
+                  value: MenuOptions.clearCache,
+                  child: Text('Clear cache'),
+                ),
               ],
         );
       },
@@ -160,6 +184,27 @@ class SampleMenu extends StatelessWidget {
     ));
   }
 
+  void _onAddToCache(WebViewController controller, BuildContext context) async {
+    await controller.evaluateJavascript(
+        'caches.open("test_caches_entry"); localStorage["test_localStorage"] = "dummy_entry";');
+    Scaffold.of(context).showSnackBar(const SnackBar(
+      content: Text('Added a test entry to cache.'),
+    ));
+  }
+
+  void _onListCache(WebViewController controller, BuildContext context) async {
+    await controller.evaluateJavascript('caches.keys()'
+        '.then((cacheKeys) => JSON.stringify({"cacheKeys" : cacheKeys, "localStorage" : localStorage}))'
+        '.then((caches) => Toaster.postMessage(caches))');
+  }
+
+  void _onClearCache(WebViewController controller, BuildContext context) async {
+    await controller.clearCache();
+    Scaffold.of(context).showSnackBar(const SnackBar(
+      content: Text("Cache cleared."),
+    ));
+  }
+
   void _onClearCookies(BuildContext context) async {
     final bool hadCookies = await cookieManager.clearCookies();
     String message = 'There were cookies. Now, they are gone!';
diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m
index f8e16a22077d..87d4d25bd9dc 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.m
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m
@@ -106,6 +106,8 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     [self onAddJavaScriptChannels:call result:result];
   } else if ([[call method] isEqualToString:@"removeJavascriptChannels"]) {
     [self onRemoveJavaScriptChannels:call result:result];
+  } else if ([[call method] isEqualToString:@"clearCache"]) {
+    [self clearCache:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -206,6 +208,22 @@ - (void)onRemoveJavaScriptChannels:(FlutterMethodCall*)call result:(FlutterResul
   result(nil);
 }
 
+- (void)clearCache:(FlutterResult)result {
+  if (@available(iOS 9.0, *)) {
+    NSSet* cacheDataTypes = [WKWebsiteDataStore allWebsiteDataTypes];
+    WKWebsiteDataStore* dataStore = [WKWebsiteDataStore defaultDataStore];
+    NSDate* dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
+    [dataStore removeDataOfTypes:cacheDataTypes
+                   modifiedSince:dateFrom
+               completionHandler:^{
+                 result(nil);
+               }];
+  } else {
+    // support for iOS8 tracked in https://github.com/flutter/flutter/issues/27624.
+    NSLog(@"Clearing cache is not supported for Flutter WebViews prior to iOS 9.");
+  }
+}
+
 - (void)applySettings:(NSDictionary<NSString*, id>*)settings {
   for (NSString* key in settings) {
     if ([key isEqualToString:@"jsMode"]) {
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index dbb5af0aa3b1..a4bb285a2d8d 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -394,6 +394,24 @@ class WebViewController {
     return _channel.invokeMethod("reload");
   }
 
+  /// Clears all caches used by the [WebView].
+  ///
+  /// The following caches are cleared:
+  ///	1. Browser HTTP Cache.
+  ///	2. [Cache API](https://developers.google.com/web/fundamentals/instant-and-offline/web-storage/cache-api) caches.
+  ///    These are not yet supported in iOS WkWebView. Service workers tend to use this cache.
+  ///	3. Application cache.
+  ///	4. Local Storage.
+  ///
+  /// Note: Calling this method also triggers a reload.
+  Future<void> clearCache() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    await _channel.invokeMethod("clearCache");
+    return reload();
+  }
+
   Future<void> _updateSettings(_WebSettings setting) async {
     final Map<String, dynamic> updateMap = _settings.updatesMap(setting);
     if (updateMap == null) {
diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart
index 4a0eb1c514e4..2f37c01950e5 100644
--- a/packages/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/test/webview_flutter_test.dart
@@ -124,6 +124,24 @@ void main() {
     expect(canGoBackNoPageLoaded, false);
   });
 
+  testWidgets("Clear Cache", (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+
+    expect(controller, isNotNull);
+    expect(fakePlatformViewsController.lastCreatedView.hasCache, true);
+
+    await controller.clearCache();
+
+    expect(fakePlatformViewsController.lastCreatedView.hasCache, false);
+  });
+
   testWidgets("Can't go back with no history", (WidgetTester tester) async {
     WebViewController controller;
     await tester.pumpWidget(
@@ -569,6 +587,7 @@ class FakePlatformWebView {
   List<String> history = <String>[];
   int currentPosition = -1;
   int amountOfReloadsOnCurrentUrl = 0;
+  bool hasCache = true;
 
   String get currentUrl => history.isEmpty ? null : history[currentPosition];
   JavascriptMode javascriptMode;
@@ -621,6 +640,9 @@ class FakePlatformWebView {
         javascriptChannelNames
             .removeWhere((String channel) => channelNames.contains(channel));
         break;
+      case 'clearCache':
+        hasCache = false;
+        return Future<void>.sync(() {});
     }
     return Future<void>.sync(() {});
   }

From 81dff2bedce130b564c583c4927fd429d584aa8c Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Wed, 13 Feb 2019 13:38:47 -0800
Subject: [PATCH 125/410] Iap getproductlist basic draft (#1169)

Contains the basic draft of the combined api to get product details.
Add an example app to demonstrate the usage.
---
 .../TranslatorTest.m                          |   1 +
 .../in_app_purchase/example/lib/main.dart     | 110 +++++++++++++-----
 .../lib/in_app_purchase_connection.dart       |   1 +
 .../sku_details_wrapper.dart                  |  11 ++
 .../app_store_connection.dart                 |  24 +++-
 .../google_play_connection.dart               |  28 +++++
 .../in_app_purchase_connection.dart           |   4 +
 .../product_details.dart                      |  45 +++++++
 .../sk_product_wrapper.dart                   |  11 ++
 .../lib/store_kit_wrappers.dart               |   1 +
 .../sku_details_wrapper_test.dart             |  11 ++
 .../app_store_connection_test.dart            |  71 +++++++++++
 .../google_play_connection_test.dart          |  48 ++++++++
 .../store_kit_wrappers/sk_product_test.dart   |  11 ++
 14 files changed, 347 insertions(+), 30 deletions(-)
 create mode 100644 packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart

diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
index 91414af5104d..9864d335ed99 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
@@ -167,6 +167,7 @@ - (void)testError {
   NSDictionary *map = [error toMap];
   XCTAssertEqualObjects(map, self.errorMap);
 }
+
 - (void)testLocaleToMap {
   NSLocale *system = NSLocale.systemLocale;
   NSDictionary *map = [system toMap];
diff --git a/packages/in_app_purchase/example/lib/main.dart b/packages/in_app_purchase/example/lib/main.dart
index edf3db140183..3844add7724c 100644
--- a/packages/in_app_purchase/example/lib/main.dart
+++ b/packages/in_app_purchase/example/lib/main.dart
@@ -27,53 +27,105 @@ class _MyAppState extends State<MyApp> {
         appBar: AppBar(
           title: const Text('IAP Example'),
         ),
-        body: Center(
-            child: FutureBuilder<List<Widget>>(
-                future: buildStorefront(),
+        body: Column(
+          children: [
+            FutureBuilder(
+              future: _buildConnectionCheckTile(),
+              builder: (BuildContext context, AsyncSnapshot snapshot) {
+                if (!snapshot.hasData) {
+                  return Column(children: <Widget>[
+                    buildListCard(
+                        ListTile(title: const Text('Trying to connect...')))
+                  ]);
+                } else if (snapshot.error != null) {
+                  return Column(children: <Widget>[
+                    buildListCard(ListTile(
+                        title: Text(
+                            'Error connecting: ' + snapshot.error.toString())))
+                  ]);
+                }
+                return Column(
+                  children: snapshot.data,
+                );
+              },
+            ),
+            Expanded(
+              child: FutureBuilder(
+                future: InAppPurchaseConnection.instance.queryProductDetails(
+                    <String>['consumable', 'upgrade', 'subscription'].toSet()),
                 builder: (BuildContext context,
-                    AsyncSnapshot<List<Widget>> snapshot) {
+                    AsyncSnapshot<ProductDetailsResponse> snapshot) {
                   if (!snapshot.hasData) {
-                    return ListView(children: <Widget>[
-                      buildListCard(
-                          ListTile(title: const Text('Trying to connect...')))
+                    return Column(children: <Widget>[
+                      buildListCard(ListTile(title: const Text('Loading...')))
                     ]);
                   } else if (snapshot.error != null) {
-                    return ListView(children: <Widget>[
-                      buildListCard(ListTile(
-                          title: Text('Error connecting: ' +
-                              snapshot.error.toString())))
-                    ]);
+                    return Center(
+                      child: Text('Error: ' + snapshot.error.toString()),
+                    );
                   }
-
-                  return ListView(children: snapshot.data);
-                })),
+                  return Column(
+                    children: <Widget>[
+                      Center(child: Text('Products')),
+                      Expanded(
+                        child: ListView(
+                          children: _buildProductList(snapshot.data),
+                        ),
+                      ),
+                    ],
+                  );
+                },
+              ),
+            ),
+          ],
+        ),
       ),
     );
   }
 
-  Future<List<Widget>> buildStorefront() async {
+  Future<List<ListTile>> _buildConnectionCheckTile() async {
     final bool available = await InAppPurchaseConnection.instance.isAvailable();
-    final Widget storeHeader = buildListCard(ListTile(
+    final Widget storeHeader = buildListCard(
+      ListTile(
         leading: Icon(available ? Icons.check : Icons.block),
-        title: Text('The store is ' +
-            (available ? 'available' : 'unavailable') +
-            '.')));
-    final List<Widget> children = <Widget>[storeHeader];
+        title: Text(
+            'The store is ' + (available ? 'available' : 'unavailable') + '.'),
+      ),
+    );
+    final List<ListTile> children = <ListTile>[storeHeader];
 
     if (!available) {
-      children.add(buildListCard(ListTile(
-          title: Text('Not connected',
-              style: TextStyle(color: ThemeData.light().errorColor)),
-          subtitle: const Text(
-              'Unable to connect to the payments processor. Has this app been configured correctly? See the example README for instructions.'))));
-    } else {
       children.add(
-          buildListCard(ListTile(title: const Text('Nothing to see yet.'))));
+        buildListCard(
+          ListTile(
+            title: Text('Not connected',
+                style: TextStyle(color: ThemeData.light().errorColor)),
+            subtitle: const Text(
+                'Unable to connect to the payments processor. Has this app been configured correctly? See the example README for instructions.'),
+          ),
+        ),
+      );
     }
-
     return children;
   }
 
+  List<ListTile> _buildProductList(ProductDetailsResponse response) {
+    List<ListTile> productDetailsCards = response.productDetails.map(
+      (ProductDetails productDetails) {
+        return buildListCard(ListTile(
+          title: Text(
+            productDetails.title,
+          ),
+          subtitle: Text(
+            productDetails.description,
+          ),
+          trailing: Text(productDetails.price),
+        ));
+      },
+    ).toList();
+    return productDetailsCards;
+  }
+
   static ListTile buildListCard(ListTile innerTile) =>
       ListTile(title: Card(child: innerTile));
 }
diff --git a/packages/in_app_purchase/lib/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/in_app_purchase_connection.dart
index e6d6ac627c55..121038536996 100644
--- a/packages/in_app_purchase/lib/in_app_purchase_connection.dart
+++ b/packages/in_app_purchase/lib/in_app_purchase_connection.dart
@@ -3,3 +3,4 @@
 // found in the LICENSE file.
 
 export 'src/in_app_purchase_connection/in_app_purchase_connection.dart';
+export 'src/in_app_purchase_connection/product_details.dart';
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
index 670bf5125491..132fd0b3a3a8 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
@@ -7,6 +7,7 @@ import 'package:flutter/foundation.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'billing_client_wrapper.dart';
 import 'enum_converters.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
 
 // WARNING: Changes to `@JsonSerializable` classes need to be reflected in the
 // below generated file. Run `flutter packages pub run build_runner watch` to
@@ -124,6 +125,16 @@ class SkuDetailsWrapper {
         type.hashCode,
         isRewarded.hashCode);
   }
+
+  /// Method to convert to the wrapper to the consolidated [ProductDetails] class.
+  ProductDetails toProductDetails() {
+    return ProductDetails(
+      id: sku,
+      title: title,
+      description: description,
+      price: price,
+    );
+  }
 }
 
 /// Translation of [`com.android.billingclient.api.SkuDetailsResponseListener`](https://developer.android.com/reference/com/android/billingclient/api/SkuDetailsResponseListener.html).
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
index abb4b94ee1af..6d0477fb3e8f 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
@@ -4,8 +4,9 @@
 
 import 'dart:async';
 
-import '../../store_kit_wrappers.dart';
 import 'in_app_purchase_connection.dart';
+import 'product_details.dart';
+import 'package:in_app_purchase/store_kit_wrappers.dart';
 
 /// An [InAppPurchaseConnection] that wraps StoreKit.
 ///
@@ -26,4 +27,25 @@ class AppStoreConnection implements InAppPurchaseConnection {
     _instance = AppStoreConnection();
     return _instance;
   }
+
+  /// Query the product detail list.
+  ///
+  /// This method only returns [ProductDetailsResponse].
+  /// To get detailed Store Kit product list, use [SkProductResponseWrapper.startProductRequest]
+  /// to get the [SKProductResponseWrapper].
+  Future<ProductDetailsResponse> queryProductDetails(
+      Set<String> identifiers) async {
+    final SKRequestMaker requestMaker = SKRequestMaker();
+    SkProductResponseWrapper response =
+        await requestMaker.startProductRequest(identifiers.toList());
+    List<ProductDetails> productDetails = response.products
+        .map((SKProductWrapper productWrapper) =>
+            productWrapper.toProductDetails())
+        .toList();
+    ProductDetailsResponse productDetailsResponse = ProductDetailsResponse(
+      productDetails: productDetails,
+      notFoundIDs: response.invalidProductIdentifiers,
+    );
+    return productDetailsResponse;
+  }
 }
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
index 91546ebfb25a..c57e1cf80994 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
@@ -7,6 +7,7 @@ import 'dart:async';
 import 'package:flutter/widgets.dart';
 import '../../billing_client_wrappers.dart';
 import 'in_app_purchase_connection.dart';
+import 'product_details.dart';
 
 /// An [InAppPurchaseConnection] that wraps Google Play Billing.
 ///
@@ -59,4 +60,31 @@ class GooglePlayConnection
       _billingClient.startConnection(onBillingServiceDisconnected: () {});
 
   Future<void> _disconnect() => _billingClient.endConnection();
+
+  /// Query the product detail list.
+  ///
+  /// This method only returns [ProductDetailsResponse].
+  /// To get detailed Google Play sku list, use [BillingClient.querySkuDetails]
+  /// to get the [SkuDetailsResponseWrapper].
+  Future<ProductDetailsResponse> queryProductDetails(
+      Set<String> identifiers) async {
+    List<SkuDetailsResponseWrapper> responses = await Future.wait([
+      _billingClient.querySkuDetails(
+          skuType: SkuType.inapp, skusList: identifiers.toList()),
+      _billingClient.querySkuDetails(
+          skuType: SkuType.subs, skusList: identifiers.toList())
+    ]);
+    List<ProductDetails> productDetails =
+        responses.expand((SkuDetailsResponseWrapper response) {
+      return response.skuDetailsList;
+    }).map((SkuDetailsWrapper skuDetailWrapper) {
+      return skuDetailWrapper.toProductDetails();
+    }).toList();
+    Set<String> successIDS = productDetails
+        .map((ProductDetails productDetails) => productDetails.id)
+        .toSet();
+    List<String> notFoundIDS = identifiers.difference(successIDS).toList();
+    return ProductDetailsResponse(
+        productDetails: productDetails, notFoundIDs: notFoundIDS);
+  }
 }
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
index 439a101aec47..1cb0e0e5002c 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
@@ -6,12 +6,16 @@ import 'dart:async';
 import 'dart:io';
 import 'app_store_connection.dart';
 import 'google_play_connection.dart';
+import 'product_details.dart';
 
 /// Basic generic API for making in app purchases across multiple platforms.
 abstract class InAppPurchaseConnection {
   /// Returns true if the payment platform is ready and available.
   Future<bool> isAvailable();
 
+  /// Query product details list that match the given set of identifiers.
+  Future<ProductDetailsResponse> queryProductDetails(Set<String> identifiers);
+
   /// The [InAppPurchaseConnection] implemented for this platform.
   ///
   /// Throws an [UnsupportedError] when accessed on a platform other than
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart
new file mode 100644
index 000000000000..6ffc87fb105c
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart
@@ -0,0 +1,45 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/foundation.dart';
+
+/// The class represents the information of a product.
+class ProductDetails {
+  ProductDetails({
+    @required this.id,
+    @required this.title,
+    @required this.description,
+    @required this.price,
+  });
+
+  /// The identifier of the product, specified in App Store Connect or Sku in Google Play console.
+  final String id;
+
+  /// The title of the product, specified in the App Store Connect or Sku in Google Play console based on the platform.
+  final String title;
+
+  /// The description of the product, specified in the App Store Connect or Sku in Google Play console based on the platform.
+  final String description;
+
+  /// The price of the product, specified in the App Store Connect or Sku in Google Play console based on the platform.
+  /// Formatted with currency symbol ("$0.99").
+  final String price;
+}
+
+/// The response returned by [InAppPurchaseConnection.queryProductDetails].
+///
+/// A list of [ProductDetails] can be obtained from the this response.
+class ProductDetailsResponse {
+  ProductDetailsResponse(
+      {@required this.productDetails, @required this.notFoundIDs});
+
+  /// Each [ProductDetails] uniquely matches one valid identifier in [identifiers] of [InAppPurchaseConnection.queryProductDetails].
+  final List<ProductDetails> productDetails;
+
+  /// The list of identifiers that are in the `identifiers` of [InAppPurchaseConnection.queryProductDetails] but failed to be fetched.
+  ///
+  /// There's multiple platform specific reasons that product information could fail to be fetched,
+  /// ranging from products not being correctly configured in the storefront to the queried IDs not existing.
+  final List<String> notFoundIDs;
+}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
index 7b09fd1acce6..18ea1fc694f2 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
@@ -4,6 +4,7 @@
 
 import 'package:flutter/foundation.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
 
 // WARNING: Changes to `@JsonSerializable` classes need to be reflected in the
 // below generated file. Run `flutter packages pub run build_runner watch` to
@@ -231,6 +232,16 @@ class SKProductWrapper {
   /// The [subscriptionPeriod] of the discount is independent of the product's [subscriptionPeriod],
   /// and their units and duration do not have to be matched.
   final SKProductDiscountWrapper introductoryPrice;
+
+  /// Method to convert to the wrapper to the consolidated [ProductDetails] class.
+  ProductDetails toProductDetails() {
+    return ProductDetails(
+      id: productIdentifier,
+      title: localizedTitle,
+      description: localizedDescription,
+      price: priceLocale.currencySymbol + price.toString(),
+    );
+  }
 }
 
 /// Object that indicates the locale of the price
diff --git a/packages/in_app_purchase/lib/store_kit_wrappers.dart b/packages/in_app_purchase/lib/store_kit_wrappers.dart
index 9562ddd8bc68..49d1b0d163c0 100644
--- a/packages/in_app_purchase/lib/store_kit_wrappers.dart
+++ b/packages/in_app_purchase/lib/store_kit_wrappers.dart
@@ -4,3 +4,4 @@
 
 export 'src/store_kit_wrappers/sk_payment_queue_wrapper.dart';
 export 'src/store_kit_wrappers/sk_product_wrapper.dart';
+export 'src/store_kit_wrappers/sk_request_maker.dart';
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
index 0e4503ff44b4..186cee8895ba 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
@@ -5,6 +5,7 @@
 import 'package:test/test.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
 
 final SkuDetailsWrapper dummyWrapper = SkuDetailsWrapper(
   description: 'description',
@@ -57,6 +58,16 @@ void main() {
       expect(parsed.skuDetailsList, containsAll(expected.skuDetailsList));
     });
 
+    test('toProductDetails() should return correct Product object', () {
+      final SkuDetailsWrapper wrapper =
+          SkuDetailsWrapper.fromJson(buildSkuMap(dummyWrapper));
+      final ProductDetails product = wrapper.toProductDetails();
+      expect(product.title, wrapper.title);
+      expect(product.description, wrapper.description);
+      expect(product.id, wrapper.sku);
+      expect(product.price, wrapper.price);
+    });
+
     test('handles empty list of skuDetails', () {
       final BillingResponse responseCode = BillingResponse.error;
       final List<SkuDetailsWrapper> skusDetails = <SkuDetailsWrapper>[];
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
index 5d17b4380a63..d107b59afe58 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
@@ -7,6 +7,7 @@ import 'package:test/test.dart';
 import 'package:in_app_purchase/src/channel.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/app_store_connection.dart';
 import '../stub_in_app_purchase_platform.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
 
 void main() {
   final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
@@ -27,4 +28,74 @@ void main() {
       expect(await AppStoreConnection.instance.isAvailable(), isFalse);
     });
   });
+
+  final Map<String, dynamic> localeMap = <String, dynamic>{
+    'currencySymbol': '\$'
+  };
+  final Map<String, dynamic> subMap = <String, dynamic>{
+    'numberOfUnits': 1,
+    'unit': 2
+  };
+  final Map<String, dynamic> discountMap = <String, dynamic>{
+    'price': 1.0,
+    'priceLocale': localeMap,
+    'numberOfPeriods': 1,
+    'paymentMode': 2,
+    'subscriptionPeriod': subMap,
+  };
+  final Map<String, dynamic> productMap = <String, dynamic>{
+    'productIdentifier': 'id',
+    'localizedTitle': 'splash coin',
+    'localizedDescription': 'description',
+    'priceLocale': localeMap,
+    'downloadContentVersion': 'version',
+    'subscriptionGroupIdentifier': 'com.group',
+    'price': 1.0,
+    'downloadable': true,
+    'downloadContentLengths': <int>[1, 2],
+    'subscriptionPeriod': subMap,
+    'introductoryPrice': discountMap,
+  };
+
+  final Map<String, List<dynamic>> productResponseMap = <String, List<dynamic>>{
+    'products': <Map<String, dynamic>>[productMap],
+    'invalidProductIdentifiers': <String>['567'],
+  };
+
+  group('query product list', () {
+    test('should get product list', () async {
+      stubPlatform.addResponse(
+          name: '-[InAppPurchasePlugin startProductRequest:result:]',
+          value: productResponseMap);
+      final AppStoreConnection connection = AppStoreConnection();
+      final ProductDetailsResponse response =
+          await connection.queryProductDetails(<String>['123'].toSet());
+      List<ProductDetails> products = response.productDetails;
+      expect(
+        products,
+        isNotEmpty,
+      );
+      expect(
+        products.first.title,
+        'splash coin',
+      );
+      expect(
+        products.first.title,
+        isNot('splash coins'),
+      );
+    });
+
+    test('should get correct not found identifiers', () async {
+      stubPlatform.addResponse(
+          name: '-[InAppPurchasePlugin startProductRequest:result:]',
+          value: productResponseMap);
+      final AppStoreConnection connection = AppStoreConnection();
+      final ProductDetailsResponse response =
+          await connection.queryProductDetails(<String>['123'].toSet());
+      expect(
+        response.notFoundIDs,
+        <String>['567'],
+      );
+    });
+  });
 }
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index 2c9201d4538e..a9a6ec7703ad 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -10,6 +10,8 @@ import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart
 import 'package:in_app_purchase/src/in_app_purchase_connection/google_play_connection.dart';
 import 'package:in_app_purchase/src/channel.dart';
 import '../stub_in_app_purchase_platform.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
+import '../billing_client_wrappers/sku_details_wrapper_test.dart';
 
 void main() {
   final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
@@ -64,4 +66,50 @@ void main() {
       expect(await connection.isAvailable(), isFalse);
     });
   });
+
+  group('querySkuDetails', () {
+    final String queryMethodName =
+        'BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)';
+
+    test('handles empty skuDetails', () async {
+      final BillingResponse responseCode = BillingResponse.developerError;
+      stubPlatform.addResponse(name: queryMethodName, value: <dynamic, dynamic>{
+        'responseCode': BillingResponseConverter().toJson(responseCode),
+        'skuDetailsList': <Map<String, dynamic>>[]
+      });
+
+      final ProductDetailsResponse response =
+          await connection.queryProductDetails(<String>[''].toSet());
+      expect(response.productDetails, isEmpty);
+    });
+
+    test('should get correct product details', () async {
+      final BillingResponse responseCode = BillingResponse.ok;
+      stubPlatform.addResponse(name: queryMethodName, value: <String, dynamic>{
+        'responseCode': BillingResponseConverter().toJson(responseCode),
+        'skuDetailsList': <Map<String, dynamic>>[buildSkuMap(dummyWrapper)]
+      });
+      // Since queryProductDetails makes 2 platform method calls (one for each SkuType), the result will contain 2 dummyWrapper instead
+      // of 1.
+      final ProductDetailsResponse response =
+          await connection.queryProductDetails(<String>['valid'].toSet());
+      expect(response.productDetails.first.title, dummyWrapper.title);
+      expect(
+          response.productDetails.first.description, dummyWrapper.description);
+      expect(response.productDetails.first.price, dummyWrapper.price);
+    });
+
+    test('should get the correct notFoundIDs', () async {
+      final BillingResponse responseCode = BillingResponse.ok;
+      stubPlatform.addResponse(name: queryMethodName, value: <String, dynamic>{
+        'responseCode': BillingResponseConverter().toJson(responseCode),
+        'skuDetailsList': <Map<String, dynamic>>[buildSkuMap(dummyWrapper)]
+      });
+      // Since queryProductDetails makes 2 platform method calls (one for each SkuType), the result will contain 2 dummyWrapper instead
+      // of 1.
+      final ProductDetailsResponse response =
+          await connection.queryProductDetails(<String>['invalid'].toSet());
+      expect(response.notFoundIDs.first, 'invalid');
+    });
+  });
 }
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
index df3695ad1fda..7e49730ffe88 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
@@ -4,6 +4,7 @@
 
 import 'package:test/test.dart';
 import 'package:in_app_purchase/src/store_kit_wrappers/sk_product_wrapper.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
 
 void main() {
   final Map<String, dynamic> localeMap = <String, dynamic>{
@@ -153,6 +154,16 @@ void main() {
       expect(wrapper.subscriptionPeriod, null);
     });
 
+    test('toProductDetails() should return correct Product object', () {
+      final SKProductWrapper wrapper = SKProductWrapper.fromJson(productMap);
+      final ProductDetails product = wrapper.toProductDetails();
+      expect(product.title, wrapper.localizedTitle);
+      expect(product.description, wrapper.localizedDescription);
+      expect(product.id, wrapper.productIdentifier);
+      expect(product.price,
+          wrapper.priceLocale.currencySymbol + wrapper.price.toString());
+    });
+
     test('SKProductResponse wrapper should match', () {
       final SkProductResponseWrapper wrapper =
           SkProductResponseWrapper.fromJson(productResponseMap);

From 02edbe7f958790203e9e317e5f9bd329f970aa37 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Wed, 13 Feb 2019 13:46:30 -0800
Subject: [PATCH 126/410] Change version webview flutter (#1212)

Missed it in https://github.com/flutter/plugins/pull/1200
---
 packages/webview_flutter/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 4c658b69c5d9..bfb43275d6af 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.2+1
+version: 0.3.3
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From bb048df00d116908438cc0d24c2ca4b2fd27b58c Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Wed, 13 Feb 2019 14:24:51 -0800
Subject: [PATCH 127/410] Video player supported formats (#1214)

* Web view clear cache

* Clear cache example

* Clear caches examples

* await before reload

* Fix docs

* Change WebView plugin version

Missed it in https://github.com/flutter/plugins/pull/1200

* AVPlayer supported formats docs
---
 packages/video_player/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/video_player/README.md b/packages/video_player/README.md
index fe9a8accff65..c4b5718484ab 100644
--- a/packages/video_player/README.md
+++ b/packages/video_player/README.md
@@ -40,6 +40,14 @@ Ensure the following permission is present in your Android Manifest file, locate
 
 The Flutter project template adds it, so it may already be there.
 
+### Supported Formats
+
+- On iOS, the backing player is [AVPlayer](https://developer.apple.com/documentation/avfoundation/avplayer).
+  The supported formats vary depending on the version of iOS, [AVURLAsset](https://developer.apple.com/documentation/avfoundation/avurlasset) class
+  has [audiovisualTypes](https://developer.apple.com/documentation/avfoundation/avurlasset/1386800-audiovisualtypes?language=objc) that you can query for supported av formats.
+- On Android, the backing player is [ExoPlayer](https://google.github.io/ExoPlayer/),
+  please refer [here](https://google.github.io/ExoPlayer/supported-formats.html) for list of supported formats.
+
 ### Example
 
 ```dart

From 81271b905f513aa8a534d799944f06ea11c1aa11 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Wed, 13 Feb 2019 14:40:33 -0800
Subject: [PATCH 128/410] Set GoogleAppMeasurement dependency version (#1213)

---
 packages/firebase_ml_vision/CHANGELOG.md                   | 5 +++++
 packages/firebase_ml_vision/ios/firebase_ml_vision.podspec | 1 +
 packages/firebase_ml_vision/pubspec.yaml                   | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 613a583a6eef..c780a7190a18 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.5.0+1
+
+* Fixes `FIRAnalyticsVersionMismatch` compilation error on iOS. Please run `pod update` in directory
+  containing `Podfile`.
+
 ## 0.5.0
 
 * **Breaking Change** Change `Rectangle<int>` to `Rect` in Text/Face/Barcode results.
diff --git a/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec b/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec
index 6ee8ea0f6f68..02ac73096a29 100644
--- a/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec
+++ b/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec
@@ -22,6 +22,7 @@ An SDK that brings Google's machine learning expertise to Android and iOS apps i
   s.dependency 'Firebase/MLVisionFaceModel'
   s.dependency 'Firebase/MLVisionLabelModel'
   s.dependency 'Firebase/MLVisionTextModel'
+  s.dependency 'GoogleAppMeasurement', '~> 5.3.0'
   s.ios.deployment_target = '8.0'
   s.static_framework = true
 end
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index 463b759793c4..0e76934fc20f 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_ml_vision
 description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.5.0
+version: 0.5.0+1
 
 dependencies:
   flutter:

From 06c906d04e56aa6adec3ac5725a25e9b36880842 Mon Sep 17 00:00:00 2001
From: Ben Konyi <bkonyi@google.com>
Date: Wed, 13 Feb 2019 14:44:02 -0800
Subject: [PATCH 129/410] Bump video_player version to 0.10.0+2 (#1215)

New release to add additional documentation (see #1214).
---
 packages/video_player/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml
index 748c831e6e1d..197430d53585 100644
--- a/packages/video_player/pubspec.yaml
+++ b/packages/video_player/pubspec.yaml
@@ -2,7 +2,7 @@ name: video_player
 description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
-version: 0.10.0+1
+version: 0.10.0+2
 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player
 
 flutter:

From ba2fc3f2ec0e9185a07cd43d99373850f3e5ed4c Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Thu, 14 Feb 2019 08:56:44 -0800
Subject: [PATCH 130/410] [android_alarm_manager] Include missing dependency
 (#1217)

Fixes flutter/flutter#27738
---
 packages/android_alarm_manager/CHANGELOG.md         | 4 ++++
 packages/android_alarm_manager/android/build.gradle | 1 +
 packages/android_alarm_manager/pubspec.yaml         | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index dc2fe4088280..f5f895d54a1a 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.1+2
+
+* Include a missing API dependency.
+
 ## 0.4.1+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/android_alarm_manager/android/build.gradle b/packages/android_alarm_manager/android/build.gradle
index 5f1f42c49379..11c6be26861a 100644
--- a/packages/android_alarm_manager/android/build.gradle
+++ b/packages/android_alarm_manager/android/build.gradle
@@ -48,4 +48,5 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.0'
+    api 'androidx.core:core:1.0.1'
 }
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index 209334e8ce66..491602e47bed 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -1,7 +1,7 @@
 name: android_alarm_manager
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.4.1+1
+version: 0.4.1+2
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 

From d2c12d6aba0664b94cb66aa4d68da9342a4002ea Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Thu, 14 Feb 2019 10:42:02 -0800
Subject: [PATCH 131/410] remove blank line (#1220)

---
 CODEOWNERS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 01d750c6ff32..403e3a5a077d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -20,5 +20,4 @@ packages/firebase_storage/* @collinjackson @kroikie
 packages/package_info/* @cyanglaz
 packages/firebase_analytics/* @collinjackson @kroikie
 packages/connectivity/* @cyanglaz
-packages/webview_flutter/* @amirh
-
+packages/webview_flutter/* @amirh
\ No newline at end of file

From 0e72ca566389956f3a719e910967eef0eaf491bd Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Thu, 14 Feb 2019 12:30:56 -0800
Subject: [PATCH 132/410] [In_app_purchase]fix requesthandler crash (#1199)

The FIAPRequestHandler is destroyed when exiting the function. Since FIAPRequestHandler is the delegate, when SKProductRequest tries to execute the delegate method, it will not be able to find the delegate. Hence the crash.

Adding a set to hold strong reference of the FIAPRequestHandler until it is complete fix the crash.
---
 .../ios/Classes/InAppPurchasePlugin.m         | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
index 4a169cc37603..76ab8c557319 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
@@ -7,6 +7,14 @@
 #import "FIAObjectTranslator.h"
 #import "FIAPRequestHandler.h"
 
+@interface InAppPurchasePlugin ()
+
+// Holding strong references to FIAPRequestHandlers. Remove the handlers from the set after
+// the request is finished.
+@property(strong, nonatomic) NSMutableSet *requestHandlers;
+
+@end
+
 @implementation InAppPurchasePlugin
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
@@ -42,6 +50,8 @@ - (void)handleProductRequestMethodCall:(FlutterMethodCall *)call result:(Flutter
   SKProductsRequest *request =
       [self getProductRequestWithIdentifiers:[NSSet setWithArray:productIdentifiers]];
   FIAPRequestHandler *handler = [[FIAPRequestHandler alloc] initWithRequest:request];
+  [self.requestHandlers addObject:handler];
+  __weak typeof(self) weakSelf = self;
   [handler startProductRequestWithCompletionHandler:^(SKProductsResponse *_Nullable response,
                                                       NSError *_Nullable error) {
     if (error) {
@@ -61,6 +71,7 @@ - (void)handleProductRequestMethodCall:(FlutterMethodCall *)call result:(Flutter
       return;
     }
     result([response toMap]);
+    [weakSelf.requestHandlers removeObject:handler];
   }];
 }
 
@@ -68,4 +79,13 @@ - (SKProductsRequest *)getProductRequestWithIdentifiers:(NSSet *)identifiers {
   return [[SKProductsRequest alloc] initWithProductIdentifiers:identifiers];
 }
 
+#pragma mark - getter
+
+- (NSSet *)requestHandlers {
+  if (!_requestHandlers) {
+    _requestHandlers = [NSMutableSet new];
+  }
+  return _requestHandlers;
+}
+
 @end

From 655e994d6b7edc90c259bcbde649ab20646560e6 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Thu, 14 Feb 2019 13:02:41 -0800
Subject: [PATCH 133/410] Add capability of using single plane buffers (#1156)

---
 packages/firebase_ml_vision/CHANGELOG.md      |   7 +-
 .../ios/Classes/FirebaseMlVisionPlugin.m      | 158 ++++++++++++------
 .../lib/src/firebase_vision.dart              |   9 +-
 packages/firebase_ml_vision/pubspec.yaml      |   2 +-
 4 files changed, 120 insertions(+), 56 deletions(-)

diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index c780a7190a18..6f4a0123a2ca 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.1
+
+* iOS now handles non-planar buffers from `FirebaseVisionImage.fromBytes()`.
+
 ## 0.5.0+1
 
 * Fixes `FIRAnalyticsVersionMismatch` compilation error on iOS. Please run `pod update` in directory
@@ -18,7 +22,8 @@
 ## 0.4.0
 
 * **Breaking Change** Removal of base detector class `FirebaseVisionDetector`.
-* **Breaking Change** Removal of `TextRecognizer.detectInImage()`. Pleas use `TextRecognizer.processImage()`.
+* **Breaking Change** Removal of `TextRecognizer.detectInImage()`. Please use
+  `TextRecognizer.processImage()`.
 * **Breaking Change** Changed `FaceDetector.detectInImage()` to `FaceDetector.processImage()`.
 
 ## 0.3.0
diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index dddb405980c4..a57b3b08ccbf 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -57,70 +57,126 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
   NSString *imageType = imageData[@"type"];
 
   if ([@"file" isEqualToString:imageType]) {
-    UIImage *image = [UIImage imageWithContentsOfFile:imageData[@"path"]];
-    return [[FIRVisionImage alloc] initWithImage:image];
+    return [self filePathToVisionImage:imageData[@"path"]];
   } else if ([@"bytes" isEqualToString:imageType]) {
-    FlutterStandardTypedData *byteData = imageData[@"bytes"];
-    NSData *imageBytes = byteData.data;
+    return [self bytesToVisionImage:imageData];
+  } else {
+    NSString *errorReason = [NSString stringWithFormat:@"No image type for: %@", imageType];
+    @throw [NSException exceptionWithName:NSInvalidArgumentException
+                                   reason:errorReason
+                                 userInfo:nil];
+  }
+}
 
-    NSDictionary *metadata = imageData[@"metadata"];
-    NSArray *planeData = metadata[@"planeData"];
-    size_t planeCount = planeData.count;
+- (FIRVisionImage *)filePathToVisionImage:(NSString *)filePath {
+  UIImage *image = [UIImage imageWithContentsOfFile:filePath];
+  return [[FIRVisionImage alloc] initWithImage:image];
+}
 
-    size_t widths[planeCount];
-    size_t heights[planeCount];
-    size_t bytesPerRows[planeCount];
+- (FIRVisionImage *)bytesToVisionImage:(NSDictionary *)imageData {
+  FlutterStandardTypedData *byteData = imageData[@"bytes"];
+  NSData *imageBytes = byteData.data;
 
-    void *baseAddresses[planeCount];
-    baseAddresses[0] = (void *)imageBytes.bytes;
+  NSDictionary *metadata = imageData[@"metadata"];
+  NSArray *planeData = metadata[@"planeData"];
+  size_t planeCount = planeData.count;
 
-    size_t lastAddressIndex = 0;  // Used to get base address for each plane
-    for (int i = 0; i < planeCount; i++) {
-      NSDictionary *plane = planeData[i];
+  NSNumber *width = metadata[@"width"];
+  NSNumber *height = metadata[@"height"];
 
-      NSNumber *width = plane[@"width"];
-      NSNumber *height = plane[@"height"];
-      NSNumber *bytesPerRow = plane[@"bytesPerRow"];
+  NSNumber *rawFormat = metadata[@"rawFormat"];
+  FourCharCode format = FOUR_CHAR_CODE(rawFormat.unsignedIntValue);
 
-      widths[i] = width.unsignedLongValue;
-      heights[i] = height.unsignedLongValue;
-      bytesPerRows[i] = bytesPerRow.unsignedLongValue;
+  CVPixelBufferRef pxBuffer = NULL;
+  if (planeCount == 0) {
+    @throw [NSException exceptionWithName:NSInvalidArgumentException
+                                   reason:@"Can't create image buffer with 0 planes."
+                                 userInfo:nil];
+  } else if (planeCount == 1) {
+    NSDictionary *plane = planeData[0];
+    NSNumber *bytesPerRow = plane[@"bytesPerRow"];
+
+    pxBuffer = [self bytesToPixelBuffer:width.unsignedLongValue
+                                 height:height.unsignedLongValue
+                                 format:format
+                            baseAddress:(void *)imageBytes.bytes
+                            bytesPerRow:bytesPerRow.unsignedLongValue];
+  } else {
+    pxBuffer = [self planarBytesToPixelBuffer:width.unsignedLongValue
+                                       height:height.unsignedLongValue
+                                       format:format
+                                  baseAddress:(void *)imageBytes.bytes
+                                     dataSize:imageBytes.length
+                                   planeCount:planeCount
+                                    planeData:planeData];
+  }
 
-      if (i > 0) {
-        size_t addressIndex = lastAddressIndex + heights[i - 1] * bytesPerRows[i - 1];
-        baseAddresses[i] = (void *)imageBytes.bytes + addressIndex;
-        lastAddressIndex = addressIndex;
-      }
-    }
+  return [self pixelBufferToVisionImage:pxBuffer];
+}
 
-    NSNumber *width = metadata[@"width"];
-    NSNumber *height = metadata[@"height"];
+- (CVPixelBufferRef)bytesToPixelBuffer:(size_t)width
+                                height:(size_t)height
+                                format:(FourCharCode)format
+                           baseAddress:(void *)baseAddress
+                           bytesPerRow:(size_t)bytesPerRow {
+  CVPixelBufferRef pxBuffer = NULL;
+  CVPixelBufferCreateWithBytes(kCFAllocatorDefault, width, height, format, baseAddress, bytesPerRow,
+                               NULL, NULL, NULL, &pxBuffer);
+  return pxBuffer;
+}
 
-    NSNumber *rawFormat = metadata[@"rawFormat"];
-    FourCharCode format = FOUR_CHAR_CODE(rawFormat.unsignedIntValue);
+- (CVPixelBufferRef)planarBytesToPixelBuffer:(size_t)width
+                                      height:(size_t)height
+                                      format:(FourCharCode)format
+                                 baseAddress:(void *)baseAddress
+                                    dataSize:(size_t)dataSize
+                                  planeCount:(size_t)planeCount
+                                   planeData:(NSArray *)planeData {
+  size_t widths[planeCount];
+  size_t heights[planeCount];
+  size_t bytesPerRows[planeCount];
+
+  void *baseAddresses[planeCount];
+  baseAddresses[0] = baseAddress;
+
+  size_t lastAddressIndex = 0;  // Used to get base address for each plane
+  for (int i = 0; i < planeCount; i++) {
+    NSDictionary *plane = planeData[i];
+
+    NSNumber *width = plane[@"width"];
+    NSNumber *height = plane[@"height"];
+    NSNumber *bytesPerRow = plane[@"bytesPerRow"];
+
+    widths[i] = width.unsignedLongValue;
+    heights[i] = height.unsignedLongValue;
+    bytesPerRows[i] = bytesPerRow.unsignedLongValue;
+
+    if (i > 0) {
+      size_t addressIndex = lastAddressIndex + heights[i - 1] * bytesPerRows[i - 1];
+      baseAddresses[i] = baseAddress + addressIndex;
+      lastAddressIndex = addressIndex;
+    }
+  }
 
-    CVPixelBufferRef pxbuffer = NULL;
-    CVPixelBufferCreateWithPlanarBytes(kCFAllocatorDefault, width.unsignedLongValue,
-                                       height.unsignedLongValue, format, NULL, imageBytes.length, 2,
-                                       baseAddresses, widths, heights, bytesPerRows, NULL, NULL,
-                                       NULL, &pxbuffer);
+  CVPixelBufferRef pxBuffer = NULL;
+  CVPixelBufferCreateWithPlanarBytes(kCFAllocatorDefault, width, height, format, NULL, dataSize,
+                                     planeCount, baseAddresses, widths, heights, bytesPerRows, NULL,
+                                     NULL, NULL, &pxBuffer);
 
-    CIImage *ciImage = [CIImage imageWithCVPixelBuffer:pxbuffer];
+  return pxBuffer;
+}
 
-    CIContext *temporaryContext = [CIContext contextWithOptions:nil];
-    CGImageRef videoImage =
-        [temporaryContext createCGImage:ciImage
-                               fromRect:CGRectMake(0, 0, CVPixelBufferGetWidth(pxbuffer),
-                                                   CVPixelBufferGetHeight(pxbuffer))];
+- (FIRVisionImage *)pixelBufferToVisionImage:(CVPixelBufferRef)pixelBufferRef {
+  CIImage *ciImage = [CIImage imageWithCVPixelBuffer:pixelBufferRef];
 
-    UIImage *uiImage = [UIImage imageWithCGImage:videoImage];
-    CGImageRelease(videoImage);
-    return [[FIRVisionImage alloc] initWithImage:uiImage];
-  } else {
-    NSString *errorReason = [NSString stringWithFormat:@"No image type for: %@", imageType];
-    @throw [NSException exceptionWithName:NSInvalidArgumentException
-                                   reason:errorReason
-                                 userInfo:nil];
-  }
+  CIContext *temporaryContext = [CIContext contextWithOptions:nil];
+  CGImageRef videoImage =
+      [temporaryContext createCGImage:ciImage
+                             fromRect:CGRectMake(0, 0, CVPixelBufferGetWidth(pixelBufferRef),
+                                                 CVPixelBufferGetHeight(pixelBufferRef))];
+
+  UIImage *uiImage = [UIImage imageWithCGImage:videoImage];
+  CGImageRelease(videoImage);
+  return [[FIRVisionImage alloc] initWithImage:uiImage];
 }
 @end
diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 834472afa37a..71c68f1d8395 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -93,12 +93,12 @@ class FirebaseVisionImage {
 
   /// Construct a [FirebaseVisionImage] from a list of bytes.
   ///
-  /// Expects `android.graphics.ImageFormat.NV21` format on Android. Note:
+  /// On Android, expects `android.graphics.ImageFormat.NV21` format. Note:
   /// Concatenating the planes of `android.graphics.ImageFormat.YUV_420_888`
   /// into a single plane, converts it to `android.graphics.ImageFormat.NV21`.
   ///
-  /// Expects `kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange` or any other
-  /// planar format on iOS.
+  /// On iOS, expects `kCVPixelFormatType_32BGRA` format. However, this should
+  /// work with most formats from `kCVPixelFormatType_*`.
   factory FirebaseVisionImage.fromBytes(
     Uint8List bytes,
     FirebaseVisionImageMetadata metadata,
@@ -178,6 +178,9 @@ class FirebaseVisionImageMetadata {
             : true),
         assert(defaultTargetPlatform == TargetPlatform.iOS
             ? planeData != null
+            : true),
+        assert(defaultTargetPlatform == TargetPlatform.iOS
+            ? planeData.isNotEmpty
             : true);
 
   /// Size of the image in pixels.
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index 0e76934fc20f..212dadde40db 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_ml_vision
 description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.5.0+1
+version: 0.5.1
 
 dependencies:
   flutter:

From 9bf429df78cdc313bf79129c8a045699e3e697f3 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Thu, 14 Feb 2019 13:03:52 -0800
Subject: [PATCH 134/410] Change iOS video format back to bgra8888 (#1140)

---
 packages/camera/CHANGELOG.md               |   5 +
 packages/camera/ios/Classes/CameraPlugin.m | 164 +++++++++++----------
 packages/camera/lib/camera.dart            |   1 +
 packages/camera/lib/camera_image.dart      |  29 +++-
 packages/camera/pubspec.yaml               |   2 +-
 5 files changed, 116 insertions(+), 85 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 709dfd605264..56fcb98a641e 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.0
+
+* **Breaking Change** Change iOS image stream format to `ImageFormatGroup.bgra8888` from 
+  `ImageFormatGroup.yuv420`.
+
 ## 0.3.0+4
 
 * Fixed bug causing black screen on some Android devices.
diff --git a/packages/camera/ios/Classes/CameraPlugin.m b/packages/camera/ios/Classes/CameraPlugin.m
index d54b55e1060f..51d7836c2213 100644
--- a/packages/camera/ios/Classes/CameraPlugin.m
+++ b/packages/camera/ios/Classes/CameraPlugin.m
@@ -146,8 +146,6 @@ @interface FLTCam : NSObject <FlutterTexture,
 @property(assign, nonatomic) BOOL isRecording;
 @property(assign, nonatomic) BOOL isAudioSetup;
 @property(assign, nonatomic) BOOL isStreamingImages;
-@property(nonatomic) vImage_Buffer destinationBuffer;
-@property(nonatomic) vImage_Buffer conversionBuffer;
 @property(nonatomic) CMMotionManager *motionManager;
 - (instancetype)initWithCameraName:(NSString *)cameraName
                   resolutionPreset:(NSString *)resolutionPreset
@@ -163,9 +161,8 @@ - (void)captureToFile:(NSString *)filename result:(FlutterResult)result;
 @end
 
 @implementation FLTCam
-// Yuv420 format used for iOS 10+, which is minimum requirement for this plugin.
-// Format is used to stream image byte data to dart.
-FourCharCode const videoFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
+// Format used for video and image streaming.
+FourCharCode const videoFormat = kCVPixelFormatType_32BGRA;
 
 - (instancetype)initWithCameraName:(NSString *)cameraName
                   resolutionPreset:(NSString *)resolutionPreset
@@ -173,20 +170,7 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
   self = [super init];
   NSAssert(self, @"super init cannot be nil");
   _captureSession = [[AVCaptureSession alloc] init];
-  AVCaptureSessionPreset preset;
-  if ([resolutionPreset isEqualToString:@"high"]) {
-    preset = AVCaptureSessionPreset1280x720;
-    _previewSize = CGSizeMake(1280, 720);
-  } else if ([resolutionPreset isEqualToString:@"medium"]) {
-    preset = AVCaptureSessionPreset640x480;
-    _previewSize = CGSizeMake(640, 480);
-  } else {
-    NSAssert([resolutionPreset isEqualToString:@"low"], @"Unknown resolution preset %@",
-             resolutionPreset);
-    preset = AVCaptureSessionPreset352x288;
-    _previewSize = CGSizeMake(352, 288);
-  }
-  _captureSession.sessionPreset = preset;
+
   _captureDevice = [AVCaptureDevice deviceWithUniqueID:cameraName];
   NSError *localError = nil;
   _captureVideoInput = [AVCaptureDeviceInput deviceInputWithDevice:_captureDevice
@@ -196,11 +180,6 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
     return nil;
   }
 
-  vImageBuffer_Init(&_destinationBuffer, _previewSize.width, _previewSize.height, 32,
-                    kvImageNoFlags);
-  vImageBuffer_Init(&_conversionBuffer, _previewSize.width, _previewSize.height, 32,
-                    kvImageNoFlags);
-
   _captureVideoOutput = [AVCaptureVideoDataOutput new];
   _captureVideoOutput.videoSettings =
       @{(NSString *)kCVPixelBufferPixelFormatTypeKey : @(videoFormat)};
@@ -222,6 +201,9 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
   [_captureSession addOutput:_capturePhotoOutput];
   _motionManager = [[CMMotionManager alloc] init];
   [_motionManager startAccelerometerUpdates];
+
+  [self setCaptureSessionPreset:resolutionPreset];
+
   return self;
 }
 
@@ -244,6 +226,59 @@ - (void)captureToFile:(NSString *)path result:(FlutterResult)result {
                                                            cameraPosition:_captureDevice.position]];
 }
 
+- (void)setCaptureSessionPreset:(NSString *)resolutionPreset {
+  int presetIndex;
+  if ([resolutionPreset isEqualToString:@"high"]) {
+    presetIndex = 0;
+  } else if ([resolutionPreset isEqualToString:@"medium"]) {
+    presetIndex = 2;
+  } else {
+    NSAssert([resolutionPreset isEqualToString:@"low"], @"Unknown resolution preset %@",
+             resolutionPreset);
+    presetIndex = 3;
+  }
+
+  switch (presetIndex) {
+    case 0:
+      if ([_captureSession canSetSessionPreset:AVCaptureSessionPreset3840x2160]) {
+        _captureSession.sessionPreset = AVCaptureSessionPreset3840x2160;
+        _previewSize = CGSizeMake(3840, 2160);
+        break;
+      }
+    case 1:
+      if ([_captureSession canSetSessionPreset:AVCaptureSessionPreset1920x1080]) {
+        _captureSession.sessionPreset = AVCaptureSessionPreset1920x1080;
+        _previewSize = CGSizeMake(1920, 1080);
+        break;
+      }
+    case 2:
+      if ([_captureSession canSetSessionPreset:AVCaptureSessionPreset1280x720]) {
+        _captureSession.sessionPreset = AVCaptureSessionPreset1280x720;
+        _previewSize = CGSizeMake(1280, 720);
+        break;
+      }
+    case 3:
+      if ([_captureSession canSetSessionPreset:AVCaptureSessionPreset640x480]) {
+        _captureSession.sessionPreset = AVCaptureSessionPreset640x480;
+        _previewSize = CGSizeMake(640, 480);
+        break;
+      }
+    case 4:
+      if ([_captureSession canSetSessionPreset:AVCaptureSessionPreset352x288]) {
+        _captureSession.sessionPreset = AVCaptureSessionPreset352x288;
+        _previewSize = CGSizeMake(352, 288);
+        break;
+      }
+    default: {
+      NSException *exception = [NSException
+          exceptionWithName:@"NoAvailableCaptureSessionException"
+                     reason:@"No capture session available for current capture session."
+                   userInfo:nil];
+      @throw exception;
+    }
+  }
+}
+
 - (void)captureOutput:(AVCaptureOutput *)output
     didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
            fromConnection:(AVCaptureConnection *)connection {
@@ -278,12 +313,31 @@ - (void)captureOutput:(AVCaptureOutput *)output
 
       NSMutableArray *planes = [NSMutableArray array];
 
-      size_t planeCount = CVPixelBufferGetPlaneCount(pixelBuffer);
+      const Boolean isPlanar = CVPixelBufferIsPlanar(pixelBuffer);
+      size_t planeCount;
+      if (isPlanar) {
+        planeCount = CVPixelBufferGetPlaneCount(pixelBuffer);
+      } else {
+        planeCount = 1;
+      }
+
       for (int i = 0; i < planeCount; i++) {
-        void *planeAddress = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, i);
-        size_t bytesPerRow = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, i);
-        size_t height = CVPixelBufferGetHeightOfPlane(pixelBuffer, i);
-        size_t width = CVPixelBufferGetWidthOfPlane(pixelBuffer, i);
+        void *planeAddress;
+        size_t bytesPerRow;
+        size_t height;
+        size_t width;
+
+        if (isPlanar) {
+          planeAddress = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, i);
+          bytesPerRow = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, i);
+          height = CVPixelBufferGetHeightOfPlane(pixelBuffer, i);
+          width = CVPixelBufferGetWidthOfPlane(pixelBuffer, i);
+        } else {
+          planeAddress = CVPixelBufferGetBaseAddress(pixelBuffer);
+          bytesPerRow = CVPixelBufferGetBytesPerRow(pixelBuffer);
+          height = CVPixelBufferGetHeight(pixelBuffer);
+          width = CVPixelBufferGetWidth(pixelBuffer);
+        }
 
         NSNumber *length = @(bytesPerRow * height);
         NSData *bytes = [NSData dataWithBytes:planeAddress length:length.unsignedIntegerValue];
@@ -394,57 +448,7 @@ - (CVPixelBufferRef)copyPixelBuffer {
     pixelBuffer = _latestPixelBuffer;
   }
 
-  return [self convertYUVImageToBGRA:pixelBuffer];
-}
-
-// Since video format was changed to kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange we have to
-// convert image to a usable format for flutter textures. Which is kCVPixelFormatType_32BGRA.
-- (CVPixelBufferRef)convertYUVImageToBGRA:(CVPixelBufferRef)pixelBuffer {
-  CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
-
-  vImage_YpCbCrToARGB infoYpCbCrToARGB;
-  vImage_YpCbCrPixelRange pixelRange;
-  pixelRange.Yp_bias = 16;
-  pixelRange.CbCr_bias = 128;
-  pixelRange.YpRangeMax = 235;
-  pixelRange.CbCrRangeMax = 240;
-  pixelRange.YpMax = 235;
-  pixelRange.YpMin = 16;
-  pixelRange.CbCrMax = 240;
-  pixelRange.CbCrMin = 16;
-
-  vImageConvert_YpCbCrToARGB_GenerateConversion(kvImage_YpCbCrToARGBMatrix_ITU_R_601_4, &pixelRange,
-                                                &infoYpCbCrToARGB, kvImage420Yp8_CbCr8,
-                                                kvImageARGB8888, kvImageNoFlags);
-
-  vImage_Buffer sourceLumaBuffer;
-  sourceLumaBuffer.data = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 0);
-  sourceLumaBuffer.height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 0);
-  sourceLumaBuffer.width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 0);
-  sourceLumaBuffer.rowBytes = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);
-
-  vImage_Buffer sourceChromaBuffer;
-  sourceChromaBuffer.data = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 1);
-  sourceChromaBuffer.height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 1);
-  sourceChromaBuffer.width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 1);
-  sourceChromaBuffer.rowBytes = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 1);
-
-  vImageConvert_420Yp8_CbCr8ToARGB8888(&sourceLumaBuffer, &sourceChromaBuffer, &_destinationBuffer,
-                                       &infoYpCbCrToARGB, NULL, 255,
-                                       kvImagePrintDiagnosticsToConsole);
-
-  CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
-  CVPixelBufferRelease(pixelBuffer);
-
-  const uint8_t map[4] = {3, 2, 1, 0};
-  vImagePermuteChannels_ARGB8888(&_destinationBuffer, &_conversionBuffer, map, kvImageNoFlags);
-
-  CVPixelBufferRef newPixelBuffer = NULL;
-  CVPixelBufferCreateWithBytes(NULL, _conversionBuffer.width, _conversionBuffer.height,
-                               kCVPixelFormatType_32BGRA, _conversionBuffer.data,
-                               _conversionBuffer.rowBytes, NULL, NULL, NULL, &newPixelBuffer);
-
-  return newPixelBuffer;
+  return pixelBuffer;
 }
 
 - (FlutterError *_Nullable)onCancelWithArguments:(id _Nullable)arguments {
diff --git a/packages/camera/lib/camera.dart b/packages/camera/lib/camera.dart
index 2a484b9e1c17..cf636a199b1f 100644
--- a/packages/camera/lib/camera.dart
+++ b/packages/camera/lib/camera.dart
@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:typed_data';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 
diff --git a/packages/camera/lib/camera_image.dart b/packages/camera/lib/camera_image.dart
index 2dd665ddb400..cebc14873f52 100644
--- a/packages/camera/lib/camera_image.dart
+++ b/packages/camera/lib/camera_image.dart
@@ -38,6 +38,7 @@ class Plane {
   final int width;
 }
 
+// TODO:(bmparr) Turn [ImageFormatGroup] to a class with int values.
 /// Group of image formats that are comparable across Android and iOS platforms.
 enum ImageFormatGroup {
   /// The image format does not fit into any specific group.
@@ -55,6 +56,12 @@ enum ImageFormatGroup {
   /// On iOS, this is `kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange`. See
   /// https://developer.apple.com/documentation/corevideo/1563591-pixel_format_identifiers/kcvpixelformattype_420ypcbcr8biplanarvideorange?language=objc
   yuv420,
+
+  /// 32-bit BGRA.
+  ///
+  /// On iOS, this is `kCVPixelFormatType_32BGRA`. See
+  /// https://developer.apple.com/documentation/corevideo/1563591-pixel_format_identifiers/kcvpixelformattype_32bgra?language=objc
+  bgra8888,
 }
 
 /// Describes how pixels are represented in an image.
@@ -75,11 +82,25 @@ class ImageFormat {
 }
 
 ImageFormatGroup _asImageFormatGroup(dynamic rawFormat) {
-  if (rawFormat == 35 || rawFormat == 875704438) {
-    return ImageFormatGroup.yuv420;
-  } else {
-    return ImageFormatGroup.unknown;
+  if (defaultTargetPlatform == TargetPlatform.android) {
+    // android.graphics.ImageFormat.YUV_420_888
+    if (rawFormat == 35) {
+      return ImageFormatGroup.yuv420;
+    }
   }
+
+  if (defaultTargetPlatform == TargetPlatform.iOS) {
+    switch (rawFormat) {
+      // kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
+      case 875704438:
+        return ImageFormatGroup.yuv420;
+      // kCVPixelFormatType_32BGRA
+      case 1111970369:
+        return ImageFormatGroup.bgra8888;
+    }
+  }
+
+  return ImageFormatGroup.unknown;
 }
 
 /// A single complete image buffer from the platform camera.
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index acdaa2ff90fb..d99166f02bea 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.3.0+4
+version: 0.4.0
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From 0f14f68222e1de2b675cde08f417ac8ce3f18111 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Thu, 14 Feb 2019 13:23:35 -0800
Subject: [PATCH 135/410] Remove the method channel's reference to webview/maps
 on dispose. (#1221)

The reference from the method channel to the webview/maps instance was never cleared on Android, which leaked memory as even after disposing the platform view the view was not released.

[flutter/flutter#24145](https://github.com/flutter/flutter/issues/24145)
---
 packages/google_maps_flutter/CHANGELOG.md                     | 4 ++++
 .../io/flutter/plugins/googlemaps/GoogleMapController.java    | 1 +
 packages/google_maps_flutter/pubspec.yaml                     | 2 +-
 packages/webview_flutter/CHANGELOG.md                         | 4 ++++
 .../io/flutter/plugins/webviewflutter/FlutterWebView.java     | 4 +++-
 packages/webview_flutter/pubspec.yaml                         | 2 +-
 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 85a6d530d795..d6c1c7025c89 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0+3
+
+* Fixed a memory leak on Android - the map was not properly disposed.
+
 ## 0.2.0+2
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index 79e34bd9bd3b..5aeba443ed95 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -289,6 +289,7 @@ public void dispose() {
       return;
     }
     disposed = true;
+    methodChannel.setMethodCallHandler(null);
     mapView.onDestroy();
     registrar.activity().getApplication().unregisterActivityLifecycleCallbacks(this);
   }
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index f1ee54f78bc9..cbeedc3248ee 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.2.0+2
+version: 0.2.0+3
 
 dependencies:
   flutter:
diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 2a6c125ca662..74c8f4d340f4 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.3+1
+
+* Fixed a memory leak on Android - the WebView was not properly disposed.
+
 ## 0.3.3
 
 * Add clearCache method to WebView controller.
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index 963bde9d215e..1ff869b04c61 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -201,5 +201,7 @@ private void registerJavaScriptChannelNames(List<String> channelNames) {
   }
 
   @Override
-  public void dispose() {}
+  public void dispose() {
+    methodChannel.setMethodCallHandler(null);
+  }
 }
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index bfb43275d6af..de8600f8419a 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.3
+version: 0.3.3+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From 4ff06cd12edde5215517b10760e80caaea6ee86b Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Thu, 14 Feb 2019 15:52:18 -0800
Subject: [PATCH 136/410] [In_app_purchase]remove categories (#1222)

Part of the effort to fix [flutter/flutter#27960](https://github.com/flutter/flutter/issues/27960)
---
 .../TranslatorTest.m                          |  44 ++--
 .../ios/Classes/FIAObjectTranslator.h         |  61 ++---
 .../ios/Classes/FIAObjectTranslator.m         | 227 +++++++++---------
 .../ios/Classes/InAppPurchasePlugin.m         |   2 +-
 4 files changed, 159 insertions(+), 175 deletions(-)

diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
index 9864d335ed99..130c51784532 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
@@ -26,14 +26,14 @@ - (void)setUp {
   self.periodMap = @{@"numberOfUnits" : @(0), @"unit" : @(0)};
   self.discountMap = @{
     @"price" : @1.0,
-    @"priceLocale" : [NSLocale.systemLocale toMap],
+    @"priceLocale" : [FIAObjectTranslator getMapFromNSLocale:NSLocale.systemLocale],
     @"numberOfPeriods" : @1,
     @"subscriptionPeriod" : self.periodMap,
     @"paymentMode" : @1
   };
   self.productMap = @{
     @"price" : @1.0,
-    @"priceLocale" : [NSLocale.systemLocale toMap],
+    @"priceLocale" : [FIAObjectTranslator getMapFromNSLocale:NSLocale.systemLocale],
     @"productIdentifier" : @"123",
     @"localizedTitle" : @"title",
     @"localizedDescription" : @"des",
@@ -52,7 +52,9 @@ - (void)setUp {
     @"contentLength" : @(2),
     @"contentURL" : @"https://flutter.io",
     @"contentVersion" : [NSNull null],
-    @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+    @"error" : [FIAObjectTranslator getMapFromNSError:[NSError errorWithDomain:@"test_stub"
+                                                                          code:123
+                                                                      userInfo:@{}]],
     @"progress" : @(0.5),
     @"timeRemaining" : @(100),
     @"downloadTimeUnKnown" : @(NO),
@@ -69,7 +71,9 @@ - (void)setUp {
     @"transactionIdentifier" : @"567",
     @"transactionState" : @(SKPaymentTransactionStatePurchasing),
     @"payment" : [NSNull null],
-    @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+    @"error" : [FIAObjectTranslator getMapFromNSError:[NSError errorWithDomain:@"test_stub"
+                                                                          code:123
+                                                                      userInfo:@{}]],
     @"transactionTimeStamp" : @([NSDate date].timeIntervalSince1970),
     @"originalTransaction" : [NSNull null],
     @"downloads" : @[ @{
@@ -78,7 +82,9 @@ - (void)setUp {
       @"contentLength" : @(2),
       @"contentURL" : @"https://flutter.io",
       @"contentVersion" : [NSNull null],
-      @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+      @"error" : [FIAObjectTranslator getMapFromNSError:[NSError errorWithDomain:@"test_stub"
+                                                                            code:123
+                                                                        userInfo:@{}]],
       @"progress" : @(0.5),
       @"timeRemaining" : @(100),
       @"downloadTimeUnKnown" : @(NO),
@@ -89,7 +95,9 @@ - (void)setUp {
     @"transactionIdentifier" : @"567",
     @"transactionState" : @(SKPaymentTransactionStatePurchasing),
     @"payment" : [NSNull null],
-    @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+    @"error" : [FIAObjectTranslator getMapFromNSError:[NSError errorWithDomain:@"test_stub"
+                                                                          code:123
+                                                                      userInfo:@{}]],
     @"transactionTimeStamp" : @([NSDate date].timeIntervalSince1970),
     @"originalTransaction" : originalTransactionMap,
     @"downloads" : @[ @{
@@ -98,7 +106,9 @@ - (void)setUp {
       @"contentLength" : @(2),
       @"contentURL" : @"https://flutter.io",
       @"contentVersion" : [NSNull null],
-      @"error" : [[NSError errorWithDomain:@"test_stub" code:123 userInfo:@{}] toMap],
+      @"error" : [FIAObjectTranslator getMapFromNSError:[NSError errorWithDomain:@"test_stub"
+                                                                            code:123
+                                                                        userInfo:@{}]],
       @"progress" : @(0.5),
       @"timeRemaining" : @(100),
       @"downloadTimeUnKnown" : @(NO),
@@ -117,26 +127,26 @@ - (void)setUp {
 - (void)testSKProductSubscriptionPeriodStubToMap {
   SKProductSubscriptionPeriodStub *period =
       [[SKProductSubscriptionPeriodStub alloc] initWithMap:self.periodMap];
-  NSDictionary *map = [period toMap];
+  NSDictionary *map = [FIAObjectTranslator getMapFromSKProductSubscriptionPeriod:period];
   XCTAssertEqualObjects(map, self.periodMap);
 }
 
 - (void)testSKProductDiscountStubToMap {
   SKProductDiscountStub *discount = [[SKProductDiscountStub alloc] initWithMap:self.discountMap];
-  NSDictionary *map = [discount toMap];
+  NSDictionary *map = [FIAObjectTranslator getMapFromSKProductDiscount:discount];
   XCTAssertEqualObjects(map, self.discountMap);
 }
 
 - (void)testProductToMap {
   SKProductStub *product = [[SKProductStub alloc] initWithMap:self.productMap];
-  NSDictionary *map = [product toMap];
+  NSDictionary *map = [FIAObjectTranslator getMapFromSKProduct:product];
   XCTAssertEqualObjects(map, self.productMap);
 }
 
 - (void)testProductResponseToMap {
   SKProductsResponseStub *response =
       [[SKProductsResponseStub alloc] initWithMap:self.productResponseMap];
-  NSDictionary *map = [response toMap];
+  NSDictionary *map = [FIAObjectTranslator getMapFromSKProductsResponse:response];
   XCTAssertEqualObjects(map, self.productResponseMap);
 }
 
@@ -144,13 +154,13 @@ - (void)testDownloadToMap {
   // bug with state, downloadTimeUnKnown, transaction and contentIdentifer in KVC, cannot test these
   // fields.
   SKDownloadStub *download = [[SKDownloadStub alloc] initWithMap:self.downloadMap];
-  NSDictionary *map = [download toMap];
+  NSDictionary *map = [FIAObjectTranslator getMapFromSKDownload:download];
   XCTAssertEqualObjects(map, self.downloadMap);
 }
 
 - (void)testPaymentToMap {
-  SKMutablePayment *payment = [[SKMutablePayment alloc] initWithMap:self.paymentMap];
-  NSDictionary *map = [payment toMap];
+  SKMutablePayment *payment = [FIAObjectTranslator getSKMutablePaymentFromMap:self.paymentMap];
+  NSDictionary *map = [FIAObjectTranslator getMapFromSKPayment:payment];
   XCTAssertEqualObjects(map, self.paymentMap);
 }
 
@@ -158,19 +168,19 @@ - (void)testPaymentTransactionToMap {
   // payment is not KVC, cannot test payment field.
   SKPaymentTransactionStub *paymentTransaction =
       [[SKPaymentTransactionStub alloc] initWithMap:self.transactionMap];
-  NSDictionary *map = [paymentTransaction toMap];
+  NSDictionary *map = [FIAObjectTranslator getMapFromSKPaymentTransaction:paymentTransaction];
   XCTAssertEqualObjects(map, self.transactionMap);
 }
 
 - (void)testError {
   NSErrorStub *error = [[NSErrorStub alloc] initWithMap:self.errorMap];
-  NSDictionary *map = [error toMap];
+  NSDictionary *map = [FIAObjectTranslator getMapFromNSError:error];
   XCTAssertEqualObjects(map, self.errorMap);
 }
 
 - (void)testLocaleToMap {
   NSLocale *system = NSLocale.systemLocale;
-  NSDictionary *map = [system toMap];
+  NSDictionary *map = [FIAObjectTranslator getMapFromNSLocale:system];
   XCTAssertEqualObjects(map[@"currencySymbol"], system.currencySymbol);
 }
 
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
index ce05ad0d23e6..401cda4f13fc 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
@@ -7,64 +7,31 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SKProduct (Coder)
+@interface FIAObjectTranslator : NSObject
 
-- (nullable NSDictionary *)toMap;
++ (NSDictionary *)getMapFromSKProduct:(SKProduct *)product;
 
-@end
-
-@interface SKProductSubscriptionPeriod (Coder)
-
-- (nullable NSDictionary *)toMap;
-
-@end
-
-@interface SKProductDiscount (Coder)
-
-- (nullable NSDictionary *)toMap;
++ (NSDictionary *)getMapFromSKProductSubscriptionPeriod:(SKProductSubscriptionPeriod *)period
+    API_AVAILABLE(ios(11.2));
 
-@end
-
-@interface SKProductsResponse (Coder)
++ (NSDictionary *)getMapFromSKProductDiscount:(SKProductDiscount *)discount
+    API_AVAILABLE(ios(11.2));
 
-- (nullable NSDictionary *)toMap;
-
-@end
++ (NSDictionary *)getMapFromSKProductsResponse:(SKProductsResponse *)productResponse;
 
-@interface SKPayment (Coder)
-
-- (NSDictionary *)toMap;
-
-@end
++ (NSDictionary *)getMapFromSKPayment:(SKPayment *)payment;
 
-@interface SKMutablePayment (Coder)
++ (NSDictionary *)getMapFromNSLocale:(NSLocale *)locale;
 
-- (instancetype)initWithMap:(NSDictionary *)map;
++ (SKMutablePayment *)getSKMutablePaymentFromMap:(NSDictionary *)map;
 
-@end
-
-@interface SKPaymentTransaction (Coder)
-
-- (NSDictionary *)toMap;
-
-@end
-
-@interface SKDownload (Coder)
-
-- (NSDictionary *)toMap;
-
-@end
-
-@interface NSError (Coder)
-
-- (NSDictionary *)toMap;
-
-@end
++ (NSDictionary *)getMapFromSKPaymentTransaction:(SKPaymentTransaction *)transaction;
 
-@interface NSLocale (Coder)
++ (NSDictionary *)getMapFromSKDownload:(SKDownload *)download;
 
-- (nullable NSDictionary *)toMap;
++ (NSDictionary *)getMapFromNSError:(NSError *)error;
 
 @end
+;
 
 NS_ASSUME_NONNULL_END
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
index d142c7bc7902..e2d10e015385 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
@@ -6,181 +6,188 @@
 
 #pragma mark - SKProduct Coders
 
-@implementation SKProduct (Coder)
+@implementation FIAObjectTranslator
 
-- (NSDictionary *)toMap {
++ (NSDictionary *)getMapFromSKProduct:(SKProduct *)product {
+  if (!product) {
+    return nil;
+  }
   NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
-    @"localizedDescription" : self.localizedDescription ?: [NSNull null],
-    @"localizedTitle" : self.localizedTitle ?: [NSNull null],
-    @"productIdentifier" : self.productIdentifier ?: [NSNull null],
-    @"downloadable" : @(self.downloadable),
-    @"price" : self.price ?: [NSNull null],
-    @"downloadContentLengths" : self.downloadContentLengths ?: [NSNull null],
-    @"downloadContentVersion" : self.downloadContentVersion ?: [NSNull null]
+    @"localizedDescription" : product.localizedDescription ?: [NSNull null],
+    @"localizedTitle" : product.localizedTitle ?: [NSNull null],
+    @"productIdentifier" : product.productIdentifier ?: [NSNull null],
+    @"downloadable" : @(product.downloadable),
+    @"price" : product.price ?: [NSNull null],
+    @"downloadContentLengths" : product.downloadContentLengths ?: [NSNull null],
+    @"downloadContentVersion" : product.downloadContentVersion ?: [NSNull null]
 
   }];
   // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this
   // expanded to a map. Matching android to only get the currencySymbol for now.
   // https://github.com/flutter/flutter/issues/26610
-  [map setObject:[self.priceLocale toMap] ?: [NSNull null] forKey:@"priceLocale"];
+  [map setObject:[FIAObjectTranslator getMapFromNSLocale:product.priceLocale] ?: [NSNull null]
+          forKey:@"priceLocale"];
   if (@available(iOS 11.2, *)) {
-    [map setObject:[self.subscriptionPeriod toMap] ?: [NSNull null] forKey:@"subscriptionPeriod"];
+    [map setObject:[FIAObjectTranslator
+                       getMapFromSKProductSubscriptionPeriod:product.subscriptionPeriod]
+                       ?: [NSNull null]
+            forKey:@"subscriptionPeriod"];
   }
   if (@available(iOS 11.2, *)) {
-    [map setObject:[self.introductoryPrice toMap] ?: [NSNull null] forKey:@"introductoryPrice"];
+    [map setObject:[FIAObjectTranslator getMapFromSKProductDiscount:product.introductoryPrice]
+                       ?: [NSNull null]
+            forKey:@"introductoryPrice"];
   }
   if (@available(iOS 12.0, *)) {
-    [map setObject:self.subscriptionGroupIdentifier ?: [NSNull null]
+    [map setObject:product.subscriptionGroupIdentifier ?: [NSNull null]
             forKey:@"subscriptionGroupIdentifier"];
   }
   return map;
 }
 
-@end
-
-@implementation SKProductSubscriptionPeriod (Coder)
-
-- (NSDictionary *)toMap {
-  return @{@"numberOfUnits" : @(self.numberOfUnits), @"unit" : @(self.unit)};
++ (NSDictionary *)getMapFromSKProductSubscriptionPeriod:(SKProductSubscriptionPeriod *)period {
+  if (!period) {
+    return nil;
+  }
+  return @{@"numberOfUnits" : @(period.numberOfUnits), @"unit" : @(period.unit)};
 }
 
-@end
-
-@implementation SKProductDiscount (Coder)
-
-- (NSDictionary *)toMap {
++ (NSDictionary *)getMapFromSKProductDiscount:(SKProductDiscount *)discount {
+  if (!discount) {
+    return nil;
+  }
   NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
-    @"price" : self.price ?: [NSNull null],
-    @"numberOfPeriods" : @(self.numberOfPeriods),
-    @"subscriptionPeriod" : [self.subscriptionPeriod toMap] ?: [NSNull null],
-    @"paymentMode" : @(self.paymentMode)
+    @"price" : discount.price ?: [NSNull null],
+    @"numberOfPeriods" : @(discount.numberOfPeriods),
+    @"subscriptionPeriod" :
+            [FIAObjectTranslator getMapFromSKProductSubscriptionPeriod:discount.subscriptionPeriod]
+        ?: [NSNull null],
+    @"paymentMode" : @(discount.paymentMode)
   }];
 
   // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this
   // expanded to a map. Matching android to only get the currencySymbol for now.
   // https://github.com/flutter/flutter/issues/26610
-  [map setObject:[self.priceLocale toMap] ?: [NSNull null] forKey:@"priceLocale"];
+  [map setObject:[FIAObjectTranslator getMapFromNSLocale:discount.priceLocale] ?: [NSNull null]
+          forKey:@"priceLocale"];
   return map;
 }
 
-@end
-
-@implementation SKProductsResponse (Coder)
-
-- (NSDictionary *)toMap {
++ (NSDictionary *)getMapFromSKProductsResponse:(SKProductsResponse *)productResponse {
+  if (!productResponse) {
+    return nil;
+  }
   NSMutableArray *productsMapArray = [NSMutableArray new];
-  for (SKProduct *product in self.products) {
-    [productsMapArray addObject:[product toMap]];
+  for (SKProduct *product in productResponse.products) {
+    [productsMapArray addObject:[FIAObjectTranslator getMapFromSKProduct:product]];
   }
   return @{
     @"products" : productsMapArray,
-    @"invalidProductIdentifiers" : self.invalidProductIdentifiers ?: @[]
+    @"invalidProductIdentifiers" : productResponse.invalidProductIdentifiers ?: @[]
   };
 }
 
-@end
-
-@implementation SKPayment (Coder)
-
-- (NSDictionary *)toMap {
++ (NSDictionary *)getMapFromSKPayment:(SKPayment *)payment {
+  if (!payment) {
+    return nil;
+  }
   NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
-    @"productIdentifier" : self.productIdentifier ?: [NSNull null],
-    @"requestData" : self.requestData ? [[NSString alloc] initWithData:self.requestData
-                                                              encoding:NSUTF8StringEncoding]
-                                      : [NSNull null],
-    @"quantity" : @(self.quantity),
-    @"applicationUsername" : self.applicationUsername ?: [NSNull null]
+    @"productIdentifier" : payment.productIdentifier ?: [NSNull null],
+    @"requestData" : payment.requestData ? [[NSString alloc] initWithData:payment.requestData
+                                                                 encoding:NSUTF8StringEncoding]
+                                         : [NSNull null],
+    @"quantity" : @(payment.quantity),
+    @"applicationUsername" : payment.applicationUsername ?: [NSNull null]
   }];
   if (@available(iOS 8.3, *)) {
-    [map setObject:@(self.simulatesAskToBuyInSandbox) forKey:@"simulatesAskToBuyInSandbox"];
+    [map setObject:@(payment.simulatesAskToBuyInSandbox) forKey:@"simulatesAskToBuyInSandbox"];
   }
   return map;
 }
 
-@end
-
-@implementation NSLocale (Coder)
-
-- (nullable NSDictionary *)toMap {
++ (NSDictionary *)getMapFromNSLocale:(NSLocale *)locale {
+  if (!locale) {
+    return nil;
+  }
   NSMutableDictionary *map = [[NSMutableDictionary alloc] init];
-  [map setObject:[self objectForKey:NSLocaleCurrencySymbol] ?: [NSNull null]
+  [map setObject:[locale objectForKey:NSLocaleCurrencySymbol] ?: [NSNull null]
           forKey:@"currencySymbol"];
   return map;
 }
 
-@end
-
-@implementation SKMutablePayment (Coder)
-
-- (instancetype)initWithMap:(NSDictionary *)map {
-  self = [self init];
-  if (self) {
-    self.productIdentifier = map[@"productIdentifier"];
-    NSString *utf8String = map[@"requestData"];
-    self.requestData = [utf8String dataUsingEncoding:NSUTF8StringEncoding];
-    self.quantity = [map[@"quantity"] integerValue];
-    self.applicationUsername = map[@"applicationUsername"];
-    if (@available(iOS 8.3, *)) {
-      self.simulatesAskToBuyInSandbox = [map[@"simulatesAskToBuyInSandbox"] boolValue];
-    }
-  }
-  return self;
++ (SKMutablePayment *)getSKMutablePaymentFromMap:(NSDictionary *)map {
+  if (!map) {
+    return nil;
+  }
+  SKMutablePayment *payment = [[SKMutablePayment alloc] init];
+  payment.productIdentifier = map[@"productIdentifier"];
+  NSString *utf8String = map[@"requestData"];
+  payment.requestData = [utf8String dataUsingEncoding:NSUTF8StringEncoding];
+  payment.quantity = [map[@"quantity"] integerValue];
+  payment.applicationUsername = map[@"applicationUsername"];
+  if (@available(iOS 8.3, *)) {
+    payment.simulatesAskToBuyInSandbox = [map[@"simulatesAskToBuyInSandbox"] boolValue];
+  }
+  return payment;
 }
 
-@end
-
-@implementation SKPaymentTransaction (Coder)
-
-- (NSDictionary *)toMap {
++ (NSDictionary *)getMapFromSKPaymentTransaction:(SKPaymentTransaction *)transaction {
+  if (!transaction) {
+    return nil;
+  }
   NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
-    @"error" : [self.error toMap] ?: [NSNull null],
-    @"payment" : self.payment ? [self.payment toMap] : [NSNull null],
-    @"originalTransaction" : self.originalTransaction ? [self.originalTransaction toMap]
-                                                      : [NSNull null],
-    @"transactionTimeStamp" : self.transactionDate ? @(self.transactionDate.timeIntervalSince1970)
-                                                   : [NSNull null],
-    @"transactionIdentifier" : self.transactionIdentifier ?: [NSNull null],
-    @"transactionState" : @(self.transactionState)
+    @"error" : [FIAObjectTranslator getMapFromNSError:transaction.error] ?: [NSNull null],
+    @"payment" : transaction.payment ? [FIAObjectTranslator getMapFromSKPayment:transaction.payment]
+                                     : [NSNull null],
+    @"originalTransaction" : transaction.originalTransaction
+        ? [FIAObjectTranslator getMapFromSKPaymentTransaction:transaction.originalTransaction]
+        : [NSNull null],
+    @"transactionTimeStamp" : transaction.transactionDate
+        ? @(transaction.transactionDate.timeIntervalSince1970)
+        : [NSNull null],
+    @"transactionIdentifier" : transaction.transactionIdentifier ?: [NSNull null],
+    @"transactionState" : @(transaction.transactionState)
   }];
   NSMutableArray *downloads = [NSMutableArray new];
-  for (SKDownload *download in self.downloads) {
-    [downloads addObject:[download toMap]];
+  for (SKDownload *download in transaction.downloads) {
+    [downloads addObject:[FIAObjectTranslator getMapFromSKDownload:download]];
   }
   [map setObject:downloads forKey:@"downloads"];
   return map;
 }
 
-@end
-
-@implementation SKDownload (Coder)
-
-- (NSDictionary *)toMap {
++ (NSDictionary *)getMapFromSKDownload:(SKDownload *)download {
+  if (!download) {
+    return nil;
+  }
   NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
-    @"contentLength" : @(self.contentLength),
-    @"contentIdentifier" : self.contentIdentifier ?: [NSNull null],
-    @"contentURL" : self.contentURL.absoluteString ?: [NSNull null],
-    @"contentVersion" : self.contentVersion ?: [NSNull null],
-    @"error" : [self.error toMap] ?: @{},
-    @"progress" : @(self.progress),
-    @"timeRemaining" : @(self.timeRemaining),
-    @"downloadTimeUnKnown" : @(self.timeRemaining == SKDownloadTimeRemainingUnknown),
-    @"transactionID" : self.transaction.transactionIdentifier ?: [NSNull null]
+    @"contentLength" : @(download.contentLength),
+    @"contentIdentifier" : download.contentIdentifier ?: [NSNull null],
+    @"contentURL" : download.contentURL.absoluteString ?: [NSNull null],
+    @"contentVersion" : download.contentVersion ?: [NSNull null],
+    @"error" : [FIAObjectTranslator getMapFromNSError:download.error] ?: @{},
+    @"progress" : @(download.progress),
+    @"timeRemaining" : @(download.timeRemaining),
+    @"downloadTimeUnKnown" : @(download.timeRemaining == SKDownloadTimeRemainingUnknown),
+    @"transactionID" : download.transaction.transactionIdentifier ?: [NSNull null]
   }];
   if (@available(iOS 12.0, *)) {
-    [map setObject:@(self.state) forKey:@"state"];
+    [map setObject:@(download.state) forKey:@"state"];
   } else {
-    [map setObject:@(self.downloadState) forKey:@"state"];
+    [map setObject:@(download.downloadState) forKey:@"state"];
   }
   return map;
 }
 
-@end
-
-@implementation NSError (Coder)
-
-- (NSDictionary *)toMap {
-  return
-      @{@"code" : @(self.code), @"domain" : self.domain ?: @"", @"userInfo" : self.userInfo ?: @{}};
++ (NSDictionary *)getMapFromNSError:(NSError *)error {
+  if (!error) {
+    return nil;
+  }
+  return @{
+    @"code" : @(error.code),
+    @"domain" : error.domain ?: @"",
+    @"userInfo" : error.userInfo ?: @{}
+  };
 }
 
 @end
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
index 76ab8c557319..efd85b031947 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
@@ -70,7 +70,7 @@ - (void)handleProductRequestMethodCall:(FlutterMethodCall *)call result:(Flutter
                                  details:call.arguments]);
       return;
     }
-    result([response toMap]);
+    result([FIAObjectTranslator getMapFromSKProductsResponse:response]);
     [weakSelf.requestHandlers removeObject:handler];
   }];
 }

From 36c56ee98e68c24563815482acc411b8a6872624 Mon Sep 17 00:00:00 2001
From: Tim Traversy <timtrav@gmail.com>
Date: Fri, 15 Feb 2019 11:23:46 -0500
Subject: [PATCH 137/410] closeWebView fixes for url_launcher (#997)

---
 packages/url_launcher/CHANGELOG.md                    | 3 +++
 packages/url_launcher/ios/Classes/UrlLauncherPlugin.m | 9 ++++++---
 packages/url_launcher/pubspec.yaml                    | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/url_launcher/CHANGELOG.md b/packages/url_launcher/CHANGELOG.md
index f771f875010a..7f4e90c0fc9a 100644
--- a/packages/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 5.0.2
+* Fixes `closeWebView` failure on iOS.
+
 ## 5.0.1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m b/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
index ecd2f15f1a56..2136df1bf784 100644
--- a/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
+++ b/packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
@@ -12,6 +12,7 @@ @interface FLTUrlLaunchSession : NSObject <SFSafariViewControllerDelegate>
 @property(copy, nonatomic) FlutterResult flutterResult;
 @property(strong, nonatomic) NSURL *url;
 @property(strong, nonatomic) SFSafariViewController *safari;
+@property(nonatomic, copy) void (^didFinish)(void);
 
 @end
 
@@ -44,6 +45,7 @@ - (void)safariViewController:(SFSafariViewController *)controller
 
 - (void)safariViewControllerDidFinish:(SFSafariViewController *)controller API_AVAILABLE(ios(9.0)) {
   [controller dismissViewControllerAnimated:YES completion:nil];
+  self.didFinish();
 }
 
 - (void)close {
@@ -145,11 +147,12 @@ - (void)launchURLInVC:(NSString *)urlString result:(FlutterResult)result API_AVA
   NSURL *url = [NSURL URLWithString:urlString];
   self.currentSession = [[FLTUrlLaunchSession alloc] initWithUrl:url withFlutterResult:result];
   __weak typeof(self) weakSelf = self;
+  self.currentSession.didFinish = ^(void) {
+    weakSelf.currentSession = nil;
+  };
   [self.viewController presentViewController:self.currentSession.safari
                                     animated:YES
-                                  completion:^void() {
-                                    weakSelf.currentSession = nil;
-                                  }];
+                                  completion:nil];
 }
 
 - (void)closeWebViewWithResult:(FlutterResult)result API_AVAILABLE(ios(9.0)) {
diff --git a/packages/url_launcher/pubspec.yaml b/packages/url_launcher/pubspec.yaml
index 7b476e3a6037..6845650be0a7 100644
--- a/packages/url_launcher/pubspec.yaml
+++ b/packages/url_launcher/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher
-version: 5.0.1
+version: 5.0.2
 
 flutter:
   plugin:

From b40a4acf4860860b34611055147fe87f7dc9e7eb Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Fri, 15 Feb 2019 14:42:13 -0800
Subject: [PATCH 138/410] [IAP] Add Java call for launchBillingFlow (#1230)

The call requires passing in a fully constructed `SkuDetail`. We could
fetch it again at runtime here, but for now I'm opting for caching
fetched SkuDetails and requiring them to be fetched before this call
instead to mirror how the iOS side is working.

flutter/flutter#26327
flutter/flutter#26329
flutter/flutter#26328
---
 packages/in_app_purchase/android/build.gradle |   2 +-
 .../inapppurchase/InAppPurchasePlugin.java    |  73 +++++++-
 .../InAppPurchasePluginTest.java              | 174 +++++++++++++++---
 .../sku_details_wrapper.g.dart                |  37 +---
 4 files changed, 213 insertions(+), 73 deletions(-)

diff --git a/packages/in_app_purchase/android/build.gradle b/packages/in_app_purchase/android/build.gradle
index 2f6ec7d92222..ce9afcdfc376 100644
--- a/packages/in_app_purchase/android/build.gradle
+++ b/packages/in_app_purchase/android/build.gradle
@@ -35,7 +35,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
index 38479f50b751..89a42d6d2b73 100644
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
@@ -6,11 +6,13 @@
 
 import static io.flutter.plugins.inapppurchase.Translator.fromSkuDetailsList;
 
+import android.app.Activity;
 import android.content.Context;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClientStateListener;
+import com.android.billingclient.api.BillingFlowParams;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.PurchasesUpdatedListener;
 import com.android.billingclient.api.SkuDetails;
@@ -29,47 +31,72 @@
 /** Wraps a {@link BillingClient} instance and responds to Dart calls for it. */
 public class InAppPurchasePlugin implements MethodCallHandler {
   private @Nullable BillingClient billingClient;
+  private final Activity activity;
   private final Context context;
   private final MethodChannel channel;
 
+  @VisibleForTesting
+  static final class MethodNames {
+    static final String IS_READY = "BillingClient#isReady()";
+    static final String START_CONNECTION =
+        "BillingClient#startConnection(BillingClientStateListener)";
+    static final String END_CONNECTION = "BillingClient#endConnection()";
+    static final String ON_DISCONNECT = "BillingClientStateListener#onBillingServiceDisconnected()";
+    static final String QUERY_SKU_DETAILS =
+        "BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)";
+    static final String LAUNCH_BILLING_FLOW =
+        "BillingClient#launchBillingFlow(Activity, BillingFlowParams)";
+
+    private MethodNames() {};
+  }
+
+  private HashMap<String, SkuDetails> cachedSkus = new HashMap<>();
+
   /** Plugin registration. */
   public static void registerWith(Registrar registrar) {
     final MethodChannel channel =
         new MethodChannel(registrar.messenger(), "plugins.flutter.io/in_app_purchase");
-    channel.setMethodCallHandler(new InAppPurchasePlugin(registrar.context(), channel));
+    channel.setMethodCallHandler(
+        new InAppPurchasePlugin(registrar.context(), registrar.activity(), channel));
   }
 
-  public InAppPurchasePlugin(Context context, MethodChannel channel) {
+  public InAppPurchasePlugin(Context context, Activity activity, MethodChannel channel) {
     this.context = context;
+    this.activity = activity;
     this.channel = channel;
   }
 
   @Override
   public void onMethodCall(MethodCall call, Result result) {
     switch (call.method) {
-      case "BillingClient#isReady()":
+      case MethodNames.IS_READY:
         isReady(result);
         break;
-      case "BillingClient#startConnection(BillingClientStateListener)":
+      case MethodNames.START_CONNECTION:
         startConnection((int) call.argument("handle"), result);
         break;
-      case "BillingClient#endConnection()":
+      case MethodNames.END_CONNECTION:
         endConnection(result);
         break;
-      case "BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)":
+      case MethodNames.QUERY_SKU_DETAILS:
         querySkuDetailsAsync(
             (String) call.argument("skuType"), (List<String>) call.argument("skusList"), result);
         break;
+      case MethodNames.LAUNCH_BILLING_FLOW:
+        launchBillingFlow(
+            (String) call.argument("sku"), (String) call.argument("accountId"), result);
+        break;
       default:
         result.notImplemented();
     }
   }
 
   @VisibleForTesting
-  /*package*/ InAppPurchasePlugin(BillingClient billingClient, MethodChannel channel) {
+  /*package*/ InAppPurchasePlugin(@Nullable BillingClient billingClient, MethodChannel channel) {
     this.billingClient = billingClient;
     this.channel = channel;
     this.context = null;
+    this.activity = null;
   }
 
   private void startConnection(final int handle, final Result result) {
@@ -89,8 +116,7 @@ public void onBillingSetupFinished(int responseCode) {
           public void onBillingServiceDisconnected() {
             final Map<String, Object> arguments = new HashMap<>();
             arguments.put("handle", handle);
-            channel.invokeMethod(
-                "BillingClientStateListener#onBillingServiceDisconnected()", arguments);
+            channel.invokeMethod(MethodNames.ON_DISCONNECT, arguments);
           }
         });
   }
@@ -124,6 +150,7 @@ private void querySkuDetailsAsync(
         new SkuDetailsResponseListener() {
           public void onSkuDetailsResponse(
               int responseCode, @Nullable List<SkuDetails> skuDetailsList) {
+            updateCachedSkus(skuDetailsList);
             final Map<String, Object> skuDetailsResponse = new HashMap<>();
             skuDetailsResponse.put("responseCode", responseCode);
             skuDetailsResponse.put("skuDetailsList", fromSkuDetailsList(skuDetailsList));
@@ -132,6 +159,34 @@ public void onSkuDetailsResponse(
         });
   }
 
+  private void launchBillingFlow(String sku, @Nullable String accountId, Result result) {
+    if (billingClientError(result)) {
+      return;
+    }
+
+    SkuDetails skuDetails = cachedSkus.get(sku);
+    if (skuDetails == null) {
+      result.error(
+          "NOT_FOUND",
+          "Details for sku " + sku + " are not available. Has this ID already been fetched?",
+          null);
+      return;
+    }
+
+    BillingFlowParams.Builder paramsBuilder =
+        BillingFlowParams.newBuilder().setSkuDetails(skuDetails);
+    if (accountId != null && !accountId.isEmpty()) {
+      paramsBuilder.setAccountId(accountId);
+    }
+    result.success(billingClient.launchBillingFlow(activity, paramsBuilder.build()));
+  }
+
+  private void updateCachedSkus(List<SkuDetails> skuDetailsList) {
+    for (SkuDetails skuDetails : skuDetailsList) {
+      cachedSkus.put(skuDetails.getSku(), skuDetails);
+    }
+  }
+
   private boolean billingClientError(Result result) {
     if (billingClient != null) {
       return false;
diff --git a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
index e35f0ad45a4d..5a4b84cccd3c 100644
--- a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
+++ b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
@@ -1,7 +1,17 @@
 package io.flutter.plugins.inapppurchase;
 
+import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.END_CONNECTION;
+import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.IS_READY;
+import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.LAUNCH_BILLING_FLOW;
+import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.ON_DISCONNECT;
+import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.QUERY_SKU_DETAILS;
+import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.START_CONNECTION;
 import static io.flutter.plugins.inapppurchase.Translator.fromSkuDetailsList;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.contains;
 import static org.mockito.Mockito.doNothing;
@@ -13,14 +23,16 @@
 
 import androidx.annotation.Nullable;
 import com.android.billingclient.api.BillingClient;
+import com.android.billingclient.api.BillingClient.BillingResponse;
+import com.android.billingclient.api.BillingClient.SkuType;
 import com.android.billingclient.api.BillingClientStateListener;
+import com.android.billingclient.api.BillingFlowParams;
 import com.android.billingclient.api.SkuDetails;
 import com.android.billingclient.api.SkuDetailsParams;
 import com.android.billingclient.api.SkuDetailsResponseListener;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.Result;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,7 +64,7 @@ public void invalidMethod() {
 
   @Test
   public void isReady_true() {
-    MethodCall call = new MethodCall("BillingClient#isReady()", null);
+    MethodCall call = new MethodCall(IS_READY, null);
     when(mockBillingClient.isReady()).thenReturn(true);
     plugin.onMethodCall(call, result);
     verify(result).success(true);
@@ -60,7 +72,7 @@ public void isReady_true() {
 
   @Test
   public void isReady_false() {
-    MethodCall call = new MethodCall("BillingClient#isReady()", null);
+    MethodCall call = new MethodCall(IS_READY, null);
     when(mockBillingClient.isReady()).thenReturn(false);
     plugin.onMethodCall(call, result);
     verify(result).success(false);
@@ -68,9 +80,9 @@ public void isReady_false() {
 
   @Test
   public void isReady_clientDisconnected() {
-    MethodCall disconnectCall = new MethodCall("BillingClient#endConnection()", null);
+    MethodCall disconnectCall = new MethodCall(END_CONNECTION, null);
     plugin.onMethodCall(disconnectCall, mock(Result.class));
-    MethodCall isReadyCall = new MethodCall("BillingClient#isReady()", null);
+    MethodCall isReadyCall = new MethodCall(IS_READY, null);
 
     plugin.onMethodCall(isReadyCall, result);
 
@@ -82,8 +94,7 @@ public void isReady_clientDisconnected() {
   public void startConnection() {
     Map<String, Integer> arguments = new HashMap<>();
     arguments.put("handle", 1);
-    MethodCall call =
-        new MethodCall("BillingClient#startConnection(BillingClientStateListener)", arguments);
+    MethodCall call = new MethodCall(START_CONNECTION, arguments);
     ArgumentCaptor<BillingClientStateListener> captor =
         ArgumentCaptor.forClass(BillingClientStateListener.class);
     doNothing().when(mockBillingClient).startConnection(captor.capture());
@@ -101,8 +112,7 @@ public void endConnection() {
     final int disconnectCallbackHandle = 22;
     Map<String, Integer> arguments = new HashMap<>();
     arguments.put("handle", disconnectCallbackHandle);
-    MethodCall connectCall =
-        new MethodCall("BillingClient#startConnection(BillingClientStateListener)", arguments);
+    MethodCall connectCall = new MethodCall(START_CONNECTION, arguments);
     ArgumentCaptor<BillingClientStateListener> captor =
         ArgumentCaptor.forClass(BillingClientStateListener.class);
     doNothing().when(mockBillingClient).startConnection(captor.capture());
@@ -110,7 +120,7 @@ public void endConnection() {
     final BillingClientStateListener stateListener = captor.getValue();
 
     // Disconnect the connected client
-    MethodCall disconnectCall = new MethodCall("BillingClient#endConnection()", null);
+    MethodCall disconnectCall = new MethodCall(END_CONNECTION, null);
     plugin.onMethodCall(disconnectCall, result);
 
     // Verify that the client is disconnected and that the OnDisconnect callback has been triggered
@@ -119,9 +129,7 @@ public void endConnection() {
     stateListener.onBillingServiceDisconnected();
     Map<String, Integer> expectedInvocation = new HashMap<>();
     expectedInvocation.put("handle", disconnectCallbackHandle);
-    verify(mockMethodChannel, times(1))
-        .invokeMethod(
-            "BillingClientStateListener#onBillingServiceDisconnected()", expectedInvocation);
+    verify(mockMethodChannel, times(1)).invokeMethod(ON_DISCONNECT, expectedInvocation);
   }
 
   @Test
@@ -129,14 +137,11 @@ public void querySkuDetailsAsync() {
     // Connect a billing client and set up the SKU query listeners
     establishConnectedBillingClient(/*arguments=*/ null, /*result=*/ null);
     String skuType = BillingClient.SkuType.INAPP;
-    List<String> skusList = Arrays.asList("id1", "id2");
+    List<String> skusList = asList("id1", "id2");
     HashMap<String, Object> arguments = new HashMap<>();
     arguments.put("skuType", skuType);
     arguments.put("skusList", skusList);
-    MethodCall queryCall =
-        new MethodCall(
-            "BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)",
-            arguments);
+    MethodCall queryCall = new MethodCall(QUERY_SKU_DETAILS, arguments);
 
     // Query for SKU details
     plugin.onMethodCall(queryCall, result);
@@ -151,7 +156,7 @@ public void querySkuDetailsAsync() {
 
     // Assert that we handed result BillingClient's response
     int responseCode = 200;
-    List<SkuDetails> skuDetailsResponse = Arrays.asList(buildSkuDetails());
+    List<SkuDetails> skuDetailsResponse = asList(buildSkuDetails("foo"));
     listenerCaptor.getValue().onSkuDetailsResponse(responseCode, skuDetailsResponse);
     ArgumentCaptor<HashMap<String, Object>> resultCaptor = ArgumentCaptor.forClass(HashMap.class);
     verify(result).success(resultCaptor.capture());
@@ -163,17 +168,14 @@ public void querySkuDetailsAsync() {
   @Test
   public void querySkuDetailsAsync_clientDisconnected() {
     // Disconnect the Billing client and prepare a querySkuDetails call
-    MethodCall disconnectCall = new MethodCall("BillingClient#endConnection()", null);
+    MethodCall disconnectCall = new MethodCall(END_CONNECTION, null);
     plugin.onMethodCall(disconnectCall, mock(Result.class));
     String skuType = BillingClient.SkuType.INAPP;
-    List<String> skusList = Arrays.asList("id1", "id2");
+    List<String> skusList = asList("id1", "id2");
     HashMap<String, Object> arguments = new HashMap<>();
     arguments.put("skuType", skuType);
     arguments.put("skusList", skusList);
-    MethodCall queryCall =
-        new MethodCall(
-            "BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)",
-            arguments);
+    MethodCall queryCall = new MethodCall(QUERY_SKU_DETAILS, arguments);
 
     // Query for SKU details
     plugin.onMethodCall(queryCall, result);
@@ -183,6 +185,100 @@ public void querySkuDetailsAsync_clientDisconnected() {
     verify(result, never()).success(any());
   }
 
+  @Test
+  public void launchBillingFlow_ok_nullAccountId() {
+    // Fetch the sku details first and then prepare the launch billing flow call
+    String skuId = "foo";
+    queryForSkus(singletonList(skuId));
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("sku", skuId);
+    arguments.put("accountId", null);
+    MethodCall launchCall = new MethodCall(LAUNCH_BILLING_FLOW, arguments);
+
+    // Launch the billing flow
+    int responseCode = BillingResponse.OK;
+    when(mockBillingClient.launchBillingFlow(any(), any())).thenReturn(responseCode);
+    plugin.onMethodCall(launchCall, result);
+
+    // Verify we pass the arguments to the billing flow
+    ArgumentCaptor<BillingFlowParams> billingFlowParamsCaptor =
+        ArgumentCaptor.forClass(BillingFlowParams.class);
+    verify(mockBillingClient).launchBillingFlow(any(), billingFlowParamsCaptor.capture());
+    BillingFlowParams params = billingFlowParamsCaptor.getValue();
+    assertEquals(params.getSku(), skuId);
+    assertNull(params.getAccountId());
+
+    // Verify we pass the response code to result
+    verify(result, never()).error(any(), any(), any());
+    verify(result, times(1)).success(responseCode);
+  }
+
+  @Test
+  public void launchBillingFlow_ok_AccountId() {
+    // Fetch the sku details first and query the method call
+    String skuId = "foo";
+    String accountId = "account";
+    queryForSkus(singletonList(skuId));
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("sku", skuId);
+    arguments.put("accountId", accountId);
+    MethodCall launchCall = new MethodCall(LAUNCH_BILLING_FLOW, arguments);
+
+    // Launch the billing flow
+    int responseCode = BillingResponse.OK;
+    when(mockBillingClient.launchBillingFlow(any(), any())).thenReturn(responseCode);
+    plugin.onMethodCall(launchCall, result);
+
+    // Verify we pass the arguments to the billing flow
+    ArgumentCaptor<BillingFlowParams> billingFlowParamsCaptor =
+        ArgumentCaptor.forClass(BillingFlowParams.class);
+    verify(mockBillingClient).launchBillingFlow(any(), billingFlowParamsCaptor.capture());
+    BillingFlowParams params = billingFlowParamsCaptor.getValue();
+    assertEquals(params.getSku(), skuId);
+    assertEquals(params.getAccountId(), accountId);
+
+    // Verify we pass the response code to result
+    verify(result, never()).error(any(), any(), any());
+    verify(result, times(1)).success(responseCode);
+  }
+
+  @Test
+  public void launchBillingFlow_clientDisconnected() {
+    // Prepare the launch call after disconnecting the client
+    MethodCall disconnectCall = new MethodCall(END_CONNECTION, null);
+    plugin.onMethodCall(disconnectCall, mock(Result.class));
+    String skuId = "foo";
+    String accountId = "account";
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("sku", skuId);
+    arguments.put("accountId", accountId);
+    MethodCall launchCall = new MethodCall(LAUNCH_BILLING_FLOW, arguments);
+
+    plugin.onMethodCall(launchCall, result);
+
+    // Assert that we sent an error back.
+    verify(result).error(contains("UNAVAILABLE"), contains("BillingClient"), any());
+    verify(result, never()).success(any());
+  }
+
+  @Test
+  public void launchBillingFlow_skuNotFound() {
+    // Try to launch the billing flow for a random sku ID
+    establishConnectedBillingClient(null, null);
+    String skuId = "foo";
+    String accountId = "account";
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("sku", skuId);
+    arguments.put("accountId", accountId);
+    MethodCall launchCall = new MethodCall(LAUNCH_BILLING_FLOW, arguments);
+
+    plugin.onMethodCall(launchCall, result);
+
+    // Assert that we sent an error back.
+    verify(result).error(contains("NOT_FOUND"), contains(skuId), any());
+    verify(result, never()).success(any());
+  }
+
   private void establishConnectedBillingClient(
       @Nullable Map<String, Integer> arguments, @Nullable Result result) {
     if (arguments == null) {
@@ -193,14 +289,34 @@ private void establishConnectedBillingClient(
       result = mock(Result.class);
     }
 
-    MethodCall connectCall =
-        new MethodCall("BillingClient#startConnection(BillingClientStateListener)", arguments);
+    MethodCall connectCall = new MethodCall(START_CONNECTION, arguments);
     plugin.onMethodCall(connectCall, result);
   }
 
-  private SkuDetails buildSkuDetails() {
+  private void queryForSkus(List<String> skusList) {
+    // Set up the query method call
+    establishConnectedBillingClient(/*arguments=*/ null, /*result=*/ null);
+    HashMap<String, Object> arguments = new HashMap<>();
+    String skuType = SkuType.INAPP;
+    arguments.put("skuType", skuType);
+    arguments.put("skusList", skusList);
+    MethodCall queryCall = new MethodCall(QUERY_SKU_DETAILS, arguments);
+
+    // Call the method.
+    plugin.onMethodCall(queryCall, mock(Result.class));
+
+    // Respond to the call with a matching set of Sku details.
+    ArgumentCaptor<SkuDetailsResponseListener> listenerCaptor =
+        ArgumentCaptor.forClass(SkuDetailsResponseListener.class);
+    verify(mockBillingClient).querySkuDetailsAsync(any(), listenerCaptor.capture());
+    List<SkuDetails> skuDetailsResponse =
+        skusList.stream().map(this::buildSkuDetails).collect(toList());
+    listenerCaptor.getValue().onSkuDetailsResponse(BillingResponse.OK, skuDetailsResponse);
+  }
+
+  private SkuDetails buildSkuDetails(String id) {
     SkuDetails details = mock(SkuDetails.class);
-    when(details.getSku()).thenReturn("foo");
+    when(details.getSku()).thenReturn(id);
     return details;
   }
 }
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
index 1c6ab07ce9b0..631cd15c22e1 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
@@ -20,46 +20,15 @@ SkuDetailsWrapper _$SkuDetailsWrapperFromJson(Map json) {
       sku: json['sku'] as String,
       subscriptionPeriod: json['subscriptionPeriod'] as String,
       title: json['title'] as String,
-      type: _$enumDecode(_$SkuTypeEnumMap, json['type']),
+      type: const SkuTypeConverter().fromJson(json['type'] as String),
       isRewarded: json['isRewarded'] as bool);
 }
 
-T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
-  if (source == null) {
-    throw ArgumentError('A value must be provided. Supported values: '
-        '${enumValues.values.join(', ')}');
-  }
-  return enumValues.entries
-      .singleWhere((e) => e.value == source,
-          orElse: () => throw ArgumentError(
-              '`$source` is not one of the supported values: '
-              '${enumValues.values.join(', ')}'))
-      .key;
-}
-
-const _$SkuTypeEnumMap = <SkuType, dynamic>{
-  SkuType.inapp: 'inapp',
-  SkuType.subs: 'subs'
-};
-
 SkuDetailsResponseWrapper _$SkuDetailsResponseWrapperFromJson(Map json) {
   return SkuDetailsResponseWrapper(
-      responseCode:
-          _$enumDecode(_$BillingResponseEnumMap, json['responseCode']),
+      responseCode: const BillingResponseConverter()
+          .fromJson(json['responseCode'] as int),
       skuDetailsList: (json['skuDetailsList'] as List)
           .map((e) => SkuDetailsWrapper.fromJson(e as Map))
           .toList());
 }
-
-const _$BillingResponseEnumMap = <BillingResponse, dynamic>{
-  BillingResponse.featureNotSupported: -2,
-  BillingResponse.ok: 0,
-  BillingResponse.userCanceled: 1,
-  BillingResponse.serviceUnavailable: 2,
-  BillingResponse.billingUnavailable: 3,
-  BillingResponse.itemUnavailable: 4,
-  BillingResponse.developerError: 5,
-  BillingResponse.error: 6,
-  BillingResponse.itemAlreadyOwned: 7,
-  BillingResponse.itemNotOwned: 8
-};

From 0a923c1fb7cec424e273585e6164eb5173d496c7 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Fri, 15 Feb 2019 14:54:01 -0800
Subject: [PATCH 139/410] Remove categories (#1226)

Fixing [flutter/flutter#27361](https://github.com/flutter/flutter/issues/27361) and [flutter/flutter#27960](https://github.com/flutter/flutter/issues/27960)

Used static c function instead of category.
The plugins effected are
cloud_firestore
firebase_admob
firebase_auth
firebase_core
firebase_database
firebase_dynamiclink
firebase_mlvision
firebase_storage
google_signin
camera
---
 packages/camera/CHANGELOG.md                  |  4 ++
 packages/camera/ios/Classes/CameraPlugin.m    | 20 +++------
 packages/camera/pubspec.yaml                  |  2 +-
 packages/cloud_firestore/CHANGELOG.md         |  4 ++
 .../ios/Classes/CloudFirestorePlugin.m        | 24 ++++-------
 packages/cloud_firestore/pubspec.yaml         |  2 +-
 packages/firebase_admob/CHANGELOG.md          |  4 ++
 .../ios/Classes/FirebaseAdMobPlugin.m         | 12 ------
 packages/firebase_admob/pubspec.yaml          |  2 +-
 packages/firebase_auth/CHANGELOG.md           |  4 ++
 .../ios/Classes/FirebaseAuthPlugin.m          | 14 ++----
 packages/firebase_auth/pubspec.yaml           |  2 +-
 packages/firebase_core/CHANGELOG.md           |  4 ++
 .../ios/Classes/FirebaseCorePlugin.m          | 43 +++++++------------
 packages/firebase_core/pubspec.yaml           |  2 +-
 packages/firebase_database/CHANGELOG.md       |  4 ++
 .../ios/Classes/FirebaseDatabasePlugin.m      | 34 ++++++---------
 packages/firebase_database/pubspec.yaml       |  2 +-
 packages/firebase_dynamic_links/CHANGELOG.md  |  4 ++
 .../ios/Classes/FirebaseDynamicLinksPlugin.m  | 16 +++----
 packages/firebase_dynamic_links/pubspec.yaml  |  2 +-
 packages/firebase_ml_vision/CHANGELOG.md      |  4 ++
 .../ios/Classes/FirebaseMlVisionPlugin.m      | 16 +++----
 packages/firebase_ml_vision/pubspec.yaml      |  2 +-
 packages/firebase_storage/CHANGELOG.md        |  4 ++
 .../ios/Classes/FirebaseStoragePlugin.m       | 26 +++++------
 packages/firebase_storage/pubspec.yaml        |  2 +-
 packages/google_sign_in/CHANGELOG.md          |  4 ++
 .../ios/Classes/GoogleSignInPlugin.m          | 20 +++------
 packages/google_sign_in/pubspec.yaml          |  2 +-
 30 files changed, 127 insertions(+), 158 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 56fcb98a641e..cbf5f45d2e22 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0+1
+
+* Remove categories.
+
 ## 0.4.0
 
 * **Breaking Change** Change iOS image stream format to `ImageFormatGroup.bgra8888` from 
diff --git a/packages/camera/ios/Classes/CameraPlugin.m b/packages/camera/ios/Classes/CameraPlugin.m
index 51d7836c2213..81e0d18df845 100644
--- a/packages/camera/ios/Classes/CameraPlugin.m
+++ b/packages/camera/ios/Classes/CameraPlugin.m
@@ -4,17 +4,11 @@
 #import <CoreMotion/CoreMotion.h>
 #import <libkern/OSAtomic.h>
 
-@interface NSError (FlutterError)
-@property(readonly, nonatomic) FlutterError *flutterError;
-@end
-
-@implementation NSError (FlutterError)
-- (FlutterError *)flutterError {
-  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)self.code]
-                             message:self.domain
-                             details:self.localizedDescription];
+static FlutterError *getFlutterError(NSError *error) {
+  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code]
+                             message:error.domain
+                             details:error.localizedDescription];
 }
-@end
 
 @interface FLTSavePhotoDelegate : NSObject <AVCapturePhotoCaptureDelegate>
 @property(readonly, nonatomic) NSString *path;
@@ -73,7 +67,7 @@ - (void)captureOutput:(AVCapturePhotoOutput *)output
                                    error:(NSError *)error {
   selfReference = nil;
   if (error) {
-    _result([error flutterError]);
+    _result(getFlutterError(error));
     return;
   }
   NSData *data = [AVCapturePhotoOutput
@@ -497,7 +491,7 @@ - (void)stopVideoRecordingWithResult:(FlutterResult)result {
         [NSError errorWithDomain:NSCocoaErrorDomain
                             code:NSURLErrorResourceUnavailable
                         userInfo:@{NSLocalizedDescriptionKey : @"Video is not recording!"}];
-    result([error flutterError]);
+    result(getFlutterError(error));
   }
 }
 
@@ -670,7 +664,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
                                     resolutionPreset:resolutionPreset
                                                error:&error];
     if (error) {
-      result([error flutterError]);
+      result(getFlutterError(error));
     } else {
       if (_camera) {
         [_camera close];
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index d99166f02bea..fc199161c531 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.4.0
+version: 0.4.0+1
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>
diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 86761c884ec3..7478257ce671 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.0+2
+
+* Remove categories.
+
 ## 0.9.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
index 3d93972b5ddd..e549825b7126 100644
--- a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
@@ -6,17 +6,11 @@
 
 #import <Firebase/Firebase.h>
 
-@interface NSError (FlutterError)
-@property(readonly, nonatomic) FlutterError *flutterError;
-@end
-
-@implementation NSError (FlutterError)
-- (FlutterError *)flutterError {
-  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %ld", self.code]
-                             message:self.domain
-                             details:self.localizedDescription];
+static FlutterError *getFlutterError(NSError *error) {
+  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code]
+                             message:error.domain
+                             details:error.localizedDescription];
 }
-@end
 
 FIRFirestore *getFirestore(NSDictionary *arguments) {
   FIRApp *app = [FIRApp appNamed:arguments[@"app"]];
@@ -292,7 +286,7 @@ - (instancetype)init {
 
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
   void (^defaultCompletionBlock)(NSError *) = ^(NSError *error) {
-    result(error.flutterError);
+    result(getFlutterError(error));
   };
   if ([@"Firestore#runTransaction" isEqualToString:call.method]) {
     [getFirestore(call.arguments)
@@ -396,7 +390,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [document getDocumentWithCompletion:^(FIRDocumentSnapshot *_Nullable snapshot,
                                           NSError *_Nullable error) {
       if (error) {
-        result(error.flutterError);
+        result(getFlutterError(error));
       } else {
         result(@{
           @"path" : snapshot.reference.path,
@@ -416,7 +410,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     }
     id<FIRListenerRegistration> listener = [query
         addSnapshotListener:^(FIRQuerySnapshot *_Nullable snapshot, NSError *_Nullable error) {
-          if (error) result(error.flutterError);
+          if (error) result(getFlutterError(error));
           NSMutableDictionary *arguments = [parseQuerySnapshot(snapshot) mutableCopy];
           [arguments setObject:handle forKey:@"handle"];
           [self.channel invokeMethod:@"QuerySnapshot" arguments:arguments];
@@ -428,7 +422,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     FIRDocumentReference *document = getDocumentReference(call.arguments);
     id<FIRListenerRegistration> listener =
         [document addSnapshotListener:^(FIRDocumentSnapshot *snapshot, NSError *_Nullable error) {
-          if (error) result(error.flutterError);
+          if (error) result(getFlutterError(error));
           [self.channel invokeMethod:@"DocumentSnapshot"
                            arguments:@{
                              @"handle" : handle,
@@ -449,7 +443,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     }
     [query getDocumentsWithCompletion:^(FIRQuerySnapshot *_Nullable snapshot,
                                         NSError *_Nullable error) {
-      if (error) result(error.flutterError);
+      if (error) result(getFlutterError(error));
       result(parseQuerySnapshot(snapshot));
     }];
   } else if ([@"Query#removeListener" isEqualToString:call.method]) {
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 98a6600f722c..7adb10deab98 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.0+1
+version: 0.9.0+2
 
 flutter:
   plugin:
diff --git a/packages/firebase_admob/CHANGELOG.md b/packages/firebase_admob/CHANGELOG.md
index 6039575c141d..0fa0817fbbcc 100644
--- a/packages/firebase_admob/CHANGELOG.md
+++ b/packages/firebase_admob/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.0+2
+
+* Remove categories.
+
 ## 0.8.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/firebase_admob/ios/Classes/FirebaseAdMobPlugin.m b/packages/firebase_admob/ios/Classes/FirebaseAdMobPlugin.m
index 999ae420c4fb..db28486cfdbd 100644
--- a/packages/firebase_admob/ios/Classes/FirebaseAdMobPlugin.m
+++ b/packages/firebase_admob/ios/Classes/FirebaseAdMobPlugin.m
@@ -10,18 +10,6 @@
 #import "FLTRewardedVideoAdWrapper.h"
 #import "Firebase/Firebase.h"
 
-@interface NSError (FlutterError)
-@property(readonly, nonatomic) FlutterError *flutterError;
-@end
-
-@implementation NSError (FlutterError)
-- (FlutterError *)flutterError {
-  return [FlutterError errorWithCode:[NSString stringWithFormat:@"%ld", (long)self.code]
-                             message:self.domain
-                             details:self.localizedDescription];
-}
-@end
-
 @interface FLTFirebaseAdMobPlugin ()
 @property(nonatomic, retain) FlutterMethodChannel *channel;
 @property(nonatomic, strong) FLTRewardedVideoAdWrapper *rewardedWrapper;
diff --git a/packages/firebase_admob/pubspec.yaml b/packages/firebase_admob/pubspec.yaml
index 1237d729fd80..dd58a2901001 100644
--- a/packages/firebase_admob/pubspec.yaml
+++ b/packages/firebase_admob/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_admob
 description: Firebase AdMob plugin for Flutter applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_admob
-version: 0.8.0+1
+version: 0.8.0+2
 
 flutter:
   plugin:
diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index dfaf7ecde8a7..bdd8cb74f7dc 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.1+1
+
+* Remove categories.
+
 ## 0.8.1
 
 * Fixes Firebase auth phone sign-in for Android.
diff --git a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
index 5ed02361aca6..14371ded50c4 100644
--- a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
+++ b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
@@ -6,19 +6,13 @@
 
 #import "Firebase/Firebase.h"
 
-@interface NSError (FIRAuthErrorCode)
-@property(readonly, nonatomic) NSString *firAuthErrorCode;
-@end
-
-@implementation NSError (FIRAuthErrorCode)
-- (NSString *)firAuthErrorCode {
-  NSString *code = [self userInfo][FIRAuthErrorNameKey];
+static NSString *getFlutterErrorCode(NSError *error) {
+  NSString *code = [error userInfo][FIRAuthErrorNameKey];
   if (code != nil) {
     return code;
   }
-  return [NSString stringWithFormat:@"ERROR_%d", (int)self.code];
+  return [NSString stringWithFormat:@"ERROR_%d", (int)error.code];
 }
-@end
 
 NSDictionary *toDictionary(id<FIRUserInfo> userInfo) {
   return @{
@@ -299,7 +293,7 @@ - (void)sendResult:(FlutterResult)result forUser:(FIRUser *)user error:(NSError
 
 - (void)sendResult:(FlutterResult)result forObject:(NSObject *)object error:(NSError *)error {
   if (error != nil) {
-    result([FlutterError errorWithCode:error.firAuthErrorCode
+    result([FlutterError errorWithCode:getFlutterErrorCode(error)
                                message:error.localizedDescription
                                details:nil]);
   } else if (object == nil) {
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 405e7f1b75bf..69bd8e6ed2eb 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.1"
+version: "0.8.1+1"
 
 flutter:
   plugin:
diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md
index c792b1f33da0..e608eb25223f 100644
--- a/packages/firebase_core/CHANGELOG.md
+++ b/packages/firebase_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.0+2
+
+* Remove categories.
+
 ## 0.3.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/firebase_core/ios/Classes/FirebaseCorePlugin.m b/packages/firebase_core/ios/Classes/FirebaseCorePlugin.m
index 84285cbc90ed..2c5418e00272 100644
--- a/packages/firebase_core/ios/Classes/FirebaseCorePlugin.m
+++ b/packages/firebase_core/ios/Classes/FirebaseCorePlugin.m
@@ -6,36 +6,25 @@
 
 #import <Firebase/Firebase.h>
 
-@interface FIROptions (FLTFirebaseCorePlugin)
-@property(readonly, nonatomic) NSDictionary *dictionary;
-@end
-
-@implementation FIROptions (FLTFirebaseCorePlugin)
-- (NSDictionary *)flutterDictionary {
+static NSDictionary *getDictionaryFromFIROptions(FIROptions *options) {
   return @{
-    @"googleAppID" : self.googleAppID ?: [NSNull null],
-    @"bundleID" : self.bundleID ?: [NSNull null],
-    @"GCMSenderID" : self.GCMSenderID ?: [NSNull null],
-    @"APIKey" : self.APIKey ?: [NSNull null],
-    @"clientID" : self.clientID ?: [NSNull null],
-    @"trackingID" : self.trackingID ?: [NSNull null],
-    @"projectID" : self.projectID ?: [NSNull null],
-    @"androidClientID" : self.androidClientID ?: [NSNull null],
-    @"databaseUrl" : self.databaseURL ?: [NSNull null],
-    @"storageBucket" : self.storageBucket ?: [NSNull null],
-    @"deepLinkURLScheme" : self.deepLinkURLScheme ?: [NSNull null],
+    @"googleAppID" : options.googleAppID ?: [NSNull null],
+    @"bundleID" : options.bundleID ?: [NSNull null],
+    @"GCMSenderID" : options.GCMSenderID ?: [NSNull null],
+    @"APIKey" : options.APIKey ?: [NSNull null],
+    @"clientID" : options.clientID ?: [NSNull null],
+    @"trackingID" : options.trackingID ?: [NSNull null],
+    @"projectID" : options.projectID ?: [NSNull null],
+    @"androidClientID" : options.androidClientID ?: [NSNull null],
+    @"databaseUrl" : options.databaseURL ?: [NSNull null],
+    @"storageBucket" : options.storageBucket ?: [NSNull null],
+    @"deepLinkURLScheme" : options.deepLinkURLScheme ?: [NSNull null],
   };
 }
-@end
 
-@implementation FIRApp (FLTFirebaseCorePlugin)
-- (NSDictionary *)flutterDictionary {
-  return @{
-    @"name" : self.name,
-    @"options" : self.options.flutterDictionary,
-  };
+static NSDictionary *getDictionaryFromFIRApp(FIRApp *app) {
+  return @{@"name" : app.name, @"options" : getDictionaryFromFIROptions(app.options)};
 }
-@end
 
 @implementation FLTFirebaseCorePlugin
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
@@ -78,13 +67,13 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     NSMutableArray *appsList = [NSMutableArray array];
     for (NSString *name in allApps) {
       FIRApp *app = allApps[name];
-      [appsList addObject:app.flutterDictionary];
+      [appsList addObject:getDictionaryFromFIRApp(app)];
     }
     result(appsList.count > 0 ? appsList : nil);
   } else if ([@"FirebaseApp#appNamed" isEqualToString:call.method]) {
     NSString *name = call.arguments;
     FIRApp *app = [FIRApp appNamed:name];
-    result(app.flutterDictionary);
+    result(getDictionaryFromFIRApp(app));
   } else {
     result(FlutterMethodNotImplemented);
   }
diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml
index 5419620265c7..97dafd7bb2cc 100644
--- a/packages/firebase_core/pubspec.yaml
+++ b/packages/firebase_core/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Core, enabling connecting to multiple
   Firebase apps.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_core
-version: 0.3.0+1
+version: 0.3.0+2
 
 flutter:
   plugin:
diff --git a/packages/firebase_database/CHANGELOG.md b/packages/firebase_database/CHANGELOG.md
index 42aa1e2d4027..cb1737eeef10 100644
--- a/packages/firebase_database/CHANGELOG.md
+++ b/packages/firebase_database/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.1+1
+
+* Remove categories.
+
 ## 2.0.1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m b/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m
index 98df29c8de51..ad8a6e46ca33 100644
--- a/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m
+++ b/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m
@@ -6,28 +6,22 @@
 
 #import <Firebase/Firebase.h>
 
-@interface FLTFirebaseDatabasePlugin ()
-@end
-
-@interface NSError (FlutterError)
-@property(readonly, nonatomic) FlutterError *flutterError;
-@property(readonly, nonatomic) NSDictionary *dictionary;
-@end
-
-@implementation NSError (FlutterError)
-- (FlutterError *)flutterError {
-  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %ld", self.code]
-                             message:self.domain
-                             details:self.localizedDescription];
+static FlutterError *getFlutterError(NSError *error) {
+  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code]
+                             message:error.domain
+                             details:error.localizedDescription];
 }
 
-- (NSDictionary *)dictionary {
+static NSDictionary *getDictionaryFromError(NSError *error) {
   return @{
-    @"code" : @(self.code),
-    @"message" : self.domain ?: [NSNull null],
-    @"details" : self.localizedDescription ?: [NSNull null],
+    @"code" : @(error.code),
+    @"message" : error.domain ?: [NSNull null],
+    @"details" : error.localizedDescription ?: [NSNull null],
   };
 }
+
+@interface FLTFirebaseDatabasePlugin ()
+
 @end
 
 FIRDatabaseReference *getReference(FIRDatabase *database, NSDictionary *arguments) {
@@ -173,7 +167,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
   }
   void (^defaultCompletionBlock)(NSError *, FIRDatabaseReference *) =
       ^(NSError *error, FIRDatabaseReference *ref) {
-        result(error.flutterError);
+        result(getFlutterError(error));
       };
   if ([@"FirebaseDatabase#goOnline" isEqualToString:call.method]) {
     [database goOnline];
@@ -280,7 +274,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
           // Invoke transaction completion on the Dart side.
           result(@{
             @"transactionKey" : call.arguments[@"transactionKey"],
-            @"error" : error.dictionary ?: [NSNull null],
+            @"error" : getDictionaryFromError(error) ?: [NSNull null],
             @"committed" : [NSNumber numberWithBool:committed],
             @"snapshot" : @{@"key" : snapshot.key ?: [NSNull null], @"value" : snapshot.value}
           });
@@ -314,7 +308,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
           [self.channel invokeMethod:@"Error"
                            arguments:@{
                              @"handle" : [NSNumber numberWithUnsignedInteger:handle],
-                             @"error" : error.dictionary,
+                             @"error" : getDictionaryFromError(error),
                            }];
         }];
     result([NSNumber numberWithUnsignedInteger:handle]);
diff --git a/packages/firebase_database/pubspec.yaml b/packages/firebase_database/pubspec.yaml
index 75ade3194293..f0c1dbc975fc 100755
--- a/packages/firebase_database/pubspec.yaml
+++ b/packages/firebase_database/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Database, a cloud-hosted NoSQL database
   with realtime data syncing across Android and iOS clients, and offline access.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_database
-version: 2.0.1
+version: 2.0.1+1
 
 flutter:
   plugin:
diff --git a/packages/firebase_dynamic_links/CHANGELOG.md b/packages/firebase_dynamic_links/CHANGELOG.md
index 9414680bac01..e3403b195ae6 100644
--- a/packages/firebase_dynamic_links/CHANGELOG.md
+++ b/packages/firebase_dynamic_links/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0+2
+
+* Remove categories.
+
 ## 0.2.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m b/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
index 4169e790b58e..7b3888db4a84 100644
--- a/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
+++ b/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
@@ -2,17 +2,11 @@
 
 #import "Firebase/Firebase.h"
 
-@interface NSError (FlutterError)
-@property(readonly, nonatomic) FlutterError *flutterError;
-@end
-
-@implementation NSError (FlutterError)
-- (FlutterError *)flutterError {
-  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)self.code]
-                             message:self.domain
-                             details:self.localizedDescription];
+static FlutterError *getFlutterError(NSError *error) {
+  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code]
+                             message:error.domain
+                             details:error.localizedDescription];
 }
-@end
 
 @interface FLTFirebaseDynamicLinksPlugin ()
 @property(nonatomic, retain) FIRDynamicLink *dynamicLink;
@@ -111,7 +105,7 @@ - (BOOL)application:(UIApplication *)application
 - (FIRDynamicLinkShortenerCompletion)createShortLinkCompletion:(FlutterResult)result {
   return ^(NSURL *_Nullable shortURL, NSArray *_Nullable warnings, NSError *_Nullable error) {
     if (error) {
-      result([error flutterError]);
+      result(getFlutterError(error));
     } else {
       result(@{@"url" : [shortURL absoluteString], @"warnings" : warnings});
     }
diff --git a/packages/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/pubspec.yaml
index 105010314af4..c5098734c87b 100644
--- a/packages/firebase_dynamic_links/pubspec.yaml
+++ b/packages/firebase_dynamic_links/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_dynamic_links
 description: Flutter plugin for Google Dynamic Links for Firebase, an app solution for creating
   and handling links across multiple platforms.
-version: 0.2.0+1
+version: 0.2.0+2
 
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_dynamic_links
diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 6f4a0123a2ca..1a98c9e70e7e 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.1+1
+
+* Remove categories.
+
 ## 0.5.1
 
 * iOS now handles non-planar buffers from `FirebaseVisionImage.fromBytes()`.
diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index a57b3b08ccbf..515b470b17aa 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -1,20 +1,14 @@
 #import "FirebaseMlVisionPlugin.h"
 
-@interface NSError (FlutterError)
-@property(readonly, nonatomic) FlutterError *flutterError;
-@end
-
-@implementation NSError (FlutterError)
-- (FlutterError *)flutterError {
-  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)self.code]
-                             message:self.domain
-                             details:self.localizedDescription];
+static FlutterError *getFlutterError(NSError *error) {
+  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code]
+                             message:error.domain
+                             details:error.localizedDescription];
 }
-@end
 
 @implementation FLTFirebaseMlVisionPlugin
 + (void)handleError:(NSError *)error result:(FlutterResult)result {
-  result([error flutterError]);
+  result(getFlutterError(error));
 }
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index 212dadde40db..f3905de8a705 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_ml_vision
 description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.5.1
+version: 0.5.1+1
 
 dependencies:
   flutter:
diff --git a/packages/firebase_storage/CHANGELOG.md b/packages/firebase_storage/CHANGELOG.md
index 7736238b9612..fa284ecf4147 100644
--- a/packages/firebase_storage/CHANGELOG.md
+++ b/packages/firebase_storage/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.1+1
+
+* Remove categories.
+
 ## 2.0.1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m b/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
index 8ab7620550a7..de0bcb143594 100644
--- a/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
+++ b/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
@@ -6,17 +6,11 @@
 
 #import <Firebase/Firebase.h>
 
-@interface NSError (FlutterError)
-@property(readonly, nonatomic) FlutterError *flutterError;
-@end
-
-@implementation NSError (FlutterError)
-- (FlutterError *)flutterError {
-  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %ld", (long)self.code]
-                             message:self.domain
-                             details:self.localizedDescription];
+static FlutterError *getFlutterError(NSError *error) {
+  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code]
+                             message:error.domain
+                             details:error.localizedDescription];
 }
-@end
 
 @interface FLTFirebaseStoragePlugin ()
 @property(nonatomic, retain) FlutterMethodChannel *channel;
@@ -303,7 +297,7 @@ - (void)getData:(FlutterMethodCall *)call result:(FlutterResult)result {
   [ref dataWithMaxSize:[maxSize longLongValue]
             completion:^(NSData *_Nullable data, NSError *_Nullable error) {
               if (error != nil) {
-                result(error.flutterError);
+                result(getFlutterError(error));
                 return;
               }
               if (data == nil) {
@@ -330,7 +324,7 @@ - (void)writeToFile:(FlutterMethodCall *)call result:(FlutterResult)result {
   [task observeStatus:FIRStorageTaskStatusFailure
               handler:^(FIRStorageTaskSnapshot *snapshot) {
                 if (snapshot.error != nil) {
-                  result(snapshot.error.flutterError);
+                  result(getFlutterError(snapshot.error));
                 }
               }];
 }
@@ -340,7 +334,7 @@ - (void)getMetadata:(FlutterMethodCall *)call result:(FlutterResult)result {
   FIRStorageReference *ref = [storage.reference child:path];
   [ref metadataWithCompletion:^(FIRStorageMetadata *metadata, NSError *error) {
     if (error != nil) {
-      result(error.flutterError);
+      result(getFlutterError(error));
     } else {
       result([self buildDictionaryFromMetadata:metadata]);
     }
@@ -354,7 +348,7 @@ - (void)updateMetadata:(FlutterMethodCall *)call result:(FlutterResult)result {
   [ref updateMetadata:[self buildMetadataFromDictionary:metadataDictionary]
            completion:^(FIRStorageMetadata *metadata, NSError *error) {
              if (error != nil) {
-               result(error.flutterError);
+               result(getFlutterError(error));
              } else {
                result([self buildDictionaryFromMetadata:metadata]);
              }
@@ -384,7 +378,7 @@ - (void)getDownloadUrl:(FlutterMethodCall *)call result:(FlutterResult)result {
   FIRStorageReference *ref = [storage.reference child:path];
   [ref downloadURLWithCompletion:^(NSURL *URL, NSError *error) {
     if (error != nil) {
-      result(error.flutterError);
+      result(getFlutterError(error));
     } else {
       result(URL.absoluteString);
     }
@@ -396,7 +390,7 @@ - (void)delete:(FlutterMethodCall *)call result:(FlutterResult)result {
   FIRStorageReference *ref = [storage.reference child:path];
   [ref deleteWithCompletion:^(NSError *error) {
     if (error != nil) {
-      result(error.flutterError);
+      result(getFlutterError(error));
     } else {
       result(nil);
     }
diff --git a/packages/firebase_storage/pubspec.yaml b/packages/firebase_storage/pubspec.yaml
index 45fefeb7e61b..94a2ab277654 100755
--- a/packages/firebase_storage/pubspec.yaml
+++ b/packages/firebase_storage/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Storage, a powerful, simple, and
   cost-effective object storage service for Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_storage
-version: 2.0.1
+version: 2.0.1+1
 
 flutter:
   plugin:
diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md
index b357d8cf0c12..1f4e4940d9da 100644
--- a/packages/google_sign_in/CHANGELOG.md
+++ b/packages/google_sign_in/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.1+1
+
+* Remove categories.
+
 ## 4.0.1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m b/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m
index 7f913f713d45..483bc5c6e81c 100644
--- a/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m
+++ b/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m
@@ -15,25 +15,19 @@
 static NSString *const kErrorReasonSignInCanceled = @"sign_in_canceled";
 static NSString *const kErrorReasonSignInFailed = @"sign_in_failed";
 
-@interface NSError (FlutterError)
-@property(readonly, nonatomic) FlutterError *flutterError;
-@end
-
-@implementation NSError (FlutterError)
-- (FlutterError *)flutterError {
+static FlutterError *getFlutterError(NSError *error) {
   NSString *errorCode;
-  if (self.code == kGIDSignInErrorCodeHasNoAuthInKeychain) {
+  if (error.code == kGIDSignInErrorCodeHasNoAuthInKeychain) {
     errorCode = kErrorReasonSignInRequired;
-  } else if (self.code == kGIDSignInErrorCodeCanceled) {
+  } else if (error.code == kGIDSignInErrorCodeCanceled) {
     errorCode = kErrorReasonSignInCanceled;
   } else {
     errorCode = kErrorReasonSignInFailed;
   }
   return [FlutterError errorWithCode:errorCode
-                             message:self.domain
-                             details:self.localizedDescription];
+                             message:error.domain
+                             details:error.localizedDescription];
 }
-@end
 
 @interface FLTGoogleSignInPlugin () <GIDSignInDelegate, GIDSignInUIDelegate>
 @end
@@ -107,7 +101,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     GIDGoogleUser *currentUser = [GIDSignIn sharedInstance].currentUser;
     GIDAuthentication *auth = currentUser.authentication;
     [auth getTokensWithHandler:^void(GIDAuthentication *authentication, NSError *error) {
-      result(error != nil ? error.flutterError : @{
+      result(error != nil ? getFlutterError(error) : @{
         @"idToken" : authentication.idToken,
         @"accessToken" : authentication.accessToken,
       });
@@ -195,7 +189,7 @@ - (void)signIn:(GIDSignIn *)signIn
 - (void)respondWithAccount:(id)account error:(NSError *)error {
   FlutterResult result = _accountRequest;
   _accountRequest = nil;
-  result(error != nil ? error.flutterError : account);
+  result(error != nil ? getFlutterError(error) : account);
 }
 
 @end
diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml
index 23279a1e0a7f..45c58738a875 100755
--- a/packages/google_sign_in/pubspec.yaml
+++ b/packages/google_sign_in/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in
-version: 4.0.1
+version: 4.0.1+1
 
 flutter:
   plugin:

From 4301e5a58b3272d3b283a5342d7397e8891a3fc3 Mon Sep 17 00:00:00 2001
From: Chris Yang <tyang8954@gmail.com>
Date: Tue, 19 Feb 2019 09:36:24 -0800
Subject: [PATCH 140/410] [Camera]remove extra space in CHANGELOG (#1238)

---
 packages/camera/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index cbf5f45d2e22..b681b9da0472 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ## 0.4.0
 
-* **Breaking Change** Change iOS image stream format to `ImageFormatGroup.bgra8888` from 
+* **Breaking Change** Change iOS image stream format to `ImageFormatGroup.bgra8888` from
   `ImageFormatGroup.yuv420`.
 
 ## 0.3.0+4

From 62b825229d134fc24bc7b403f3686be28fc4e482 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Tue, 19 Feb 2019 10:57:24 -0800
Subject: [PATCH 141/410] [IAP] Add the Dart API for launchBillingFlow (#1232)

flutter/flutter#26329
flutter/flutter#26327
---
 .../billing_client_wrapper.dart               | 35 ++++++++++++++++
 .../billing_client_wrapper_test.dart          | 40 +++++++++++++++++++
 2 files changed, 75 insertions(+)

diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
index d0e5947ee4aa..daf14c17be0e 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
@@ -97,6 +97,41 @@ class BillingClient {
         arguments));
   }
 
+  /// Attempt to launch the Play Billing Flow for a given [skuDetails].
+  ///
+  /// The [skuDetails] needs to have already been fetched in a [querySkuDetails]
+  /// call. The [accountId] is an optional hashed string associated with the user
+  /// that's unique to your app. It's used by Google to detect unusual behavior.
+  /// Do not pass in a cleartext [accountId], use your developer ID, or use the
+  /// user's Google ID for this field.
+  ///
+  /// Calling this attemps to show the Google Play purchase UI. The user is free
+  /// to complete the transaction there.
+  ///
+  /// This method returns a [BillingResponse] representing the initial attempt
+  /// to show the Google Play purchase screen.
+  /// TODO(mklim, flutter/flutter#26326): Expose onPurchasesUpdated() result.
+  ///
+  /// This method calls through to
+  /// [`BillingClient#launchBillingFlow`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient#launchbillingflow).
+  /// It constructs a
+  /// [`BillingFlowParams`](https://developer.android.com/reference/com/android/billingclient/api/BillingFlowParams)
+  /// instance by [setting the given
+  /// skuDetails](https://developer.android.com/reference/com/android/billingclient/api/BillingFlowParams.Builder.html#setskudetails)
+  /// and [the given
+  /// accountId](https://developer.android.com/reference/com/android/billingclient/api/BillingFlowParams.Builder.html#setAccountId(java.lang.String)).
+  Future<BillingResponse> launchBillingFlow(
+      {@required SkuDetailsWrapper skuDetails, String accountId}) async {
+    assert(skuDetails != null);
+    final Map<String, dynamic> arguments = <String, dynamic>{
+      'sku': skuDetails.sku,
+      'accountId': accountId,
+    };
+    return BillingResponseConverter().fromJson(await channel.invokeMethod(
+        'BillingClient#launchBillingFlow(Activity, BillingFlowParams)',
+        arguments));
+  }
+
   Future<void> _callHandler(MethodCall call) async {
     switch (call.method) {
       case 'BillingClientStateListener#onBillingServiceDisconnected()':
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
index b991faa33017..28b4b156738b 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
@@ -99,4 +99,44 @@ void main() {
       expect(response.skuDetailsList, contains(dummyWrapper));
     });
   });
+
+  group('launchBillingFlow', () {
+    final String launchMethodName =
+        'BillingClient#launchBillingFlow(Activity, BillingFlowParams)';
+
+    test('serializes and deserializes data', () async {
+      final BillingResponse sentCode = BillingResponse.ok;
+      stubPlatform.addResponse(
+          name: launchMethodName,
+          value: BillingResponseConverter().toJson(sentCode));
+      final SkuDetailsWrapper skuDetails = dummyWrapper;
+      final String accountId = "hashedAccountId";
+
+      final BillingResponse receivedCode = await billingClient
+          .launchBillingFlow(skuDetails: skuDetails, accountId: accountId);
+
+      expect(receivedCode, equals(sentCode));
+      Map<dynamic, dynamic> arguments =
+          stubPlatform.previousCallMatching(launchMethodName).arguments;
+      expect(arguments['sku'], equals(skuDetails.sku));
+      expect(arguments['accountId'], equals(accountId));
+    });
+
+    test('handles null accountId', () async {
+      final BillingResponse sentCode = BillingResponse.ok;
+      stubPlatform.addResponse(
+          name: launchMethodName,
+          value: BillingResponseConverter().toJson(sentCode));
+      final SkuDetailsWrapper skuDetails = dummyWrapper;
+
+      final BillingResponse receivedCode =
+          await billingClient.launchBillingFlow(skuDetails: skuDetails);
+
+      expect(receivedCode, equals(sentCode));
+      Map<dynamic, dynamic> arguments =
+          stubPlatform.previousCallMatching(launchMethodName).arguments;
+      expect(arguments['sku'], equals(skuDetails.sku));
+      expect(arguments['accountId'], isNull);
+    });
+  });
 }

From 9d604374bb1d541252d237c887d70cab3fdf3b51 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Tue, 19 Feb 2019 15:32:31 -0800
Subject: [PATCH 142/410] Rotate image file based on Exif data (#1225)

---
 packages/firebase_ml_vision/CHANGELOG.md      |  4 ++
 .../firebase_ml_vision/android/build.gradle   |  1 +
 .../FirebaseMlVisionPlugin.java               | 45 +++++++++++++++++--
 .../ios/Classes/FirebaseMlVisionPlugin.m      | 12 +++++
 4 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 1a98c9e70e7e..244d6e0ebaf2 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.1+2
+
+* Fixes bug where image file needs to be rotated.
+
 ## 0.5.1+1
 
 * Remove categories.
diff --git a/packages/firebase_ml_vision/android/build.gradle b/packages/firebase_ml_vision/android/build.gradle
index 395787374241..b1e18eeeae19 100644
--- a/packages/firebase_ml_vision/android/build.gradle
+++ b/packages/firebase_ml_vision/android/build.gradle
@@ -48,5 +48,6 @@ android {
         api 'com.google.firebase:firebase-ml-vision:17.0.1'
         api 'com.google.firebase:firebase-ml-vision-image-label-model:16.2.0'
         implementation 'androidx.annotation:annotation:1.0.0'
+        implementation 'androidx.exifinterface:exifinterface:1.0.0'
     }
 }
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
index 65594a845c90..c4b1eaab6ce1 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
@@ -1,6 +1,10 @@
 package io.flutter.plugins.firebasemlvision;
 
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
 import android.net.Uri;
+import androidx.exifinterface.media.ExifInterface;
 import com.google.firebase.ml.vision.common.FirebaseVisionImage;
 import com.google.firebase.ml.vision.common.FirebaseVisionImageMetadata;
 import io.flutter.plugin.common.MethodCall;
@@ -63,11 +67,26 @@ public void onMethodCall(MethodCall call, Result result) {
 
   private FirebaseVisionImage dataToVisionImage(Map<String, Object> imageData) throws IOException {
     String imageType = (String) imageData.get("type");
+    assert imageType != null;
 
     switch (imageType) {
       case "file":
-        File file = new File((String) imageData.get("path"));
-        return FirebaseVisionImage.fromFilePath(registrar.context(), Uri.fromFile(file));
+        final String imageFilePath = (String) imageData.get("path");
+        final int rotation = getImageExifOrientation(imageFilePath);
+
+        if (rotation == 0) {
+          File file = new File(imageFilePath);
+          return FirebaseVisionImage.fromFilePath(registrar.context(), Uri.fromFile(file));
+        }
+
+        Matrix matrix = new Matrix();
+        matrix.postRotate(rotation);
+
+        final Bitmap bitmap = BitmapFactory.decodeFile(imageFilePath);
+        final Bitmap rotatedBitmap =
+            Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+
+        return FirebaseVisionImage.fromBitmap(rotatedBitmap);
       case "bytes":
         @SuppressWarnings("unchecked")
         Map<String, Object> metadataData = (Map<String, Object>) imageData.get("metadata");
@@ -80,12 +99,32 @@ private FirebaseVisionImage dataToVisionImage(Map<String, Object> imageData) thr
                 .setRotation(getRotation((int) metadataData.get("rotation")))
                 .build();
 
-        return FirebaseVisionImage.fromByteArray((byte[]) imageData.get("bytes"), metadata);
+        byte[] bytes = (byte[]) imageData.get("bytes");
+        assert bytes != null;
+
+        return FirebaseVisionImage.fromByteArray(bytes, metadata);
       default:
         throw new IllegalArgumentException(String.format("No image type for: %s", imageType));
     }
   }
 
+  private int getImageExifOrientation(String imageFilePath) throws IOException {
+    ExifInterface exif = new ExifInterface(imageFilePath);
+    int orientation =
+        exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
+
+    switch (orientation) {
+      case ExifInterface.ORIENTATION_ROTATE_90:
+        return 90;
+      case ExifInterface.ORIENTATION_ROTATE_180:
+        return 180;
+      case ExifInterface.ORIENTATION_ROTATE_270:
+        return 270;
+      default:
+        return 0;
+    }
+  }
+
   private int getRotation(int rotation) {
     switch (rotation) {
       case 0:
diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index 515b470b17aa..0c6874d9bb8b 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -64,6 +64,18 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
 
 - (FIRVisionImage *)filePathToVisionImage:(NSString *)filePath {
   UIImage *image = [UIImage imageWithContentsOfFile:filePath];
+
+  if (image.imageOrientation != UIImageOrientationUp) {
+    CGImageRef imgRef = image.CGImage;
+    CGRect bounds = CGRectMake(0, 0, CGImageGetWidth(imgRef), CGImageGetHeight(imgRef));
+    UIGraphicsBeginImageContext(bounds.size);
+    CGContextDrawImage(UIGraphicsGetCurrentContext(), bounds, imgRef);
+    UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+
+    image = newImage;
+  }
+
   return [[FIRVisionImage alloc] initWithImage:image];
 }
 

From d136958665e7b943a76c617916987b34672dae98 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Tue, 19 Feb 2019 16:27:26 -0800
Subject: [PATCH 143/410] Remove ML models from ML Kit Vision plugin (#1170)

---
 packages/firebase_ml_vision/CHANGELOG.md      |  7 +++++
 packages/firebase_ml_vision/README.md         | 31 +++++++++++++++++--
 .../firebase_ml_vision/android/build.gradle   |  1 -
 packages/firebase_ml_vision/example/README.md |  8 ++++-
 .../example/android/app/build.gradle          |  4 +++
 .../ios/firebase_ml_vision.podspec            |  4 ---
 packages/firebase_ml_vision/pubspec.yaml      |  2 +-
 7 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 244d6e0ebaf2..79b38fec128a 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.6.0
+
+* **Breaking Change** Removed on-device model dependencies from plugin.
+  `Android` now requires adding the on-device label detector dependency manually.
+  `iOS` now requires adding the on-device barcode/face/label/text detector dependencies manually.
+  See the `README.md` for more details. https://pub.dartlang.org/packages/firebase_ml_vision#-readme-tab-
+
 ## 0.5.1+2
 
 * Fixes bug where image file needs to be rotated.
diff --git a/packages/firebase_ml_vision/README.md b/packages/firebase_ml_vision/README.md
index 95d38bc9738b..b3b2d4684c38 100644
--- a/packages/firebase_ml_vision/README.md
+++ b/packages/firebase_ml_vision/README.md
@@ -13,6 +13,20 @@ For Flutter plugins for other Firebase products, see [FlutterFire.md](https://gi
 To use this plugin, add `firebase_ml_vision` as a [dependency in your pubspec.yaml file](https://flutter.io/platform-plugins/). You must also configure Firebase for each platform project: Android and iOS (see the example folder or https://codelabs.developers.google.com/codelabs/flutter-firebase/#4 for step by step details).
 
 ### Android
+If you're using the on-device `LabelDetector`, include the latest matching [ML Kit: Image Labeling](https://firebase.google.com/support/release-notes/android) dependency in your app-level build.gradle file.
+
+```
+android {
+    dependencies {
+        // ...
+
+        api 'com.google.firebase:firebase-ml-vision-image-label-model:16.2.0'
+    }
+}
+```
+
+If you receive compilation errors, try an earlier version of [ML Kit: Image Labeling](https://firebase.google.com/support/release-notes/android).
+
 Optional but recommended: If you use the on-device API, configure your app to automatically download the ML model to the device after your app is installed from the Play Store. To do so, add the following declaration to your app's AndroidManifest.xml file:
 
 ```xml
@@ -25,7 +39,18 @@ Optional but recommended: If you use the on-device API, configure your app to au
 </application>
 ```
 
-## Using an On-device FirbaseVisionDetector
+### iOS
+If you're using one of the on-device APIs, include the corresponding ML Kit library model in your
+`Podfile`. Then run `pod update` in a terminal within the same directory as your `Podfile`.
+
+```
+pod 'Firebase/MLVisionBarcodeModel'
+pod 'Firebase/MLVisionFaceModel'
+pod 'Firebase/MLVisionLabelModel'
+pod 'Firebase/MLVisionTextModel'
+```
+
+## Using an ML Vision Detector
 
 ### 1. Create a `FirebaseVisionImage`.
 
@@ -61,9 +86,9 @@ final LabelDetector detector = FirebaseVision.instance.labelDetector(
 ```dart
 final List<Barcode> barcodes = await barcodeDetector.detectInImage(visionImage);
 final List<Label> labels = await cloudLabelDetector.detectInImage(visionImage);
-final List<Face> faces = await faceDetector.detectInImage(visionImage);
+final List<Face> faces = await faceDetector.processImage(visionImage);
 final List<Label> labels = await labelDetector.detectInImage(visionImage);
-final VisionText visionText = await textRecognizer.detectInImage(visionImage);
+final VisionText visionText = await textRecognizer.processImage(visionImage);
 ```
 
 ### 4. Extract data.
diff --git a/packages/firebase_ml_vision/android/build.gradle b/packages/firebase_ml_vision/android/build.gradle
index b1e18eeeae19..a9d99ee46d9b 100644
--- a/packages/firebase_ml_vision/android/build.gradle
+++ b/packages/firebase_ml_vision/android/build.gradle
@@ -46,7 +46,6 @@ android {
     }
     dependencies {
         api 'com.google.firebase:firebase-ml-vision:17.0.1'
-        api 'com.google.firebase:firebase-ml-vision-image-label-model:16.2.0'
         implementation 'androidx.annotation:annotation:1.0.0'
         implementation 'androidx.exifinterface:exifinterface:1.0.0'
     }
diff --git a/packages/firebase_ml_vision/example/README.md b/packages/firebase_ml_vision/example/README.md
index 13f4934d76ff..6e2f75d9f527 100644
--- a/packages/firebase_ml_vision/example/README.md
+++ b/packages/firebase_ml_vision/example/README.md
@@ -4,7 +4,13 @@ Demonstrates how to use the firebase_ml_vision plugin.
 
 ## Usage
 
-This example uses the *image_picker* plugin to get images from the device gallery. If using an iOS device you will have to configure you project with the correct permissions seen under iOS configuration [here.](https://pub.dartlang.org/packages/image_picker)
+*Important* If using on-device detectors on `iOS`, see the plugin
+[README.md](https://github.com/flutter/plugins/blob/master/packages/camera/README.md) on including
+ML Model pods into the example project.
+
+This example uses the *image_picker* plugin to get images from the device gallery. If using an iOS
+device you will have to configure you project with the correct permissions seen under iOS
+configuration [here.](https://pub.dartlang.org/packages/image_picker).
 
 ## Getting Started
 
diff --git a/packages/firebase_ml_vision/example/android/app/build.gradle b/packages/firebase_ml_vision/example/android/app/build.gradle
index d26768abfccb..e6d7ece97e0f 100644
--- a/packages/firebase_ml_vision/example/android/app/build.gradle
+++ b/packages/firebase_ml_vision/example/android/app/build.gradle
@@ -45,6 +45,10 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
+    dependencies {
+        api 'com.google.firebase:firebase-ml-vision-image-label-model:16.2.0'
+    }
 }
 
 flutter {
diff --git a/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec b/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec
index 02ac73096a29..4e6ea62226c9 100644
--- a/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec
+++ b/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec
@@ -18,10 +18,6 @@ An SDK that brings Google's machine learning expertise to Android and iOS apps i
   s.dependency 'Flutter'
   s.dependency 'Firebase/Core'
   s.dependency 'Firebase/MLVision'
-  s.dependency 'Firebase/MLVisionBarcodeModel'
-  s.dependency 'Firebase/MLVisionFaceModel'
-  s.dependency 'Firebase/MLVisionLabelModel'
-  s.dependency 'Firebase/MLVisionTextModel'
   s.dependency 'GoogleAppMeasurement', '~> 5.3.0'
   s.ios.deployment_target = '8.0'
   s.static_framework = true
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index f3905de8a705..4abb04f3023c 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_ml_vision
 description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.5.1+1
+version: 0.6.0
 
 dependencies:
   flutter:

From afa2f0877a10c7f9f6898a0107da07d9ce90b670 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Wed, 20 Feb 2019 17:25:03 -0800
Subject: [PATCH 144/410] Collection literals ignores in webview flutter plugin
 (#1246)

---
 packages/webview_flutter/example/lib/main.dart     |  2 ++
 packages/webview_flutter/lib/webview_flutter.dart  |  2 ++
 .../webview_flutter/test/webview_flutter_test.dart | 14 ++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index 4e3fe6cbdbdd..f688b602a359 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -32,6 +32,8 @@ class WebViewExample extends StatelessWidget {
           onWebViewCreated: (WebViewController webViewController) {
             _controller.complete(webViewController);
           },
+          // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+          // ignore: prefer_collection_literals
           javascriptChannels: <JavascriptChannel>[
             _toasterJavascriptChannel(context),
           ].toSet(),
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index a4bb285a2d8d..bcace13ca1be 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -222,6 +222,8 @@ class _WebViewState extends State<WebView> {
 
 Set<String> _extractChannelNames(Set<JavascriptChannel> channels) {
   final Set<String> channelNames = channels == null
+      // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+      // ignore: prefer_collection_literals
       ? Set<String>()
       : channels.map((JavascriptChannel channel) => channel.name).toSet();
   return channelNames;
diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart
index 2f37c01950e5..4fcdc7f4e015 100644
--- a/packages/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/test/webview_flutter_test.dart
@@ -408,6 +408,8 @@ void main() {
     await tester.pumpWidget(
       WebView(
         initialUrl: 'https://youtube.com',
+        // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+        // ignore: prefer_collection_literals
         javascriptChannels: <JavascriptChannel>[
           JavascriptChannel(
               name: 'Tts', onMessageReceived: (JavascriptMessage msg) {}),
@@ -445,6 +447,8 @@ void main() {
     await tester.pumpWidget(
       WebView(
         initialUrl: 'https://youtube.com',
+        // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+        // ignore: prefer_collection_literals
         javascriptChannels: <JavascriptChannel>[
           JavascriptChannel(
               name: 'Alarm', onMessageReceived: (JavascriptMessage msg) {}),
@@ -460,6 +464,8 @@ void main() {
     await tester.pumpWidget(
       WebView(
         initialUrl: 'https://youtube.com',
+        // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+        // ignore: prefer_collection_literals
         javascriptChannels: <JavascriptChannel>[
           JavascriptChannel(
               name: 'Tts', onMessageReceived: (JavascriptMessage msg) {}),
@@ -472,6 +478,8 @@ void main() {
     await tester.pumpWidget(
       WebView(
         initialUrl: 'https://youtube.com',
+        // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+        // ignore: prefer_collection_literals
         javascriptChannels: <JavascriptChannel>[
           JavascriptChannel(
               name: 'Tts', onMessageReceived: (JavascriptMessage msg) {}),
@@ -499,6 +507,8 @@ void main() {
     await tester.pumpWidget(
       WebView(
         initialUrl: 'https://youtube.com',
+        // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+        // ignore: prefer_collection_literals
         javascriptChannels: <JavascriptChannel>[
           JavascriptChannel(
               name: 'Tts', onMessageReceived: (JavascriptMessage msg) {}),
@@ -515,6 +525,8 @@ void main() {
     await tester.pumpWidget(
       WebView(
         initialUrl: 'https://youtube.com',
+        // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+        // ignore: prefer_collection_literals
         javascriptChannels: <JavascriptChannel>[
           JavascriptChannel(
               name: 'Tts', onMessageReceived: (JavascriptMessage msg) {}),
@@ -535,6 +547,8 @@ void main() {
     await tester.pumpWidget(
       WebView(
         initialUrl: 'https://youtube.com',
+        // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+        // ignore: prefer_collection_literals
         javascriptChannels: <JavascriptChannel>[
           JavascriptChannel(
               name: 'Tts',

From f92ba3a10ea2b7541e4563fa44b20108d3d05b96 Mon Sep 17 00:00:00 2001
From: Chris Yang <cyang8954@gmail.com>
Date: Wed, 20 Feb 2019 23:45:43 -0800
Subject: [PATCH 145/410] IAP make payment objc (#1231)

---
 .../InAppPurchasePluginTest.m                 | 132 ++++++++--
 .../PaymentQueueTest.m                        | 186 ++++++++++++++
 .../ios/in_app_purchase_pluginTests/Stubs.h   |   5 +
 .../ios/in_app_purchase_pluginTests/Stubs.m   |  29 +++
 .../ios/Classes/FIAPaymentQueueHandler.h      |  35 +++
 .../ios/Classes/FIAPaymentQueueHandler.m      | 103 ++++++++
 .../ios/Classes/InAppPurchasePlugin.h         |   4 +
 .../ios/Classes/InAppPurchasePlugin.m         | 233 ++++++++++++++++++
 8 files changed, 710 insertions(+), 17 deletions(-)
 create mode 100644 packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/PaymentQueueTest.m
 create mode 100644 packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.h
 create mode 100644 packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m

diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
index 1d841868cefb..f49122a6bf9c 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
@@ -3,18 +3,20 @@
 // found in the LICENSE file.
 
 #import <XCTest/XCTest.h>
+#import "FIAPaymentQueueHandler.h"
 #import "InAppPurchasePlugin.h"
 #import "Stubs.h"
 
 @interface InAppPurchasePluginTest : XCTestCase
 
+@property(strong, nonatomic) InAppPurchasePlugin* plugin;
+
 @end
 
 @implementation InAppPurchasePluginTest
-InAppPurchasePlugin* plugin;
 
 - (void)setUp {
-  plugin = [[InAppPurchasePluginStub alloc] init];
+  self.plugin = [[InAppPurchasePluginStub alloc] init];
 }
 
 - (void)tearDown {
@@ -25,11 +27,11 @@ - (void)testInvalidMethodCall {
       [self expectationWithDescription:@"expect result to be not implemented"];
   FlutterMethodCall* call = [FlutterMethodCall methodCallWithMethodName:@"invalid" arguments:NULL];
   __block id result;
-  [plugin handleMethodCall:call
-                    result:^(id r) {
-                      [expectation fulfill];
-                      result = r;
-                    }];
+  [self.plugin handleMethodCall:call
+                         result:^(id r) {
+                           [expectation fulfill];
+                           result = r;
+                         }];
   [self waitForExpectations:@[ expectation ] timeout:5];
   XCTAssertEqual(result, FlutterMethodNotImplemented);
 }
@@ -40,11 +42,11 @@ - (void)testCanMakePayments {
       [FlutterMethodCall methodCallWithMethodName:@"-[SKPaymentQueue canMakePayments:]"
                                         arguments:NULL];
   __block id result;
-  [plugin handleMethodCall:call
-                    result:^(id r) {
-                      [expectation fulfill];
-                      result = r;
-                    }];
+  [self.plugin handleMethodCall:call
+                         result:^(id r) {
+                           [expectation fulfill];
+                           result = r;
+                         }];
   [self waitForExpectations:@[ expectation ] timeout:5];
   XCTAssertEqual(result, [NSNumber numberWithBool:YES]);
 }
@@ -56,11 +58,11 @@ - (void)testGetProductResponse {
       methodCallWithMethodName:@"-[InAppPurchasePlugin startProductRequest:result:]"
                      arguments:@[ @"123" ]];
   __block id result;
-  [plugin handleMethodCall:call
-                    result:^(id r) {
-                      [expectation fulfill];
-                      result = r;
-                    }];
+  [self.plugin handleMethodCall:call
+                         result:^(id r) {
+                           [expectation fulfill];
+                           result = r;
+                         }];
   [self waitForExpectations:@[ expectation ] timeout:5];
   XCTAssert([result isKindOfClass:[NSDictionary class]]);
   NSArray* resultArray = [result objectForKey:@"products"];
@@ -68,4 +70,100 @@ - (void)testGetProductResponse {
   XCTAssertTrue([resultArray.firstObject[@"productIdentifier"] isEqualToString:@"123"]);
 }
 
+- (void)testCreatePaymentWithProduct {
+  XCTestExpectation* expectation = [self expectationWithDescription:@"must return a payment"];
+  FlutterMethodCall* call = [FlutterMethodCall
+      methodCallWithMethodName:@"-[InAppPurchasePlugin startProductRequest:result:]"
+                     arguments:@[ @"123" ]];
+  FlutterMethodCall* createPaymentCall = [FlutterMethodCall
+      methodCallWithMethodName:@"-[InAppPurchasePlugin createPaymentWithProductID:result:]"
+                     arguments:@"123"];
+  __block NSDictionary* result;
+  __weak typeof(self) weakSelf = self;
+  [self.plugin handleMethodCall:call
+                         result:^(id queryResult) {
+                           [weakSelf.plugin handleMethodCall:createPaymentCall
+                                                      result:^(id _Nullable r) {
+                                                        result = r;
+                                                        [expectation fulfill];
+                                                      }];
+                         }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertTrue([result[@"productIdentifier"] isEqualToString:@"123"]);
+}
+
+- (void)testAddPaymentFailure {
+  XCTestExpectation* expectation =
+      [self expectationWithDescription:@"result should return failed state"];
+  FlutterMethodCall* call =
+      [FlutterMethodCall methodCallWithMethodName:@"-[InAppPurchasePlugin addPayment:result:]"
+                                        arguments:@{
+                                          @"productID" : @"123",
+                                          @"quantity" : @(1),
+                                          @"simulatesAskToBuyInSandBox" : @YES,
+                                          @"usePaymentObject" : @YES
+                                        }];
+  SKPaymentQueueStub* queue = [SKPaymentQueueStub new];
+  queue.testState = SKPaymentTransactionStateFailed;
+  __block SKPaymentTransaction* transactionForUpdateBlock;
+  self.plugin.paymentQueueHandler = [[FIAPaymentQueueHandler alloc] initWithQueue:queue
+      transactionsUpdated:^(NSArray<SKPaymentTransaction*>* _Nonnull transactions) {
+        SKPaymentTransaction* transaction = transactions[0];
+        if (transaction.transactionState == SKPaymentTransactionStateFailed) {
+          transactionForUpdateBlock = transaction;
+          [expectation fulfill];
+        }
+      }
+      transactionRemoved:nil
+      restoreTransactionFailed:nil
+      restoreCompletedTransactionsFinished:nil
+      shouldAddStorePayment:^BOOL(SKPayment* _Nonnull payment, SKProduct* _Nonnull product) {
+        return YES;
+      }
+      updatedDownloads:nil];
+  [queue addTransactionObserver:self.plugin.paymentQueueHandler];
+  [self.plugin handleMethodCall:call
+                         result:^(id r){
+                         }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertEqual(transactionForUpdateBlock.transactionState, SKPaymentTransactionStateFailed);
+}
+
+- (void)testAddPaymentSuccessWithMockQueue {
+  XCTestExpectation* expectation =
+      [self expectationWithDescription:@"result should return success state"];
+  FlutterMethodCall* call =
+      [FlutterMethodCall methodCallWithMethodName:@"-[InAppPurchasePlugin addPayment:result:]"
+                                        arguments:@{
+                                          @"productID" : @"123",
+                                          @"quantity" : @(1),
+                                          @"simulatesAskToBuyInSandBox" : @YES,
+                                          @"usePaymentObject" : @YES
+                                        }];
+  SKPaymentQueueStub* queue = [SKPaymentQueueStub new];
+  queue.testState = SKPaymentTransactionStatePurchased;
+  __block SKPaymentTransaction* transactionForUpdateBlock;
+  self.plugin.paymentQueueHandler = [[FIAPaymentQueueHandler alloc] initWithQueue:queue
+      transactionsUpdated:^(NSArray<SKPaymentTransaction*>* _Nonnull transactions) {
+        SKPaymentTransaction* transaction = transactions[0];
+        if (transaction.transactionState == SKPaymentTransactionStatePurchased) {
+          transactionForUpdateBlock = transaction;
+          [expectation fulfill];
+        }
+      }
+      transactionRemoved:nil
+      restoreTransactionFailed:nil
+      restoreCompletedTransactionsFinished:nil
+      shouldAddStorePayment:^BOOL(SKPayment* _Nonnull payment, SKProduct* _Nonnull product) {
+        return YES;
+      }
+      updatedDownloads:nil];
+  [queue addTransactionObserver:self.plugin.paymentQueueHandler];
+  [self.plugin handleMethodCall:call
+                         result:^(id r){
+                         }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertEqual(transactionForUpdateBlock.transactionState, SKPaymentTransactionStatePurchased);
+}
+
 @end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/PaymentQueueTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/PaymentQueueTest.m
new file mode 100644
index 000000000000..9fd0fdbe28d8
--- /dev/null
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/PaymentQueueTest.m
@@ -0,0 +1,186 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <XCTest/XCTest.h>
+#import "FIAPaymentQueueHandler.h"
+#import "Stubs.h"
+
+@interface PaymentQueueTest : XCTestCase
+
+@property(strong, nonatomic) NSDictionary *periodMap;
+@property(strong, nonatomic) NSDictionary *discountMap;
+@property(strong, nonatomic) NSDictionary *productMap;
+@property(strong, nonatomic) NSDictionary *productResponseMap;
+
+@end
+
+@implementation PaymentQueueTest
+
+- (void)setUp {
+  self.periodMap = @{@"numberOfUnits" : @(0), @"unit" : @(0)};
+  self.discountMap = @{
+    @"price" : @1.0,
+    @"currencyCode" : @"USD",
+    @"numberOfPeriods" : @1,
+    @"subscriptionPeriod" : self.periodMap,
+    @"paymentMode" : @1
+  };
+  self.productMap = @{
+    @"price" : @1.0,
+    @"currencyCode" : @"USD",
+    @"productIdentifier" : @"123",
+    @"localizedTitle" : @"title",
+    @"localizedDescription" : @"des",
+    @"downloadable" : @YES,
+    @"downloadContentLengths" : @1,
+    @"downloadContentVersion" : [NSNull null],  // not mockable
+    @"subscriptionPeriod" : self.periodMap,
+    @"introductoryPrice" : self.discountMap,
+    @"subscriptionGroupIdentifier" : @"com.group"
+  };
+  self.productResponseMap =
+      @{@"products" : @[ self.productMap ], @"invalidProductIdentifiers" : [NSNull null]};
+}
+
+- (void)testTransactionPurchased {
+  XCTestExpectation *expectation =
+      [self expectationWithDescription:@"expect to get purchased transcation."];
+  SKPaymentQueueStub *queue = [[SKPaymentQueueStub alloc] init];
+  queue.testState = SKPaymentTransactionStatePurchased;
+  __block SKPaymentTransactionStub *tran;
+  FIAPaymentQueueHandler *handler = [[FIAPaymentQueueHandler alloc] initWithQueue:queue
+      transactionsUpdated:^(NSArray<SKPaymentTransaction *> *_Nonnull transactions) {
+        SKPaymentTransaction *transaction = transactions[0];
+        tran = (SKPaymentTransactionStub *)transaction;
+        [expectation fulfill];
+      }
+      transactionRemoved:nil
+      restoreTransactionFailed:nil
+      restoreCompletedTransactionsFinished:nil
+      shouldAddStorePayment:^BOOL(SKPayment *_Nonnull payment, SKProduct *_Nonnull product) {
+        return YES;
+      }
+      updatedDownloads:nil];
+  handler.testing = YES;
+  [queue addTransactionObserver:handler];
+  SKPayment *payment =
+      [SKPayment paymentWithProduct:[[SKProductStub alloc] initWithMap:self.productResponseMap]];
+  [handler addPayment:payment];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertEqual(tran.transactionState, SKPaymentTransactionStatePurchased);
+}
+
+- (void)testTransactionFailed {
+  XCTestExpectation *expectation =
+      [self expectationWithDescription:@"expect to get failed transcation."];
+  SKPaymentQueueStub *queue = [[SKPaymentQueueStub alloc] init];
+  queue.testState = SKPaymentTransactionStateFailed;
+  __block SKPaymentTransactionStub *tran;
+  FIAPaymentQueueHandler *handler = [[FIAPaymentQueueHandler alloc] initWithQueue:queue
+      transactionsUpdated:^(NSArray<SKPaymentTransaction *> *_Nonnull transactions) {
+        SKPaymentTransaction *transaction = transactions[0];
+        tran = (SKPaymentTransactionStub *)transaction;
+        [expectation fulfill];
+      }
+      transactionRemoved:nil
+      restoreTransactionFailed:nil
+      restoreCompletedTransactionsFinished:nil
+      shouldAddStorePayment:^BOOL(SKPayment *_Nonnull payment, SKProduct *_Nonnull product) {
+        return YES;
+      }
+      updatedDownloads:nil];
+  handler.testing = YES;
+  [queue addTransactionObserver:handler];
+  SKPayment *payment =
+      [SKPayment paymentWithProduct:[[SKProductStub alloc] initWithMap:self.productResponseMap]];
+  [handler addPayment:payment];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertEqual(tran.transactionState, SKPaymentTransactionStateFailed);
+}
+
+- (void)testTransactionRestored {
+  XCTestExpectation *expectation =
+      [self expectationWithDescription:@"expect to get restored transcation."];
+  SKPaymentQueueStub *queue = [[SKPaymentQueueStub alloc] init];
+  queue.testState = SKPaymentTransactionStateRestored;
+  __block SKPaymentTransactionStub *tran;
+  FIAPaymentQueueHandler *handler = [[FIAPaymentQueueHandler alloc] initWithQueue:queue
+      transactionsUpdated:^(NSArray<SKPaymentTransaction *> *_Nonnull transactions) {
+        SKPaymentTransaction *transaction = transactions[0];
+        tran = (SKPaymentTransactionStub *)transaction;
+        [expectation fulfill];
+      }
+      transactionRemoved:nil
+      restoreTransactionFailed:nil
+      restoreCompletedTransactionsFinished:nil
+      shouldAddStorePayment:^BOOL(SKPayment *_Nonnull payment, SKProduct *_Nonnull product) {
+        return YES;
+      }
+      updatedDownloads:nil];
+  handler.testing = YES;
+  [queue addTransactionObserver:handler];
+  SKPayment *payment =
+      [SKPayment paymentWithProduct:[[SKProductStub alloc] initWithMap:self.productResponseMap]];
+  [handler addPayment:payment];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertEqual(tran.transactionState, SKPaymentTransactionStateRestored);
+}
+
+- (void)testTransactionPurchasing {
+  XCTestExpectation *expectation =
+      [self expectationWithDescription:@"expect to get purchasing transcation."];
+  SKPaymentQueueStub *queue = [[SKPaymentQueueStub alloc] init];
+  queue.testState = SKPaymentTransactionStatePurchasing;
+  __block SKPaymentTransactionStub *tran;
+  FIAPaymentQueueHandler *handler = [[FIAPaymentQueueHandler alloc] initWithQueue:queue
+      transactionsUpdated:^(NSArray<SKPaymentTransaction *> *_Nonnull transactions) {
+        SKPaymentTransaction *transaction = transactions[0];
+        tran = (SKPaymentTransactionStub *)transaction;
+        [expectation fulfill];
+      }
+      transactionRemoved:nil
+      restoreTransactionFailed:nil
+      restoreCompletedTransactionsFinished:nil
+      shouldAddStorePayment:^BOOL(SKPayment *_Nonnull payment, SKProduct *_Nonnull product) {
+        return YES;
+      }
+      updatedDownloads:nil];
+  handler.testing = YES;
+  [queue addTransactionObserver:handler];
+  SKPayment *payment =
+      [SKPayment paymentWithProduct:[[SKProductStub alloc] initWithMap:self.productResponseMap]];
+  [handler addPayment:payment];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertEqual(tran.transactionState, SKPaymentTransactionStatePurchasing);
+}
+
+- (void)testTransactionDeferred {
+  XCTestExpectation *expectation =
+      [self expectationWithDescription:@"expect to get deffered transcation."];
+  SKPaymentQueueStub *queue = [[SKPaymentQueueStub alloc] init];
+  queue.testState = SKPaymentTransactionStateDeferred;
+  __block SKPaymentTransactionStub *tran;
+  FIAPaymentQueueHandler *handler = [[FIAPaymentQueueHandler alloc] initWithQueue:queue
+      transactionsUpdated:^(NSArray<SKPaymentTransaction *> *_Nonnull transactions) {
+        SKPaymentTransaction *transaction = transactions[0];
+        tran = (SKPaymentTransactionStub *)transaction;
+        [expectation fulfill];
+      }
+      transactionRemoved:nil
+      restoreTransactionFailed:nil
+      restoreCompletedTransactionsFinished:nil
+      shouldAddStorePayment:^BOOL(SKPayment *_Nonnull payment, SKProduct *_Nonnull product) {
+        return YES;
+      }
+      updatedDownloads:nil];
+  handler.testing = YES;
+  [queue addTransactionObserver:handler];
+  SKPayment *payment =
+      [SKPayment paymentWithProduct:[[SKProductStub alloc] initWithMap:self.productResponseMap]];
+  [handler addPayment:payment];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertEqual(tran.transactionState, SKPaymentTransactionStateDeferred);
+}
+
+@end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
index e194e450a33e..9ea6e6a54868 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
@@ -32,8 +32,13 @@ NS_ASSUME_NONNULL_BEGIN
 @interface InAppPurchasePluginStub : InAppPurchasePlugin
 @end
 
+@interface SKPaymentQueueStub : SKPaymentQueue
+@property(assign, nonatomic) SKPaymentTransactionState testState;
+@end
+
 @interface SKPaymentTransactionStub : SKPaymentTransaction
 - (instancetype)initWithMap:(NSDictionary *)map;
+- (instancetype)initWithState:(SKPaymentTransactionState)state;
 @end
 
 @interface SKDownloadStub : SKDownload
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
index 39defa632c06..2c4378ee4081 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
@@ -130,6 +130,26 @@ - (SKProductRequestStub *)getProductRequestWithIdentifiers:(NSSet *)identifiers
 
 @end
 
+@interface SKPaymentQueueStub ()
+
+@property(strong, nonatomic) id<SKPaymentTransactionObserver> observer;
+
+@end
+
+@implementation SKPaymentQueueStub
+
+- (void)addTransactionObserver:(id<SKPaymentTransactionObserver>)observer {
+  self.observer = observer;
+}
+
+- (void)addPayment:(SKPayment *)payment {
+  SKPaymentTransactionStub *transaction =
+      [[SKPaymentTransactionStub alloc] initWithState:self.testState];
+  [self.observer paymentQueue:self updatedTransactions:@[ transaction ]];
+}
+
+@end
+
 @implementation SKPaymentTransactionStub
 
 - (instancetype)initWithID:(NSString *)identifier {
@@ -163,6 +183,15 @@ - (instancetype)initWithMap:(NSDictionary *)map {
   return self;
 }
 
+- (instancetype)initWithState:(SKPaymentTransactionState)state {
+  self = [super init];
+  if (self) {
+    [self setValue:@"fakeID" forKey:@"transactionIdentifier"];
+    [self setValue:@(state) forKey:@"transactionState"];
+  }
+  return self;
+}
+
 @end
 
 @implementation SKDownloadStub
diff --git a/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.h b/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.h
new file mode 100644
index 000000000000..692514ab5278
--- /dev/null
+++ b/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.h
@@ -0,0 +1,35 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <Foundation/Foundation.h>
+#import <StoreKit/StoreKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void (^TransactionsUpdated)(NSArray<SKPaymentTransaction *> *transactions);
+typedef void (^TransactionsRemoved)(NSArray<SKPaymentTransaction *> *transactions);
+typedef void (^RestoreTransactionFailed)(NSError *error);
+typedef void (^RestoreCompletedTransactionsFinished)(void);
+typedef BOOL (^ShouldAddStorePayment)(SKPayment *payment, SKProduct *product);
+typedef void (^UpdatedDownloads)(NSArray<SKDownload *> *downloads);
+
+@interface FIAPaymentQueueHandler : NSObject <SKPaymentTransactionObserver>
+
+@property(copy, nonatomic, readonly) NSDictionary *transactions;
+
+- (instancetype)initWithQueue:(nonnull SKPaymentQueue *)queue
+                     transactionsUpdated:(nullable TransactionsUpdated)transactionsUpdated
+                      transactionRemoved:(nullable TransactionsRemoved)transactionsRemoved
+                restoreTransactionFailed:(nullable RestoreTransactionFailed)restoreTransactionFailed
+    restoreCompletedTransactionsFinished:
+        (nullable RestoreCompletedTransactionsFinished)restoreCompletedTransactionsFinished
+                   shouldAddStorePayment:(nullable ShouldAddStorePayment)shouldAddStorePayment
+                        updatedDownloads:(nullable UpdatedDownloads)updatedDownloads;
+- (void)addPayment:(SKPayment *)payment;
+// Can throw exceptions if the transaction type is purchasing, should always used in a @try block.
+- (void)finishTransaction:(SKPaymentTransaction *)transaction;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m b/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m
new file mode 100644
index 000000000000..f9a550e1f121
--- /dev/null
+++ b/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m
@@ -0,0 +1,103 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "FIAPaymentQueueHandler.h"
+
+@interface FIAPaymentQueueHandler ()
+
+@property(strong, nonatomic) SKPaymentQueue *queue;
+@property(nullable, copy, nonatomic) TransactionsUpdated transactionsUpdated;
+@property(nullable, copy, nonatomic) TransactionsRemoved transactionsRemoved;
+@property(nullable, copy, nonatomic) RestoreTransactionFailed restoreTransactionFailed;
+@property(nullable, copy, nonatomic)
+    RestoreCompletedTransactionsFinished paymentQueueRestoreCompletedTransactionsFinished;
+@property(nullable, copy, nonatomic) ShouldAddStorePayment shouldAddStorePayment;
+@property(nullable, copy, nonatomic) UpdatedDownloads updatedDownloads;
+
+@property(strong, nonatomic) NSMutableDictionary *transactionsSetter;
+
+@end
+
+@implementation FIAPaymentQueueHandler
+
+- (instancetype)initWithQueue:(nonnull SKPaymentQueue *)queue
+                     transactionsUpdated:(nullable TransactionsUpdated)transactionsUpdated
+                      transactionRemoved:(nullable TransactionsRemoved)transactionsRemoved
+                restoreTransactionFailed:(nullable RestoreTransactionFailed)restoreTransactionFailed
+    restoreCompletedTransactionsFinished:
+        (nullable RestoreCompletedTransactionsFinished)restoreCompletedTransactionsFinished
+                   shouldAddStorePayment:(nullable ShouldAddStorePayment)shouldAddStorePayment
+                        updatedDownloads:(nullable UpdatedDownloads)updatedDownloads {
+  self = [super init];
+  if (self) {
+    self.queue = queue;
+    self.transactionsUpdated = transactionsUpdated;
+    self.transactionsRemoved = transactionsRemoved;
+    self.restoreTransactionFailed = restoreTransactionFailed;
+    self.paymentQueueRestoreCompletedTransactionsFinished = restoreCompletedTransactionsFinished;
+    self.shouldAddStorePayment = shouldAddStorePayment;
+    self.updatedDownloads = updatedDownloads;
+    self.transactionsSetter = [NSMutableDictionary new];
+  }
+  return self;
+}
+
+- (void)addPayment:(SKPayment *)payment {
+  [self.queue addPayment:payment];
+}
+
+- (void)finishTransaction:(SKPaymentTransaction *)transaction {
+  [self.queue finishTransaction:transaction];
+}
+
+#pragma mark - observing
+// Sent when the transaction array has changed (additions or state changes).  Client should check
+// state of transactions and finish as appropriate.
+- (void)paymentQueue:(SKPaymentQueue *)queue
+    updatedTransactions:(NSArray<SKPaymentTransaction *> *)transactions {
+  for (SKPaymentTransaction *transaction in transactions) {
+    [self.transactionsSetter setObject:transaction forKey:transaction.transactionIdentifier];
+  }
+  // notify dart through callbacks.
+  self.transactionsUpdated(transactions);
+}
+
+// Sent when transactions are removed from the queue (via finishTransaction:).
+- (void)paymentQueue:(SKPaymentQueue *)queue
+    removedTransactions:(NSArray<SKPaymentTransaction *> *)transactions {
+  self.transactionsRemoved(transactions);
+}
+
+// Sent when an error is encountered while adding transactions from the user's purchase history back
+// to the queue.
+- (void)paymentQueue:(SKPaymentQueue *)queue
+    restoreCompletedTransactionsFailedWithError:(NSError *)error {
+  self.restoreTransactionFailed(error);
+}
+
+// Sent when all transactions from the user's purchase history have successfully been added back to
+// the queue.
+- (void)paymentQueueRestoreCompletedTransactionsFinished:(SKPaymentQueue *)queue {
+  self.paymentQueueRestoreCompletedTransactionsFinished();
+}
+
+// Sent when the download state has changed.
+- (void)paymentQueue:(SKPaymentQueue *)queue updatedDownloads:(NSArray<SKDownload *> *)downloads {
+  self.updatedDownloads(downloads);
+}
+
+// Sent when a user initiates an IAP buy from the App Store
+- (BOOL)paymentQueue:(SKPaymentQueue *)queue
+    shouldAddStorePayment:(SKPayment *)payment
+               forProduct:(SKProduct *)product {
+  return (self.shouldAddStorePayment(payment, product));
+}
+
+#pragma mark - getter
+
+- (NSDictionary *)transactions {
+  return self.transactionsSetter;
+}
+
+@end
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
index 072547b77ad7..f7abae534fca 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
@@ -3,6 +3,10 @@
 // found in the LICENSE file.
 
 #import <Flutter/Flutter.h>
+@class FIAPaymentQueueHandler;
 
 @interface InAppPurchasePlugin : NSObject <FlutterPlugin>
+
+@property(strong, nonatomic) FIAPaymentQueueHandler *paymentQueueHandler;
+
 @end
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
index efd85b031947..df5bdf1dcaa6 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
@@ -6,6 +6,7 @@
 #import <StoreKit/StoreKit.h>
 #import "FIAObjectTranslator.h"
 #import "FIAPRequestHandler.h"
+#import "FIAPaymentQueueHandler.h"
 
 @interface InAppPurchasePlugin ()
 
@@ -13,6 +14,19 @@ @interface InAppPurchasePlugin ()
 // the request is finished.
 @property(strong, nonatomic) NSMutableSet *requestHandlers;
 
+// After querying the product, the available products will be saved in the map to be used
+// for purchase.
+@property(copy, nonatomic) NSMutableDictionary *productsCache;
+// Saved payment object used for resume payments;
+@property(copy, nonatomic) NSMutableDictionary *paymentsCache;
+;
+
+// Call back channel to dart used for when a listener function is triggered.
+@property(strong, nonatomic) FlutterMethodChannel *callbackChannel;
+@property(strong, nonatomic) NSObject<FlutterTextureRegistry> *registry;
+@property(strong, nonatomic) NSObject<FlutterBinaryMessenger> *messenger;
+@property(strong, nonatomic) NSObject<FlutterPluginRegistrar> *registrar;
+
 @end
 
 @implementation InAppPurchasePlugin
@@ -30,11 +44,50 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [self canMakePayments:result];
   } else if ([@"-[InAppPurchasePlugin startProductRequest:result:]" isEqualToString:call.method]) {
     [self handleProductRequestMethodCall:call result:result];
+  } else if ([@"-[InAppPurchasePlugin createPaymentWithProductID:result:]"
+                 isEqualToString:call.method]) {
+    [self createPaymentWithProductID:call result:result];
+  } else if ([@"-[InAppPurchasePlugin addPayment:result:]" isEqualToString:call.method]) {
+    [self addPayment:call result:result];
+  } else if ([@"-[InAppPurchasePlugin finishTransaction:result:]" isEqualToString:call.method]) {
+    [self finishTransaction:call result:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
 }
 
+- (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
+  self = [self init];
+  self.registrar = registrar;
+  self.registry = [registrar textures];
+  self.messenger = [registrar messenger];
+  __weak typeof(self) weakSelf = self;
+  self.paymentQueueHandler =
+      [[FIAPaymentQueueHandler alloc] initWithQueue:[SKPaymentQueue defaultQueue]
+          transactionsUpdated:^(NSArray<SKPaymentTransaction *> *_Nonnull transactions) {
+            [weakSelf handleTransactionsUpdated:transactions];
+          }
+          transactionRemoved:^(NSArray<SKPaymentTransaction *> *_Nonnull transactions) {
+            [weakSelf handleTransactionsRemoved:transactions];
+          }
+          restoreTransactionFailed:^(NSError *_Nonnull error) {
+            [weakSelf handleTransactionRestoreFailed:error];
+          }
+          restoreCompletedTransactionsFinished:^{
+            [weakSelf restoreCompletedTransactionsFinished];
+          }
+          shouldAddStorePayment:^BOOL(SKPayment *payment, SKProduct *product) {
+            return [weakSelf shouldAddStorePayment:payment product:product];
+          }
+          updatedDownloads:^void(NSArray<SKDownload *> *_Nonnull downloads) {
+            [weakSelf updatedDownloads:downloads];
+          }];
+  self.callbackChannel =
+      [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/in_app_purchase_callback"
+                                  binaryMessenger:[registrar messenger]];
+  return self;
+}
+
 - (void)canMakePayments:(FlutterResult)result {
   result([NSNumber numberWithBool:[SKPaymentQueue canMakePayments]]);
 }
@@ -70,11 +123,177 @@ - (void)handleProductRequestMethodCall:(FlutterMethodCall *)call result:(Flutter
                                  details:call.arguments]);
       return;
     }
+    for (SKProduct *product in response.products) {
+      [self.productsCache setObject:product forKey:product.productIdentifier];
+    }
     result([FIAObjectTranslator getMapFromSKProductsResponse:response]);
     [weakSelf.requestHandlers removeObject:handler];
   }];
 }
 
+- (void)createPaymentWithProductID:(FlutterMethodCall *)call result:(FlutterResult)result {
+  if (![call.arguments isKindOfClass:[NSString class]]) {
+    result([FlutterError
+        errorWithCode:@"storekit_invalid_argument"
+              message:@"Argument type of createPaymentWithProductID is not a string."
+              details:call.arguments]);
+    return;
+  }
+  NSString *productID = call.arguments;
+  SKProduct *product = [self.productsCache objectForKey:productID];
+  if (!product) {
+    result([FlutterError
+        errorWithCode:@"storekit_product_not_found"
+              message:@"Cannot find the product. To create a payment of a product, you must query "
+                      @"the product with SKProductRequestMaker.startProductRequest first."
+              details:call.arguments]);
+    return;
+  }
+  SKPayment *payment = [SKPayment paymentWithProduct:product];
+  [self.paymentsCache setObject:payment forKey:productID];
+  result([FIAObjectTranslator getMapFromSKPayment:payment]);
+}
+
+- (void)addPayment:(FlutterMethodCall *)call result:(FlutterResult)result {
+  if (![call.arguments isKindOfClass:[NSDictionary class]]) {
+    result([FlutterError errorWithCode:@"storekit_invalid_argument"
+                               message:@"Argument type of addPayment is not a map"
+                               details:call.arguments]);
+    return;
+  }
+  NSDictionary *paymentMap = (NSDictionary *)call.arguments;
+  NSString *productID = [paymentMap objectForKey:@"productID"];
+  SKPayment *payment = [self.paymentsCache objectForKey:productID];
+  // Use the payment object if we find a cached payment object associate with the productID. (Used
+  // for App Store payment flow
+  // https://developer.apple.com/documentation/storekit/skpaymenttransactionobserver/2877502-paymentqueue?language=objc)
+  if (payment) {
+    [self.paymentQueueHandler addPayment:payment];
+    result(nil);
+    return;
+  }
+  // The regular payment flow: when a product is already fetched, we create a payment object with
+  // the product to process the payment.
+  SKProduct *product = [self.productsCache objectForKey:productID];
+  if (product) {
+    payment = [SKPayment paymentWithProduct:product];
+    [self.paymentQueueHandler addPayment:payment];
+    result(nil);
+    return;
+  }
+  // User can also use payment object with usePaymentObject = true and add
+  // simulatesAskToBuyInSandBox = true to test the payment flow.
+  if ([paymentMap[@"usePaymentObject"] boolValue] == YES) {
+    SKMutablePayment *mutablePayment = [[SKMutablePayment alloc] init];
+    mutablePayment.productIdentifier = productID;
+    NSNumber *quantity = [paymentMap objectForKey:@"quantity"];
+    mutablePayment.quantity = quantity ? quantity.integerValue : 1;
+    NSString *applicationUsername = [paymentMap objectForKey:@"applicationUsername"];
+    mutablePayment.applicationUsername = applicationUsername;
+    if (@available(iOS 8.3, *)) {
+      mutablePayment.simulatesAskToBuyInSandbox =
+          [[paymentMap objectForKey:@"simulatesAskToBuyInSandBox"] boolValue];
+    }
+    [self.paymentQueueHandler addPayment:mutablePayment];
+    result(nil);
+    return;
+  }
+  result([FlutterError
+      errorWithCode:@"storekit_invalid_payment_object"
+            message:
+                @"You have requested a payment with an invalid payment object. A valid payment "
+                @"object should be one of the following: 1. Payment object that is automatically "
+                @"handled when the user starts an in-app purchase in the App Store and you "
+                @"returned true to the `shouldAddStorePayment` method or manually requested a "
+                @"payment with the productID that is provided in the `shouldAddStorePayment` "
+                @"method. 2. A payment requested for a product that has been fetched. 3. A custom "
+                @"payment object. This is not an error for a payment failure."
+            details:call.arguments]);
+}
+
+- (void)finishTransaction:(FlutterMethodCall *)call result:(FlutterResult)result {
+  if (![call.arguments isKindOfClass:[NSString class]]) {
+    result([FlutterError errorWithCode:@"storekit_invalid_argument"
+                               message:@"Argument type of finishTransaction is not a string."
+                               details:call.arguments]);
+    return;
+  }
+  NSString *identifier = call.arguments;
+  SKPaymentTransaction *transaction =
+      [self.paymentQueueHandler.transactions objectForKey:identifier];
+  if (!transaction) {
+    result([FlutterError errorWithCode:@"storekit_platform_invalid_transaction"
+                               message:@"Invalid transaction ID is used."
+                               details:call.arguments]);
+    return;
+  }
+  @try {
+    // finish transaction will throw exception if the transaction type is purchasing. Notify dart
+    // about this exception.
+    [self.paymentQueueHandler finishTransaction:transaction];
+  } @catch (NSException *e) {
+    result([FlutterError errorWithCode:@"storekit_finish_transaction_exception"
+                               message:e.name
+                               details:e.description]);
+    return;
+  }
+  result(nil);
+}
+
+#pragma mark - delegates
+
+- (void)handleTransactionsUpdated:(NSArray<SKPaymentTransaction *> *)transactions {
+  NSMutableArray *maps = [NSMutableArray new];
+  for (SKPaymentTransaction *transaction in transactions) {
+    [maps addObject:[FIAObjectTranslator getMapFromSKPaymentTransaction:transaction]];
+  }
+  [self.callbackChannel invokeMethod:@"updatedTransactions" arguments:maps];
+}
+
+- (void)handleTransactionsRemoved:(NSArray<SKPaymentTransaction *> *)transactions {
+  NSMutableArray *maps = [NSMutableArray new];
+  for (SKPaymentTransaction *transaction in transactions) {
+    [maps addObject:[FIAObjectTranslator getMapFromSKPaymentTransaction:transaction]];
+  }
+  [self.callbackChannel invokeMethod:@"removedTransactions" arguments:maps];
+}
+
+- (void)handleTransactionRestoreFailed:(NSError *)error {
+  FlutterError *fltError = [FlutterError errorWithCode:error.domain
+                                               message:error.description
+                                               details:error.description];
+  [self.callbackChannel invokeMethod:@"restoreCompletedTransactions" arguments:fltError];
+}
+
+- (void)restoreCompletedTransactionsFinished {
+  [self.callbackChannel invokeMethod:@"paymentQueueRestoreCompletedTransactionsFinished"
+                           arguments:nil];
+}
+
+- (void)updatedDownloads:(NSArray<SKDownload *> *)downloads {
+  NSMutableArray *maps = [NSMutableArray new];
+  for (SKDownload *download in downloads) {
+    [maps addObject:[FIAObjectTranslator getMapFromSKDownload:download]];
+  }
+  [self.callbackChannel invokeMethod:@"updatedDownloads" arguments:maps];
+}
+
+- (BOOL)shouldAddStorePayment:(SKPayment *)payment product:(SKProduct *)product {
+  // We always return NO here. And we send the message to dart to process the payment; and we will
+  // have a interception method that deciding if the payment should be processed (implemented by the
+  // programmer).
+  [self.productsCache setObject:product forKey:product.productIdentifier];
+  [self.paymentsCache setObject:payment forKey:payment.productIdentifier];
+  [self.callbackChannel invokeMethod:@"shouldAddStorePayment"
+                           arguments:@{
+                             @"payment" : [FIAObjectTranslator getMapFromSKPayment:payment],
+                             @"product" : [FIAObjectTranslator getMapFromSKProduct:product]
+                           }];
+  return NO;
+}
+
+#pragma mark - dependency injection (for unit testing)
+
 - (SKProductsRequest *)getProductRequestWithIdentifiers:(NSSet *)identifiers {
   return [[SKProductsRequest alloc] initWithProductIdentifiers:identifiers];
 }
@@ -88,4 +307,18 @@ - (NSSet *)requestHandlers {
   return _requestHandlers;
 }
 
+- (NSMutableDictionary *)productsCache {
+  if (!_productsCache) {
+    _productsCache = [NSMutableDictionary new];
+  }
+  return _productsCache;
+}
+
+- (NSMutableDictionary *)paymentsCache {
+  if (!_paymentsCache) {
+    _paymentsCache = [NSMutableDictionary new];
+  }
+  return _paymentsCache;
+}
+
 @end

From 3b9a34192561a45ed175492ab10d6e0ef90f4c95 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Feb 2019 07:21:39 -0800
Subject: [PATCH 146/410] fix firestore multiple app support for
 DocumentSnapshot and transactions (#1209)

fix firestore multiple app support
---
 packages/cloud_firestore/CHANGELOG.md                    | 4 ++++
 packages/cloud_firestore/lib/src/document_reference.dart | 2 +-
 packages/cloud_firestore/lib/src/transaction.dart        | 2 +-
 packages/cloud_firestore/pubspec.yaml                    | 2 +-
 packages/cloud_firestore/test/cloud_firestore_test.dart  | 5 ++++-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 7478257ce671..ff5344500da4 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.1
+
+* Fixed Firebase multiple app support in transactions and document snapshots.
+
 ## 0.9.0+2
 
 * Remove categories.
diff --git a/packages/cloud_firestore/lib/src/document_reference.dart b/packages/cloud_firestore/lib/src/document_reference.dart
index bc0c540f22b9..62f95252af7d 100644
--- a/packages/cloud_firestore/lib/src/document_reference.dart
+++ b/packages/cloud_firestore/lib/src/document_reference.dart
@@ -88,7 +88,7 @@ class DocumentReference {
     return DocumentSnapshot._(
       data['path'],
       _asStringKeyedMap(data['data']),
-      Firestore.instance,
+      firestore,
     );
   }
 
diff --git a/packages/cloud_firestore/lib/src/transaction.dart b/packages/cloud_firestore/lib/src/transaction.dart
index ac957437f9a4..734c942f53fe 100644
--- a/packages/cloud_firestore/lib/src/transaction.dart
+++ b/packages/cloud_firestore/lib/src/transaction.dart
@@ -25,7 +25,7 @@ class Transaction {
     });
     if (result != null) {
       return DocumentSnapshot._(documentReference.path,
-          result['data']?.cast<String, dynamic>(), Firestore.instance);
+          result['data']?.cast<String, dynamic>(), _firestore);
     } else {
       return null;
     }
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 7adb10deab98..ed3b5c12c93b 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.0+2
+version: 0.9.1
 
 flutter:
   plugin:
diff --git a/packages/cloud_firestore/test/cloud_firestore_test.dart b/packages/cloud_firestore/test/cloud_firestore_test.dart
index 08dcde54a0aa..0f6040bc0c8a 100755
--- a/packages/cloud_firestore/test/cloud_firestore_test.dart
+++ b/packages/cloud_firestore/test/cloud_firestore_test.dart
@@ -163,7 +163,9 @@ void main() {
       test('get', () async {
         final DocumentReference documentReference =
             firestore.document('foo/bar');
-        await transaction.get(documentReference);
+        final DocumentSnapshot snapshot =
+            await transaction.get(documentReference);
+        expect(snapshot.reference.firestore, firestore);
         expect(log, <Matcher>[
           isMethodCall('Transaction#get', arguments: <String, dynamic>{
             'app': app.name,
@@ -493,6 +495,7 @@ void main() {
       test('get', () async {
         final DocumentSnapshot snapshot =
             await collectionReference.document('bar').get();
+        expect(snapshot.reference.firestore, firestore);
         expect(
           log,
           equals(<Matcher>[

From 8044950c00a4434bf6e19a4a9339b73c855ad6f2 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Feb 2019 07:43:34 -0800
Subject: [PATCH 147/410] Fix IllegalStateException for cloud_firestore
 transactions (#1202)

Fix IllegalStateException for cloud_firestore
---
 packages/cloud_firestore/CHANGELOG.md                       | 4 ++++
 .../firebase/cloudfirestore/CloudFirestorePlugin.java       | 6 ++++--
 packages/cloud_firestore/pubspec.yaml                       | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index ff5344500da4..020bcc28d918 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.2
+
+* Fix IllegalStateException errors when using transactions on Android
+
 ## 0.9.1
 
 * Fixed Firebase multiple app support in transactions and document snapshots.
diff --git a/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
index fc73523ff9d7..c2451817546b 100644
--- a/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
+++ b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
@@ -286,14 +286,16 @@ public Void apply(@NonNull Transaction transaction)
                             @SuppressWarnings("unchecked")
                             @Override
                             public void success(Object doTransactionResult) {
-                              transactionTCS.setResult((Map<String, Object>) doTransactionResult);
+                              transactionTCS.trySetResult(
+                                  (Map<String, Object>) doTransactionResult);
                             }
 
                             @Override
                             public void error(
                                 String errorCode, String errorMessage, Object errorDetails) {
                               // result.error(errorCode, errorMessage, errorDetails);
-                              transactionTCS.setException(new Exception("Do transaction failed."));
+                              transactionTCS.trySetException(
+                                  new Exception("Do transaction failed."));
                             }
 
                             @Override
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index ed3b5c12c93b..8d946f2d1668 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.1
+version: 0.9.2
 
 flutter:
   plugin:

From 59ec54ba80e590e4e9ec4a3e02962e4f13990019 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Feb 2019 08:04:59 -0800
Subject: [PATCH 148/410] Remove assertion for firebase_core that can interfere
 with hot-restart (#1204)

---
 packages/firebase_core/CHANGELOG.md                 | 4 ++++
 packages/firebase_core/lib/src/firebase_app.dart    | 4 +---
 packages/firebase_core/pubspec.yaml                 | 2 +-
 packages/firebase_core/test/firebase_core_test.dart | 4 ----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md
index e608eb25223f..60386f7caaa6 100644
--- a/packages/firebase_core/CHANGELOG.md
+++ b/packages/firebase_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.1
+
+* Remove an assertion that can interfere with hot-restart.
+
 ## 0.3.0+2
 
 * Remove categories.
diff --git a/packages/firebase_core/lib/src/firebase_app.dart b/packages/firebase_core/lib/src/firebase_app.dart
index a48b67454fa4..041dbf10b650 100644
--- a/packages/firebase_core/lib/src/firebase_app.dart
+++ b/packages/firebase_core/lib/src/firebase_app.dart
@@ -57,8 +57,7 @@ class FirebaseApp {
   /// can interact with the default app should configure it automatically at
   /// plugin registration time.
   ///
-  /// Changing the options of a configured app is not supported. Reconfiguring
-  /// an existing app will assert that the options haven't changed.
+  /// Changing the options of a configured app is not supported.
   static Future<FirebaseApp> configure({
     @required String name,
     @required FirebaseOptions options,
@@ -69,7 +68,6 @@ class FirebaseApp {
     assert(options.googleAppID != null);
     final FirebaseApp existingApp = await FirebaseApp.appNamed(name);
     if (existingApp != null) {
-      assert(await existingApp.options == options);
       return existingApp;
     }
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml
index 97dafd7bb2cc..818ecf5b2603 100644
--- a/packages/firebase_core/pubspec.yaml
+++ b/packages/firebase_core/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Core, enabling connecting to multiple
   Firebase apps.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_core
-version: 0.3.0+2
+version: 0.3.1
 
 flutter:
   plugin:
diff --git a/packages/firebase_core/test/firebase_core_test.dart b/packages/firebase_core/test/firebase_core_test.dart
index 0b461ee31c0d..d42ccd951dda 100755
--- a/packages/firebase_core/test/firebase_core_test.dart
+++ b/packages/firebase_core/test/firebase_core_test.dart
@@ -80,10 +80,6 @@ void main() {
             'FirebaseApp#appNamed',
             arguments: 'testApp',
           ),
-          isMethodCall(
-            'FirebaseApp#appNamed',
-            arguments: 'testApp',
-          ),
           isMethodCall(
             'FirebaseApp#appNamed',
             arguments: 'newApp',

From 74d03f9a0c47c87207ae1a29988649c3cc952e5b Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Feb 2019 08:07:46 -0800
Subject: [PATCH 149/410] Fix iOS transactions when getting a snapshot that
 doesn't exist (#1206)

---
 packages/cloud_firestore/CHANGELOG.md                       | 4 ++++
 packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m | 4 +---
 packages/cloud_firestore/pubspec.yaml                       | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 020bcc28d918..f843a8597fd0 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.3
+
+* Fix transactions on iOS when getting snapshot that doesn't exist.
+
 ## 0.9.2
 
 * Fix IllegalStateException errors when using transactions on Android
diff --git a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
index e549825b7126..e0f2b495c99c 100644
--- a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
@@ -338,9 +338,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
           @"data" : snapshot.exists ? snapshot.data : [NSNull null]
         });
       } else {
-        result([FlutterError errorWithCode:@"DOCUMENT_NOT_FOUND"
-                                   message:@"Document not found."
-                                   details:nil]);
+        result(nil);
       }
     });
   } else if ([@"Transaction#update" isEqualToString:call.method]) {
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 8d946f2d1668..9723e297e7aa 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.2
+version: 0.9.3
 
 flutter:
   plugin:

From c96eb1bf358a3d6e3cf7847bb921c114168210c1 Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Thu, 21 Feb 2019 20:19:10 +0400
Subject: [PATCH 150/410] fix message structure from intent (#957)

Update message structure for onMessage to match onLaunch and onResume
---
 packages/firebase_messaging/CHANGELOG.md               |  5 +++++
 .../firebasemessaging/FirebaseMessagingPlugin.java     | 10 ++++++++--
 packages/firebase_messaging/pubspec.yaml               |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index a729641d0163..3ba712822738 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.0
+
+*  **Breaking Change** Update message structure for onMessage to match onLaunch and onResume
+
 ## 3.0.1
 
 * Log a more detailed warning at build time about the previous AndroidX
@@ -32,6 +36,7 @@
   requires any Android apps using this plugin to [also
   migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
   using the original support library.
+>>>>>>> origin/master
 
 ## 2.1.0
 
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
index 7cfa219d0019..2085eae9160f 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
@@ -168,20 +168,26 @@ public boolean onNewIntent(Intent intent) {
   private boolean sendMessageFromIntent(String method, Intent intent) {
     if (CLICK_ACTION_VALUE.equals(intent.getAction())
         || CLICK_ACTION_VALUE.equals(intent.getStringExtra("click_action"))) {
-      Map<String, String> message = new HashMap<>();
+      Map<String, Object> message = new HashMap<>();
       Bundle extras = intent.getExtras();
 
       if (extras == null) {
         return false;
       }
 
+      Map<String, Object> notificationMap = new HashMap<>();
+      Map<String, Object> dataMap = new HashMap<>();
+
       for (String key : extras.keySet()) {
         Object extra = extras.get(key);
         if (extra != null) {
-          message.put(key, extra.toString());
+          dataMap.put(key, extra);
         }
       }
 
+      message.put("notification", notificationMap);
+      message.put("data", dataMap);
+
       channel.invokeMethod(method, message);
       return true;
     }
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
index 98a1b578ab09..81895c42ae00 100644
--- a/packages/firebase_messaging/pubspec.yaml
+++ b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 3.0.1
+version: 4.0.0
 
 flutter:
   plugin:

From 3eb28657f376177a43daa5af87eafcf3601c1a49 Mon Sep 17 00:00:00 2001
From: Hirohisa Kawasaki <hirohisa.kawasaki@gmail.com>
Date: Fri, 22 Feb 2019 02:16:23 +0900
Subject: [PATCH 151/410] Bugfix documents: (#1242)

webview_flutter JavascriptChannel, Example is not updated.
---
 packages/webview_flutter/lib/webview_flutter.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index bcace13ca1be..648f75a33f84 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -112,7 +112,7 @@ class WebView extends StatefulWidget {
   /// For example for the following JavascriptChannel:
   ///
   /// ```dart
-  /// JavascriptChannel(name: 'Print', onMessageReceived: (String message) { print(message); });
+  /// JavascriptChannel(name: 'Print', onMessageReceived: (JavascriptMessage message) { print(message); });
   /// ```
   ///
   /// JavaScript code can call:

From abc33ca51bc01951dfe05211c3e040f140590a1f Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Feb 2019 09:33:09 -0800
Subject: [PATCH 152/410] =?UTF-8?q?Don=E2=80=99t=20send=20empty=20cloud=5F?=
 =?UTF-8?q?firestore=20snapshots=20on=20iOS=20when=20encountering=20errors?=
 =?UTF-8?q?=20(#1203)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cloud_firestore/CHANGELOG.md                  |  6 +++++-
 .../cloud_firestore/ios/Classes/CloudFirestorePlugin.m | 10 ++++++++--
 packages/cloud_firestore/pubspec.yaml                  |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index f843a8597fd0..4cfae5dc11d5 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,10 +1,14 @@
+## 0.9.4
+
+* No longer sends empty snapshot events on iOS when encountering errors.
+
 ## 0.9.3
 
 * Fix transactions on iOS when getting snapshot that doesn't exist.
 
 ## 0.9.2
 
-* Fix IllegalStateException errors when using transactions on Android
+* Fix IllegalStateException errors when using transactions on Android.
 
 ## 0.9.1
 
diff --git a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
index e0f2b495c99c..9566795df26f 100644
--- a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
@@ -408,7 +408,10 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     }
     id<FIRListenerRegistration> listener = [query
         addSnapshotListener:^(FIRQuerySnapshot *_Nullable snapshot, NSError *_Nullable error) {
-          if (error) result(getFlutterError(error));
+          if (error) {
+            result(getFlutterError(error));
+            return;
+          }
           NSMutableDictionary *arguments = [parseQuerySnapshot(snapshot) mutableCopy];
           [arguments setObject:handle forKey:@"handle"];
           [self.channel invokeMethod:@"QuerySnapshot" arguments:arguments];
@@ -420,7 +423,10 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     FIRDocumentReference *document = getDocumentReference(call.arguments);
     id<FIRListenerRegistration> listener =
         [document addSnapshotListener:^(FIRDocumentSnapshot *snapshot, NSError *_Nullable error) {
-          if (error) result(getFlutterError(error));
+          if (error) {
+            result(getFlutterError(error));
+            return;
+          }
           [self.channel invokeMethod:@"DocumentSnapshot"
                            arguments:@{
                              @"handle" : handle,
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 9723e297e7aa..398c7b06de87 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.3
+version: 0.9.4
 
 flutter:
   plugin:

From 99083ab0005b0a883816304d1b83c1242835b400 Mon Sep 17 00:00:00 2001
From: Chris Yang <cyang8954@gmail.com>
Date: Thu, 21 Feb 2019 09:33:56 -0800
Subject: [PATCH 153/410] remove left over conflict marker (#1248)

---
 packages/firebase_messaging/CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index 3ba712822738..dce985f8642e 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -36,7 +36,6 @@
   requires any Android apps using this plugin to [also
   migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
   using the original support library.
->>>>>>> origin/master
 
 ## 2.1.0
 

From b9155d2b69b4022abfaa80de7c3ecdc45eb7575d Mon Sep 17 00:00:00 2001
From: Yasutaka Kawamoto <kwmt27@gmail.com>
Date: Fri, 22 Feb 2019 03:38:18 +0900
Subject: [PATCH 154/410] Fixed typo (#936)

---
 packages/firebase_ml_vision/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/firebase_ml_vision/README.md b/packages/firebase_ml_vision/README.md
index b3b2d4684c38..4dcd1c491f29 100644
--- a/packages/firebase_ml_vision/README.md
+++ b/packages/firebase_ml_vision/README.md
@@ -102,7 +102,7 @@ for (Barcode barcode in barcodes) {
 
   final String rawValue = barcode.rawValue;
 
-  final BarcordeValueType valueType = barcode.valueType;
+  final BarcodeValueType valueType = barcode.valueType;
 
   // See API reference for complete list of supported types
   switch (valueType) {

From 5ca07693b5280640f4485ca9636d78d976aa36a0 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Feb 2019 10:39:04 -0800
Subject: [PATCH 155/410] Fix cloud_firestore dates on some iOS devices (#1207)

---
 packages/cloud_firestore/CHANGELOG.md                       | 4 ++++
 packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m | 3 +--
 packages/cloud_firestore/pubspec.yaml                       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 4cfae5dc11d5..4804faed984b 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.5
+
+* Fix an issue on some iOS devices that results in reading incorrect dates.
+
 ## 0.9.4
 
 * No longer sends empty snapshot events on iOS when encountering errors.
diff --git a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
index 9566795df26f..62628ea9b3de 100644
--- a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
@@ -183,8 +183,7 @@ - (id)readValueOfType:(UInt8)type {
     case DATE_TIME: {
       SInt64 value;
       [self readBytes:&value length:8];
-      NSTimeInterval time = [NSNumber numberWithLong:value].doubleValue / 1000.0;
-      return [NSDate dateWithTimeIntervalSince1970:time];
+      return [NSDate dateWithTimeIntervalSince1970:(value / 1000.0)];
     }
     case TIMESTAMP: {
       SInt64 seconds;
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 398c7b06de87..eafac73941d9 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.4
+version: 0.9.5
 
 flutter:
   plugin:

From b276b6b8fab965e0ff0af4fdb4b4f9766c407b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20G=C3=B6decken?= <MasterCarl@users.noreply.github.com>
Date: Thu, 21 Feb 2019 20:37:01 +0100
Subject: [PATCH 156/410] [firebase-analytics] Enable
 setAnalyticsCollectionEnabled support for iOS (#896)

---
 packages/firebase_analytics/CHANGELOG.md         |  4 ++++
 .../firebase_analytics/example/lib/main.dart     |  4 ++--
 .../ios/Classes/FirebaseAnalyticsPlugin.m        |  4 ++++
 .../lib/firebase_analytics.dart                  | 16 ++++++++++++++++
 packages/firebase_analytics/pubspec.yaml         |  2 +-
 .../test/firebase_analytics_test.dart            |  2 +-
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index e657960f5b7e..10063d1a9ad1 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.2
+
+* Enable setAnalyticsCollectionEnabled support for iOS
+
 ## 2.0.1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/firebase_analytics/example/lib/main.dart b/packages/firebase_analytics/example/lib/main.dart
index 644955283730..5b6fd6307b16 100755
--- a/packages/firebase_analytics/example/lib/main.dart
+++ b/packages/firebase_analytics/example/lib/main.dart
@@ -89,8 +89,8 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   Future<void> _testSetAnalyticsCollectionEnabled() async {
-    await analytics.android?.setAnalyticsCollectionEnabled(false);
-    await analytics.android?.setAnalyticsCollectionEnabled(true);
+    await analytics.setAnalyticsCollectionEnabled(false);
+    await analytics.setAnalyticsCollectionEnabled(true);
     setMessage('setAnalyticsCollectionEnabled succeeded');
   }
 
diff --git a/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m b/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m
index 2a8750af023f..5a1a3a301955 100644
--- a/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m
+++ b/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m
@@ -53,6 +53,10 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     NSString *value = call.arguments[@"value"];
     [FIRAnalytics setUserPropertyString:value forName:name];
     result(nil);
+  } else if ([@"setAnalyticsCollectionEnabled" isEqualToString:call.method]) {
+    NSNumber *enabled = [NSNumber numberWithBool:call.arguments];
+    [[FIRAnalyticsConfiguration sharedInstance] setAnalyticsCollectionEnabled:[enabled boolValue]];
+    result(nil);
   } else {
     result(FlutterMethodNotImplemented);
   }
diff --git a/packages/firebase_analytics/lib/firebase_analytics.dart b/packages/firebase_analytics/lib/firebase_analytics.dart
index c99d9b152077..de7a0d81e4a1 100755
--- a/packages/firebase_analytics/lib/firebase_analytics.dart
+++ b/packages/firebase_analytics/lib/firebase_analytics.dart
@@ -64,6 +64,20 @@ class FirebaseAnalytics {
     });
   }
 
+  /// Sets whether analytics collection is enabled for this app on this device.
+  ///
+  /// This setting is persisted across app sessions. By default it is enabled.
+  Future<void> setAnalyticsCollectionEnabled(bool enabled) async {
+    if (enabled == null) {
+      throw ArgumentError.notNull('enabled');
+    }
+
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    await _channel.invokeMethod('setAnalyticsCollectionEnabled', enabled);
+  }
+
   /// Sets the user ID property.
   ///
   /// This feature must be used in accordance with [Google's Privacy Policy][1].
@@ -794,6 +808,8 @@ class FirebaseAnalyticsAndroid {
   /// Sets whether analytics collection is enabled for this app on this device.
   ///
   /// This setting is persisted across app sessions. By default it is enabled.
+  /// Deprecated: Use [FirebaseAnalytics.setAnalyticsCollectionEnabled] instead.
+  @deprecated
   Future<void> setAnalyticsCollectionEnabled(bool enabled) async {
     if (enabled == null) {
       throw ArgumentError.notNull('enabled');
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index e8f889cfd166..2b47fe657a44 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 2.0.1
+version: 2.0.2
 
 flutter:
   plugin:
diff --git a/packages/firebase_analytics/test/firebase_analytics_test.dart b/packages/firebase_analytics/test/firebase_analytics_test.dart
index 7f57220994eb..2c0339e34e51 100755
--- a/packages/firebase_analytics/test/firebase_analytics_test.dart
+++ b/packages/firebase_analytics/test/firebase_analytics_test.dart
@@ -98,7 +98,7 @@ void main() {
     });
 
     test('setAnalyticsCollectionEnabled', () async {
-      await analytics.android.setAnalyticsCollectionEnabled(false);
+      await analytics.setAnalyticsCollectionEnabled(false);
       expect(invokedMethod, 'setAnalyticsCollectionEnabled');
       expect(arguments, false);
     });

From 2db554ebf8b52ac904941ef2888ac22dfd6b29a6 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Feb 2019 11:46:04 -0800
Subject: [PATCH 157/410] cloud functions multiple app support (#1210)

---
 packages/cloud_functions/CHANGELOG.md         |  4 ++
 .../cloudfunctions/CloudFunctionsPlugin.java  | 13 +++-
 .../ios/Classes/CloudFunctionsPlugin.m        | 68 +++++++++++--------
 .../cloud_functions/lib/cloud_functions.dart  | 11 +++
 packages/cloud_functions/pubspec.yaml         |  4 +-
 .../test/cloud_functions_test.dart            |  8 ++-
 6 files changed, 74 insertions(+), 34 deletions(-)

diff --git a/packages/cloud_functions/CHANGELOG.md b/packages/cloud_functions/CHANGELOG.md
index 109160f13283..84d237dea5ed 100644
--- a/packages/cloud_functions/CHANGELOG.md
+++ b/packages/cloud_functions/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.1
+
+* Support for regions and multiple apps
+
 ## 0.1.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/cloudfunctions/cloudfunctions/CloudFunctionsPlugin.java b/packages/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/cloudfunctions/cloudfunctions/CloudFunctionsPlugin.java
index 2851480bfb1a..c9d0da6026e6 100644
--- a/packages/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/cloudfunctions/cloudfunctions/CloudFunctionsPlugin.java
+++ b/packages/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/cloudfunctions/cloudfunctions/CloudFunctionsPlugin.java
@@ -7,6 +7,7 @@
 import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
+import com.google.firebase.FirebaseApp;
 import com.google.firebase.functions.FirebaseFunctions;
 import com.google.firebase.functions.FirebaseFunctionsException;
 import com.google.firebase.functions.HttpsCallableReference;
@@ -32,9 +33,17 @@ public void onMethodCall(MethodCall call, final Result result) {
     switch (call.method) {
       case "CloudFunctions#call":
         String functionName = call.argument("functionName");
-        HttpsCallableReference httpsCallableReference =
-            FirebaseFunctions.getInstance().getHttpsCallable(functionName);
         Map<String, Object> parameters = call.argument("parameters");
+        String appName = call.argument("app");
+        FirebaseApp app = FirebaseApp.getInstance(appName);
+        String region = call.argument("region");
+        FirebaseFunctions functions;
+        if (region != null) {
+          functions = FirebaseFunctions.getInstance(app, region);
+        } else {
+          functions = FirebaseFunctions.getInstance(app);
+        }
+        HttpsCallableReference httpsCallableReference = functions.getHttpsCallable(functionName);
         httpsCallableReference
             .call(parameters)
             .addOnCompleteListener(
diff --git a/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m b/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m
index 701c5efb3466..b1e2aca5aaac 100644
--- a/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m
+++ b/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m
@@ -35,36 +35,46 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
   if ([@"CloudFunctions#call" isEqualToString:call.method]) {
     NSString *functionName = call.arguments[@"functionName"];
     NSObject *parameters = call.arguments[@"parameters"];
-    [[FIRFunctions functions]
-        callFunction:functionName
-          withObject:parameters
-          completion:^(FIRHTTPSCallableResult *callableResult, NSError *error) {
-            if (error) {
-              FlutterError *flutterError;
-              if (error.domain == FIRFunctionsErrorDomain) {
-                NSDictionary *details = [NSMutableDictionary dictionary];
-                [details setValue:[self mapFunctionsErrorCodes:error.code] forKey:@"code"];
-                if (error.localizedDescription != nil) {
-                  [details setValue:error.localizedDescription forKey:@"message"];
-                }
-                if (error.userInfo[FIRFunctionsErrorDetailsKey] != nil) {
-                  [details setValue:error.userInfo[FIRFunctionsErrorDetailsKey] forKey:@"details"];
-                }
+    NSString *appName = call.arguments[@"app"];
+    NSString *region = call.arguments[@"region"];
+    FIRApp *app = [FIRApp appNamed:appName];
+    FIRFunctions *functions;
+    if (region != nil) {
+      functions = [FIRFunctions functionsForApp:app region:region];
+    } else {
+      functions = [FIRFunctions functionsForApp:app];
+    }
+    [functions callFunction:functionName
+                 withObject:parameters
+                 completion:^(FIRHTTPSCallableResult *callableResult, NSError *error) {
+                   if (error) {
+                     FlutterError *flutterError;
+                     if (error.domain == FIRFunctionsErrorDomain) {
+                       NSDictionary *details = [NSMutableDictionary dictionary];
+                       [details setValue:[self mapFunctionsErrorCodes:error.code] forKey:@"code"];
+                       if (error.localizedDescription != nil) {
+                         [details setValue:error.localizedDescription forKey:@"message"];
+                       }
+                       if (error.userInfo[FIRFunctionsErrorDetailsKey] != nil) {
+                         [details setValue:error.userInfo[FIRFunctionsErrorDetailsKey]
+                                    forKey:@"details"];
+                       }
 
-                flutterError =
-                    [FlutterError errorWithCode:@"functionsError"
-                                        message:@"Firebase function failed with exception."
-                                        details:details];
-              } else {
-                flutterError = [FlutterError errorWithCode:nil
-                                                   message:error.localizedDescription
-                                                   details:nil];
-              }
-              result(flutterError);
-            } else {
-              result(callableResult.data);
-            }
-          }];
+                       flutterError =
+                           [FlutterError errorWithCode:@"functionsError"
+                                               message:@"Firebase function failed with exception."
+                                               details:details];
+                     } else {
+                       flutterError = [FlutterError
+                           errorWithCode:[NSString stringWithFormat:@"%ld", error.code]
+                                 message:error.localizedDescription
+                                 details:nil];
+                     }
+                     result(flutterError);
+                   } else {
+                     result(callableResult.data);
+                   }
+                 }];
   } else {
     result(FlutterMethodNotImplemented);
   }
diff --git a/packages/cloud_functions/lib/cloud_functions.dart b/packages/cloud_functions/lib/cloud_functions.dart
index 59c8e4501cd1..92ede2c33184 100644
--- a/packages/cloud_functions/lib/cloud_functions.dart
+++ b/packages/cloud_functions/lib/cloud_functions.dart
@@ -4,6 +4,7 @@
 
 import 'dart:async';
 
+import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
 
@@ -19,6 +20,10 @@ class CloudFunctionsException implements Exception {
 ///
 /// You can get an instance by calling [CloudFunctions.instance].
 class CloudFunctions {
+  CloudFunctions({FirebaseApp app, String region})
+      : _app = app ?? FirebaseApp.instance,
+        _region = region;
+
   @visibleForTesting
   static const MethodChannel channel = MethodChannel('cloud_functions');
 
@@ -26,6 +31,10 @@ class CloudFunctions {
 
   static CloudFunctions get instance => _instance;
 
+  final FirebaseApp _app;
+
+  final String _region;
+
   /// Executes this Callable HTTPS trigger asynchronously.
   ///
   /// @param functionName The name of the callable function being triggered.
@@ -38,6 +47,8 @@ class CloudFunctions {
           // https://github.com/flutter/flutter/issues/26431
           // ignore: strong_mode_implicit_dynamic_method
           await channel.invokeMethod('CloudFunctions#call', <String, dynamic>{
+        'app': _app.name,
+        'region': _region,
         'functionName': functionName,
         'parameters': parameters,
       });
diff --git a/packages/cloud_functions/pubspec.yaml b/packages/cloud_functions/pubspec.yaml
index 78ad901e200e..c7771c0df7fa 100644
--- a/packages/cloud_functions/pubspec.yaml
+++ b/packages/cloud_functions/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cloud_functions
 description: Flutter plugin for Cloud Functions.
-version: 0.1.0+1
+version: 0.1.1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_functions
 
@@ -13,11 +13,11 @@ dependencies:
   meta: ^1.1.6
   flutter:
     sdk: flutter
+  firebase_core: ^0.3.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.3.0
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
diff --git a/packages/cloud_functions/test/cloud_functions_test.dart b/packages/cloud_functions/test/cloud_functions_test.dart
index 51bf3f0a1edc..8fc18cb6db65 100644
--- a/packages/cloud_functions/test/cloud_functions_test.dart
+++ b/packages/cloud_functions/test/cloud_functions_test.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:cloud_functions/cloud_functions.dart';
+import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -28,7 +29,8 @@ void main() {
 
     test('call', () async {
       await CloudFunctions.instance.call(functionName: 'baz');
-      await CloudFunctions.instance
+      await CloudFunctions(
+              app: const FirebaseApp(name: '1337'), region: 'space')
           .call(functionName: 'qux', parameters: <String, dynamic>{
         'quux': 'quuz',
       });
@@ -38,6 +40,8 @@ void main() {
           isMethodCall(
             'CloudFunctions#call',
             arguments: <String, dynamic>{
+              'app': '[DEFAULT]',
+              'region': null,
               'functionName': 'baz',
               'parameters': null,
             },
@@ -45,6 +49,8 @@ void main() {
           isMethodCall(
             'CloudFunctions#call',
             arguments: <String, dynamic>{
+              'app': '1337',
+              'region': 'space',
               'functionName': 'qux',
               'parameters': <String, dynamic>{
                 'quux': 'quuz',

From 365cf6dde23842f2441e752d7c51828f0b870630 Mon Sep 17 00:00:00 2001
From: Ben Konyi <bkonyi@google.com>
Date: Thu, 21 Feb 2019 13:33:49 -0800
Subject: [PATCH 158/410] Update android_alarm_manager with instructions on
 setting WAKE_LOCK permissions (#1251)

* Update README.md with WAKE_LOCK permission
* Update example with WAKE_LOCK permission
---
 packages/android_alarm_manager/CHANGELOG.md                  | 5 +++++
 packages/android_alarm_manager/README.md                     | 1 +
 .../example/android/app/src/main/AndroidManifest.xml         | 1 +
 packages/android_alarm_manager/pubspec.yaml                  | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index f5f895d54a1a..3eedeee31ba5 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.1+3
+
+* Update README.md to include instructions for setting the WAKE_LOCK permission.
+* Updated example application to use the WAKE_LOCK permission.
+
 ## 0.4.1+2
 
 * Include a missing API dependency.
diff --git a/packages/android_alarm_manager/README.md b/packages/android_alarm_manager/README.md
index 33aeacd5adae..35a0787c6ab9 100644
--- a/packages/android_alarm_manager/README.md
+++ b/packages/android_alarm_manager/README.md
@@ -12,6 +12,7 @@ After importing this plugin to your project as usual, add the following to your
 
 ```xml
 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+<uses-permission android:name="android.permission.WAKE_LOCK"/>
 ```
 
 Next, within the `<application></application>` tags, add:
diff --git a/packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml b/packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml
index 862e20924a0d..7d87c6e1aae0 100644
--- a/packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/android_alarm_manager/example/android/app/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
     package="io.flutter.plugins.androidalarmmanagerexample">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index 491602e47bed..d0b36c3a73fd 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -1,7 +1,7 @@
 name: android_alarm_manager
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.4.1+2
+version: 0.4.1+3
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 

From 7e22fb8833e0c9780e53ef614aa4900cce13bfcd Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Feb 2019 13:45:57 -0800
Subject: [PATCH 159/410] Flutterfire apps no longer show a confusing log
 message about configuring default app (#1192)

---
 packages/cloud_firestore/CHANGELOG.md                        | 4 ++++
 packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m  | 4 +++-
 packages/cloud_firestore/pubspec.yaml                        | 2 +-
 packages/cloud_functions/CHANGELOG.md                        | 4 ++++
 packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m  | 4 +++-
 packages/cloud_functions/pubspec.yaml                        | 2 +-
 packages/firebase_admob/CHANGELOG.md                         | 4 ++++
 packages/firebase_admob/ios/Classes/FirebaseAdMobPlugin.m    | 5 +++--
 packages/firebase_admob/pubspec.yaml                         | 2 +-
 packages/firebase_analytics/CHANGELOG.md                     | 4 ++++
 .../firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m | 4 +++-
 packages/firebase_analytics/pubspec.yaml                     | 2 +-
 packages/firebase_auth/CHANGELOG.md                          | 4 ++++
 packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m      | 4 +++-
 packages/firebase_auth/pubspec.yaml                          | 2 +-
 packages/firebase_database/CHANGELOG.md                      | 4 ++++
 .../firebase_database/ios/Classes/FirebaseDatabasePlugin.m   | 4 +++-
 packages/firebase_dynamic_links/CHANGELOG.md                 | 4 ++++
 .../ios/Classes/FirebaseDynamicLinksPlugin.m                 | 4 +++-
 packages/firebase_dynamic_links/pubspec.yaml                 | 2 +-
 packages/firebase_messaging/CHANGELOG.md                     | 4 ++++
 .../firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m | 4 +++-
 packages/firebase_messaging/pubspec.yaml                     | 2 +-
 packages/firebase_ml_vision/CHANGELOG.md                     | 4 ++++
 .../firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m  | 4 +++-
 packages/firebase_ml_vision/pubspec.yaml                     | 2 +-
 packages/firebase_performance/CHANGELOG.md                   | 4 ++++
 .../ios/Classes/FirebasePerformancePlugin.m                  | 4 +++-
 packages/firebase_performance/pubspec.yaml                   | 2 +-
 packages/firebase_remote_config/CHANGELOG.md                 | 4 ++++
 .../ios/Classes/FirebaseRemoteConfigPlugin.m                 | 4 +++-
 packages/firebase_remote_config/pubspec.yaml                 | 2 +-
 packages/firebase_storage/CHANGELOG.md                       | 4 ++++
 .../firebase_storage/ios/Classes/FirebaseStoragePlugin.m     | 4 +++-
 34 files changed, 94 insertions(+), 23 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 4804faed984b..7b5e33f8ab47 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.5+1
+
+* Log messages about automatic configuration of the default app are now less confusing.
+
 ## 0.9.5
 
 * Fix an issue on some iOS devices that results in reading incorrect dates.
diff --git a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
index 62628ea9b3de..ca56ec320a06 100644
--- a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
@@ -270,8 +270,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 - (instancetype)init {
   self = [super init];
   if (self) {
-    if (![FIRApp defaultApp]) {
+    if (![FIRApp appNamed:@"__FIRAPP_DEFAULT"]) {
+      NSLog(@"Configuring the default Firebase app...");
       [FIRApp configure];
+      NSLog(@"Configured the default Firebase app %@.", [FIRApp defaultApp].name);
     }
     _listeners = [NSMutableDictionary<NSNumber *, id<FIRListenerRegistration>> dictionary];
     _batches = [NSMutableDictionary<NSNumber *, FIRWriteBatch *> dictionary];
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index eafac73941d9..c95162ae8b34 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.5
+version: 0.9.5+1
 
 flutter:
   plugin:
diff --git a/packages/cloud_functions/CHANGELOG.md b/packages/cloud_functions/CHANGELOG.md
index 84d237dea5ed..47cd49f8c1b1 100644
--- a/packages/cloud_functions/CHANGELOG.md
+++ b/packages/cloud_functions/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.1+1
+
+* Log messages about automatic configuration of the default app are now less confusing.
+
 ## 0.1.1
 
 * Support for regions and multiple apps
diff --git a/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m b/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m
index b1e2aca5aaac..0ac54ac92459 100644
--- a/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m
+++ b/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m
@@ -24,8 +24,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 - (instancetype)init {
   self = [super init];
   if (self) {
-    if (![FIRApp defaultApp]) {
+    if (![FIRApp appNamed:@"__FIRAPP_DEFAULT"]) {
+      NSLog(@"Configuring the default Firebase app...");
       [FIRApp configure];
+      NSLog(@"Configured the default Firebase app %@.", [FIRApp defaultApp].name);
     }
   }
   return self;
diff --git a/packages/cloud_functions/pubspec.yaml b/packages/cloud_functions/pubspec.yaml
index c7771c0df7fa..4efaa4fbc660 100644
--- a/packages/cloud_functions/pubspec.yaml
+++ b/packages/cloud_functions/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cloud_functions
 description: Flutter plugin for Cloud Functions.
-version: 0.1.1
+version: 0.1.1+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_functions
 
diff --git a/packages/firebase_admob/CHANGELOG.md b/packages/firebase_admob/CHANGELOG.md
index 0fa0817fbbcc..5863bb5558a0 100644
--- a/packages/firebase_admob/CHANGELOG.md
+++ b/packages/firebase_admob/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.0+3
+
+* Log messages about automatic configuration of the default app are now less confusing.
+
 ## 0.8.0+2
 
 * Remove categories.
diff --git a/packages/firebase_admob/ios/Classes/FirebaseAdMobPlugin.m b/packages/firebase_admob/ios/Classes/FirebaseAdMobPlugin.m
index db28486cfdbd..82afa217b362 100644
--- a/packages/firebase_admob/ios/Classes/FirebaseAdMobPlugin.m
+++ b/packages/firebase_admob/ios/Classes/FirebaseAdMobPlugin.m
@@ -28,9 +28,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 
 - (instancetype)init {
   self = [super init];
-  if (self && ![FIRApp defaultApp]) {
-    FLTLogWarning(@"[FIRApp configure]");
+  if (self && ![FIRApp appNamed:@"__FIRAPP_DEFAULT"]) {
+    NSLog(@"Configuring the default Firebase app...");
     [FIRApp configure];
+    NSLog(@"Configured the default Firebase app %@.", [FIRApp defaultApp].name);
   }
   return self;
 }
diff --git a/packages/firebase_admob/pubspec.yaml b/packages/firebase_admob/pubspec.yaml
index dd58a2901001..196b9a3e08bf 100644
--- a/packages/firebase_admob/pubspec.yaml
+++ b/packages/firebase_admob/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_admob
 description: Firebase AdMob plugin for Flutter applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_admob
-version: 0.8.0+2
+version: 0.8.0+3
 
 flutter:
   plugin:
diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index 10063d1a9ad1..4642488475d9 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.2+1
+
+* Log messages about automatic configuration of the default app are now less confusing.
+
 ## 2.0.2
 
 * Enable setAnalyticsCollectionEnabled support for iOS
diff --git a/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m b/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m
index 5a1a3a301955..6ae3d92d3952 100644
--- a/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m
+++ b/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m
@@ -20,8 +20,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 - (instancetype)init {
   self = [super init];
   if (self) {
-    if (![FIRApp defaultApp]) {
+    if (![FIRApp appNamed:@"__FIRAPP_DEFAULT"]) {
+      NSLog(@"Configuring the default Firebase app...");
       [FIRApp configure];
+      NSLog(@"Configured the default Firebase app %@.", [FIRApp defaultApp].name);
     }
   }
   return self;
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index 2b47fe657a44..6ca58cdcc1cd 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 2.0.2
+version: 2.0.2+1
 
 flutter:
   plugin:
diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index bdd8cb74f7dc..f8cf387b89f2 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.1+2
+
+* Log messages about automatic configuration of the default app are now less confusing.
+
 ## 0.8.1+1
 
 * Remove categories.
diff --git a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
index 14371ded50c4..b9b2191d3e38 100644
--- a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
+++ b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
@@ -48,8 +48,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 - (instancetype)init {
   self = [super init];
   if (self) {
-    if (![FIRApp defaultApp]) {
+    if (![FIRApp appNamed:@"__FIRAPP_DEFAULT"]) {
+      NSLog(@"Configuring the default Firebase app...");
       [FIRApp configure];
+      NSLog(@"Configured the default Firebase app %@.", [FIRApp defaultApp].name);
     }
   }
   return self;
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 69bd8e6ed2eb..d5395ab5304f 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.1+1"
+version: "0.8.1+2"
 
 flutter:
   plugin:
diff --git a/packages/firebase_database/CHANGELOG.md b/packages/firebase_database/CHANGELOG.md
index cb1737eeef10..4b6b09036047 100644
--- a/packages/firebase_database/CHANGELOG.md
+++ b/packages/firebase_database/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.1+2
+
+* Log messages about automatic configuration of the default app are now less confusing.
+
 ## 2.0.1+1
 
 * Remove categories.
diff --git a/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m b/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m
index ad8a6e46ca33..b375a44acd5e 100644
--- a/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m
+++ b/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m
@@ -144,8 +144,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 - (instancetype)init {
   self = [super init];
   if (self) {
-    if (![FIRApp defaultApp]) {
+    if (![FIRApp appNamed:@"__FIRAPP_DEFAULT"]) {
+      NSLog(@"Configuring the default Firebase app...");
       [FIRApp configure];
+      NSLog(@"Configured the default Firebase app %@.", [FIRApp defaultApp].name);
     }
     self.updatedSnapshots = [NSMutableDictionary new];
   }
diff --git a/packages/firebase_dynamic_links/CHANGELOG.md b/packages/firebase_dynamic_links/CHANGELOG.md
index e3403b195ae6..8b9a52c02253 100644
--- a/packages/firebase_dynamic_links/CHANGELOG.md
+++ b/packages/firebase_dynamic_links/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0+3
+
+* Log messages about automatic configuration of the default app are now less confusing.
+
 ## 0.2.0+2
 
 * Remove categories.
diff --git a/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m b/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
index 7b3888db4a84..1f019127ffab 100644
--- a/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
+++ b/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
@@ -25,8 +25,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 - (instancetype)init {
   self = [super init];
   if (self) {
-    if (![FIRApp defaultApp]) {
+    if (![FIRApp appNamed:@"__FIRAPP_DEFAULT"]) {
+      NSLog(@"Configuring the default Firebase app...");
       [FIRApp configure];
+      NSLog(@"Configured the default Firebase app %@.", [FIRApp defaultApp].name);
     }
   }
   return self;
diff --git a/packages/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/pubspec.yaml
index c5098734c87b..89de7a16124f 100644
--- a/packages/firebase_dynamic_links/pubspec.yaml
+++ b/packages/firebase_dynamic_links/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_dynamic_links
 description: Flutter plugin for Google Dynamic Links for Firebase, an app solution for creating
   and handling links across multiple platforms.
-version: 0.2.0+2
+version: 0.2.0+3
 
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_dynamic_links
diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index dce985f8642e..1f2e0374f5c3 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.1+1
+
+* Log messages about automatic configuration of the default app are now less confusing.
+
 ## 4.0.0
 
 *  **Breaking Change** Update message structure for onMessage to match onLaunch and onResume
diff --git a/packages/firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m b/packages/firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m
index fa50efc5579d..17e64304e923 100644
--- a/packages/firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m
+++ b/packages/firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m
@@ -33,8 +33,10 @@ - (instancetype)initWithChannel:(FlutterMethodChannel *)channel {
   if (self) {
     _channel = channel;
     _resumingFromBackground = NO;
-    if (![FIRApp defaultApp]) {
+    if (![FIRApp appNamed:@"__FIRAPP_DEFAULT"]) {
+      NSLog(@"Configuring the default Firebase app...");
       [FIRApp configure];
+      NSLog(@"Configured the default Firebase app %@.", [FIRApp defaultApp].name);
     }
     [FIRMessaging messaging].delegate = self;
   }
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
index 81895c42ae00..aa43e8d85e6c 100644
--- a/packages/firebase_messaging/pubspec.yaml
+++ b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 4.0.0
+version: 4.0.0+1
 
 flutter:
   plugin:
diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 79b38fec128a..9fa5dec20a90 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.0+1
+
+* Log messages about automatic configuration of the default app are now less confusing.
+
 ## 0.6.0
 
 * **Breaking Change** Removed on-device model dependencies from plugin.
diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index 0c6874d9bb8b..deb5f50dd1dc 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -22,8 +22,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 - (instancetype)init {
   self = [super init];
   if (self) {
-    if (![FIRApp defaultApp]) {
+    if (![FIRApp appNamed:@"__FIRAPP_DEFAULT"]) {
+      NSLog(@"Configuring the default Firebase app...");
       [FIRApp configure];
+      NSLog(@"Configured the default Firebase app %@.", [FIRApp defaultApp].name);
     }
   }
   return self;
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index 4abb04f3023c..5b6b47c99ef1 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_ml_vision
 description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.6.0
+version: 0.6.0+1
 
 dependencies:
   flutter:
diff --git a/packages/firebase_performance/CHANGELOG.md b/packages/firebase_performance/CHANGELOG.md
index f80203aa84c1..6cf07b6797c0 100644
--- a/packages/firebase_performance/CHANGELOG.md
+++ b/packages/firebase_performance/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0+3
+
+* Log messages about automatic configuration of the default app are now less confusing.
+
 ## 0.1.0+2
 
 * Fixed bug where `Traces` and `HttpMetrics` weren't being passed to Firebase on iOS.
diff --git a/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m b/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
index 0fb7897797ad..40b4a5064ada 100644
--- a/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
+++ b/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
@@ -23,8 +23,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 - (instancetype)init {
   self = [super init];
   if (self) {
-    if (![FIRApp defaultApp]) {
+    if (![FIRApp appNamed:@"__FIRAPP_DEFAULT"]) {
+      NSLog(@"Configuring the default Firebase app...");
       [FIRApp configure];
+      NSLog(@"Configured the default Firebase app %@.", [FIRApp defaultApp].name);
     }
 
     _traces = [[NSMutableDictionary alloc] init];
diff --git a/packages/firebase_performance/pubspec.yaml b/packages/firebase_performance/pubspec.yaml
index 1d8dc7a676ac..6300f4943126 100644
--- a/packages/firebase_performance/pubspec.yaml
+++ b/packages/firebase_performance/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Google Performance Monitoring for Firebase, an a
   iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_performance
-version: 0.1.0+2
+version: 0.1.0+3
 
 dependencies:
   flutter:
diff --git a/packages/firebase_remote_config/CHANGELOG.md b/packages/firebase_remote_config/CHANGELOG.md
index 9d312525f04e..d7b7966f8d31 100644
--- a/packages/firebase_remote_config/CHANGELOG.md
+++ b/packages/firebase_remote_config/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0+2
+
+* Log messages about automatic configuration of the default app are now less confusing.
+
 ## 0.1.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/firebase_remote_config/ios/Classes/FirebaseRemoteConfigPlugin.m b/packages/firebase_remote_config/ios/Classes/FirebaseRemoteConfigPlugin.m
index 06091fab0575..dc45e6259515 100644
--- a/packages/firebase_remote_config/ios/Classes/FirebaseRemoteConfigPlugin.m
+++ b/packages/firebase_remote_config/ios/Classes/FirebaseRemoteConfigPlugin.m
@@ -19,8 +19,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 - (instancetype)init {
   self = [super init];
   if (self) {
-    if (![FIRApp defaultApp]) {
+    if (![FIRApp appNamed:@"__FIRAPP_DEFAULT"]) {
+      NSLog(@"Configuring the default Firebase app...");
       [FIRApp configure];
+      NSLog(@"Configured the default Firebase app %@.", [FIRApp defaultApp].name);
     }
   }
   return self;
diff --git a/packages/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/pubspec.yaml
index 867ff9f46de4..e9dd6074d861 100644
--- a/packages/firebase_remote_config/pubspec.yaml
+++ b/packages/firebase_remote_config/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Remote Config. Update your application
   re-releasing.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_remote_config
-version: 0.1.0+1
+version: 0.1.0+2
 
 dependencies:
   flutter:
diff --git a/packages/firebase_storage/CHANGELOG.md b/packages/firebase_storage/CHANGELOG.md
index fa284ecf4147..19d217ae743b 100644
--- a/packages/firebase_storage/CHANGELOG.md
+++ b/packages/firebase_storage/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.1+2
+
+* Log messages about automatic configuration of the default app are now less confusing.
+
 ## 2.0.1+1
 
 * Remove categories.
diff --git a/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m b/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
index de0bcb143594..ae8486393e65 100644
--- a/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
+++ b/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
@@ -36,8 +36,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 - (instancetype)init {
   self = [super init];
   if (self) {
-    if (![FIRApp defaultApp]) {
+    if (![FIRApp appNamed:@"__FIRAPP_DEFAULT"]) {
+      NSLog(@"Configuring the default Firebase app...");
       [FIRApp configure];
+      NSLog(@"Configured the default Firebase app %@.", [FIRApp defaultApp].name);
     }
     _storageMap = [[NSMutableDictionary alloc] init];
     _uploadTasks = [NSMutableDictionary<NSNumber *, FIRStorageUploadTask *> dictionary];

From 287ab8cce2a377b1a35ead1b85190e4f7167acee Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Feb 2019 14:40:54 -0800
Subject: [PATCH 160/410] [firebase_storage] Support for getReferenceFromUrl
 (#1208)

Support for getReferenceFromUrl
---
 packages/firebase_storage/CHANGELOG.md        |  4 +++
 .../storage/FirebaseStoragePlugin.java        |  9 ++++++
 .../ios/Classes/FirebaseStoragePlugin.m       |  7 +++++
 .../lib/src/firebase_storage.dart             | 16 ++++++++++
 packages/firebase_storage/pubspec.yaml        |  2 +-
 .../test/firebase_storage_test.dart           | 30 +++++++++++++++++++
 6 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_storage/CHANGELOG.md b/packages/firebase_storage/CHANGELOG.md
index 19d217ae743b..9d16936d7064 100644
--- a/packages/firebase_storage/CHANGELOG.md
+++ b/packages/firebase_storage/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.0
+
+* Added support for getReferenceFromUrl.
+
 ## 2.0.1+2
 
 * Log messages about automatic configuration of the default app are now less confusing.
diff --git a/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java b/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java
index 6cdc58f7fdd9..37f8202356f8 100755
--- a/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java
+++ b/packages/firebase_storage/android/src/main/java/io/flutter/plugins/firebase/storage/FirebaseStoragePlugin.java
@@ -81,6 +81,9 @@ public void onMethodCall(MethodCall call, final Result result) {
       case "FirebaseStorage#setMaxOperationRetryTime":
         setMaxOperationTimeMillis(call, result);
         break;
+      case "FirebaseStorage#getReferenceFromUrl":
+        getReferenceFromUrl(call, result);
+        break;
       case "StorageReference#putFile":
         putFile(call, result);
         break;
@@ -147,6 +150,12 @@ private void setMaxOperationTimeMillis(MethodCall call, Result result) {
     result.success(null);
   }
 
+  private void getReferenceFromUrl(MethodCall call, Result result) {
+    String fullUrl = call.argument("fullUrl");
+    StorageReference ref = firebaseStorage.getReferenceFromUrl(fullUrl);
+    result.success(ref != null ? ref.getPath() : null);
+  }
+
   private void getMetadata(MethodCall call, final Result result) {
     String path = call.argument("path");
     StorageReference ref = firebaseStorage.getReference().child(path);
diff --git a/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m b/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
index ae8486393e65..70027edf967d 100644
--- a/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
+++ b/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
@@ -62,6 +62,8 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [self setMaxUploadRetryTime:call result:result];
   } else if ([@"FirebaseStorage#setMaxOperationRetryTime" isEqualToString:call.method]) {
     [self setMaxOperationRetryTime:call result:result];
+  } else if ([@"FirebaseStorage#getReferenceFromUrl" isEqualToString:call.method]) {
+    [self getReferenceFromUrl:call result:result];
   } else if ([@"StorageReference#putFile" isEqualToString:call.method]) {
     [self putFile:call result:result];
   } else if ([@"StorageReference#putData" isEqualToString:call.method]) {
@@ -172,6 +174,11 @@ - (void)setMaxOperationRetryTime:(FlutterMethodCall *)call result:(FlutterResult
   result(nil);
 }
 
+- (void)getReferenceFromUrl:(FlutterMethodCall *)call result:(FlutterResult)result {
+  NSString *fullUrl = call.arguments[@"fullUrl"];
+  result([storage referenceForURL:fullUrl].fullPath);
+}
+
 - (void)putFile:(FlutterMethodCall *)call result:(FlutterResult)result {
   NSData *data = [NSData dataWithContentsOfFile:call.arguments[@"filename"]];
   [self put:data call:call result:result];
diff --git a/packages/firebase_storage/lib/src/firebase_storage.dart b/packages/firebase_storage/lib/src/firebase_storage.dart
index e12b8c737ffe..8fc536bdfcc9 100644
--- a/packages/firebase_storage/lib/src/firebase_storage.dart
+++ b/packages/firebase_storage/lib/src/firebase_storage.dart
@@ -125,6 +125,22 @@ class FirebaseStorage {
       'time': time,
     });
   }
+
+  /// Creates a [StorageReference] given a gs:// or // URL pointing to a Firebase
+  /// Storage location.
+  Future<StorageReference> getReferenceFromUrl(String fullUrl) async {
+    final String path = await channel.invokeMethod(
+        "FirebaseStorage#getReferenceFromUrl", <String, dynamic>{
+      'app': app?.name,
+      'bucket': storageBucket,
+      'fullUrl': fullUrl
+    });
+    if (path != null) {
+      return ref().child(path);
+    } else {
+      return null;
+    }
+  }
 }
 
 /// TODO: Move into own file and build out progress functionality
diff --git a/packages/firebase_storage/pubspec.yaml b/packages/firebase_storage/pubspec.yaml
index 94a2ab277654..9216639b350f 100755
--- a/packages/firebase_storage/pubspec.yaml
+++ b/packages/firebase_storage/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Storage, a powerful, simple, and
   cost-effective object storage service for Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_storage
-version: 2.0.1+1
+version: 2.1.0
 
 flutter:
   plugin:
diff --git a/packages/firebase_storage/test/firebase_storage_test.dart b/packages/firebase_storage/test/firebase_storage_test.dart
index 91cb1ee7ff7f..c03288dade34 100644
--- a/packages/firebase_storage/test/firebase_storage_test.dart
+++ b/packages/firebase_storage/test/firebase_storage_test.dart
@@ -187,6 +187,36 @@ void main() {
       });
     });
 
+    group('getReferenceFromUrl', () {
+      final List<MethodCall> log = <MethodCall>[];
+
+      setUp(() {
+        FirebaseStorage.channel
+            .setMockMethodCallHandler((MethodCall methodCall) async {
+          log.add(methodCall);
+          return 'foo';
+        });
+      });
+
+      test('invokes correct method', () async {
+        final String url =
+            'https://firebasestorage.googleapis.com/v0/b/fake-21c50.appspot.com/o/';
+        final StorageReference reference =
+            await storage.getReferenceFromUrl(url);
+        expect(reference.path, 'foo');
+        expect(log, <Matcher>[
+          isMethodCall(
+            'FirebaseStorage#getReferenceFromUrl',
+            arguments: <String, dynamic>{
+              'app': 'testApp',
+              'bucket': 'gs://fake-storage-bucket-url.com',
+              'fullUrl': url,
+            },
+          ),
+        ]);
+      });
+    });
+
     group('StorageReference', () {
       group('getData', () {
         final List<MethodCall> log = <MethodCall>[];

From bc501915395bd95d6555c07cb82e886e45cf5995 Mon Sep 17 00:00:00 2001
From: Chris Yang <cyang8954@gmail.com>
Date: Thu, 21 Feb 2019 16:00:20 -0800
Subject: [PATCH 161/410] [In_app_purchase]SKProduct related fixes (#1252)

Fixes the price property in SKProduct and SKProductDiscount losing precision after receiving from Objective-c. (Fixed by change the type to String)

Fixes the example app to display error if necessary.
---
 .../ios/in_app_purchase_pluginTests/Stubs.m   |  6 +++--
 .../TranslatorTest.m                          |  4 ++--
 .../in_app_purchase/example/lib/main.dart     | 22 +++++++++----------
 .../ios/Classes/FIAObjectTranslator.m         |  4 ++--
 .../sk_product_wrapper.dart                   | 17 +++++++-------
 .../sk_product_wrapper.g.dart                 |  4 ++--
 .../app_store_connection_test.dart            |  4 ++--
 .../store_kit_wrappers/sk_product_test.dart   |  4 ++--
 .../store_kit_wrappers/sk_request_test.dart   |  4 ++--
 9 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
index 2c4378ee4081..9ed773449830 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
@@ -22,7 +22,8 @@ @implementation SKProductDiscountStub
 - (instancetype)initWithMap:(NSDictionary *)map {
   self = [super init];
   if (self) {
-    [self setValue:map[@"price"] ?: [NSNull null] forKey:@"price"];
+    [self setValue:[[NSDecimalNumber alloc] initWithString:map[@"price"]] ?: [NSNull null]
+            forKey:@"price"];
     NSLocale *locale = NSLocale.systemLocale;
     [self setValue:locale ?: [NSNull null] forKey:@"priceLocale"];
     [self setValue:map[@"numberOfPeriods"] ?: @(0) forKey:@"numberOfPeriods"];
@@ -45,7 +46,8 @@ - (instancetype)initWithMap:(NSDictionary *)map {
     [self setValue:map[@"localizedDescription"] ?: [NSNull null] forKey:@"localizedDescription"];
     [self setValue:map[@"localizedTitle"] ?: [NSNull null] forKey:@"localizedTitle"];
     [self setValue:map[@"downloadable"] ?: @NO forKey:@"downloadable"];
-    [self setValue:map[@"price"] ?: [NSNull null] forKey:@"price"];
+    [self setValue:[[NSDecimalNumber alloc] initWithString:map[@"price"]] ?: [NSNull null]
+            forKey:@"price"];
     NSLocale *locale = NSLocale.systemLocale;
     [self setValue:locale ?: [NSNull null] forKey:@"priceLocale"];
     [self setValue:map[@"downloadContentLengths"] ?: @(0) forKey:@"downloadContentLengths"];
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
index 130c51784532..d6babfce8cf2 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
@@ -25,14 +25,14 @@ @implementation TranslatorTest
 - (void)setUp {
   self.periodMap = @{@"numberOfUnits" : @(0), @"unit" : @(0)};
   self.discountMap = @{
-    @"price" : @1.0,
+    @"price" : @"1",
     @"priceLocale" : [FIAObjectTranslator getMapFromNSLocale:NSLocale.systemLocale],
     @"numberOfPeriods" : @1,
     @"subscriptionPeriod" : self.periodMap,
     @"paymentMode" : @1
   };
   self.productMap = @{
-    @"price" : @1.0,
+    @"price" : @"1",
     @"priceLocale" : [FIAObjectTranslator getMapFromNSLocale:NSLocale.systemLocale],
     @"productIdentifier" : @"123",
     @"localizedTitle" : @"title",
diff --git a/packages/in_app_purchase/example/lib/main.dart b/packages/in_app_purchase/example/lib/main.dart
index 3844add7724c..f3ba2024348e 100644
--- a/packages/in_app_purchase/example/lib/main.dart
+++ b/packages/in_app_purchase/example/lib/main.dart
@@ -32,17 +32,17 @@ class _MyAppState extends State<MyApp> {
             FutureBuilder(
               future: _buildConnectionCheckTile(),
               builder: (BuildContext context, AsyncSnapshot snapshot) {
-                if (!snapshot.hasData) {
-                  return Column(children: <Widget>[
-                    buildListCard(
-                        ListTile(title: const Text('Trying to connect...')))
-                  ]);
-                } else if (snapshot.error != null) {
+                if (snapshot.error != null) {
                   return Column(children: <Widget>[
                     buildListCard(ListTile(
                         title: Text(
                             'Error connecting: ' + snapshot.error.toString())))
                   ]);
+                } else if (!snapshot.hasData) {
+                  return Column(children: <Widget>[
+                    buildListCard(
+                        ListTile(title: const Text('Trying to connect...')))
+                  ]);
                 }
                 return Column(
                   children: snapshot.data,
@@ -55,14 +55,14 @@ class _MyAppState extends State<MyApp> {
                     <String>['consumable', 'upgrade', 'subscription'].toSet()),
                 builder: (BuildContext context,
                     AsyncSnapshot<ProductDetailsResponse> snapshot) {
-                  if (!snapshot.hasData) {
-                    return Column(children: <Widget>[
-                      buildListCard(ListTile(title: const Text('Loading...')))
-                    ]);
-                  } else if (snapshot.error != null) {
+                  if (snapshot.error != null) {
                     return Center(
                       child: Text('Error: ' + snapshot.error.toString()),
                     );
+                  } else if (!snapshot.hasData) {
+                    return Column(children: <Widget>[
+                      buildListCard(ListTile(title: const Text('Loading...')))
+                    ]);
                   }
                   return Column(
                     children: <Widget>[
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
index e2d10e015385..bd9b65edd61d 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
@@ -17,7 +17,7 @@ + (NSDictionary *)getMapFromSKProduct:(SKProduct *)product {
     @"localizedTitle" : product.localizedTitle ?: [NSNull null],
     @"productIdentifier" : product.productIdentifier ?: [NSNull null],
     @"downloadable" : @(product.downloadable),
-    @"price" : product.price ?: [NSNull null],
+    @"price" : product.price.description ?: [NSNull null],
     @"downloadContentLengths" : product.downloadContentLengths ?: [NSNull null],
     @"downloadContentVersion" : product.downloadContentVersion ?: [NSNull null]
 
@@ -57,7 +57,7 @@ + (NSDictionary *)getMapFromSKProductDiscount:(SKProductDiscount *)discount {
     return nil;
   }
   NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
-    @"price" : discount.price ?: [NSNull null],
+    @"price" : discount.price.description ?: [NSNull null],
     @"numberOfPeriods" : @(discount.numberOfPeriods),
     @"subscriptionPeriod" :
             [FIAObjectTranslator getMapFromSKProductSubscriptionPeriod:discount.subscriptionPeriod]
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
index 18ea1fc694f2..ddc35bb99c56 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
@@ -25,7 +25,7 @@ class SkProductResponseWrapper {
   /// This method should only be used with `map` values returned by [SKRequestMaker.startProductRequest].
   /// The `map` parameter must not be null.
   factory SkProductResponseWrapper.fromJson(Map map) {
-    assert(map != null);
+    assert(map != null, 'Map must not be null.');
     return _$SkProductResponseWrapperFromJson(map);
   }
 
@@ -73,8 +73,7 @@ class SKProductSubscriptionPeriodWrapper {
   /// This method should only be used with `map` values returned by [SKProductDiscountWrapper.fromJson] or [SKProductWrapper.fromJson].
   /// The `map` parameter must not be null.
   factory SKProductSubscriptionPeriodWrapper.fromJson(Map map) {
-    assert(map != null &&
-        (map['numberOfUnits'] == null || map['numberOfUnits'] > 0));
+    assert(map != null, 'Map must not be null.');
     return _$SKProductSubscriptionPeriodWrapperFromJson(map);
   }
 
@@ -123,12 +122,12 @@ class SKProductDiscountWrapper {
   /// This method should only be used with `map` values returned by [SKProductWrapper.fromJson].
   /// The `map` parameter must not be null.
   factory SKProductDiscountWrapper.fromJson(Map map) {
-    assert(map != null);
+    assert(map != null, 'Map must not be null.');
     return _$SKProductDiscountWrapperFromJson(map);
   }
 
   /// The discounted price, in the currency that is defined in [priceLocale].
-  final double price;
+  final String price;
 
   /// Includes locale information about the price, e.g. `$` as the currency symbol for US locale.
   final PriceLocaleWrapper priceLocale;
@@ -173,7 +172,7 @@ class SKProductWrapper {
   /// This method should only be used with `map` values returned by [SkProductResponseWrapper.fromJson].
   /// The `map` parameter must not be null.
   factory SKProductWrapper.fromJson(Map map) {
-    assert(map != null);
+    assert(map != null, 'Map must not be null.');
     return _$SKProductWrapperFromJson(map);
   }
 
@@ -206,7 +205,7 @@ class SKProductWrapper {
   final String subscriptionGroupIdentifier;
 
   /// The price of the product, in the currency that is defined in [priceLocale].
-  final double price;
+  final String price;
 
   /// Whether the AppStore has downloadable content for this product.
   ///
@@ -239,7 +238,7 @@ class SKProductWrapper {
       id: productIdentifier,
       title: localizedTitle,
       description: localizedDescription,
-      price: priceLocale.currencySymbol + price.toString(),
+      price: priceLocale.currencySymbol + price,
     );
   }
 }
@@ -259,7 +258,7 @@ class PriceLocaleWrapper {
   /// This method should only be used with `map` values returned by [SKProductWrapper.fromJson] and [SKProductDiscountWrapper.fromJson].
   /// The `map` parameter must not be null.
   factory PriceLocaleWrapper.fromJson(Map map) {
-    assert(map != null);
+    assert(map != null, 'Map must not be null.');
     return _$PriceLocaleWrapperFromJson(map);
   }
 
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
index 52467266d948..d6392d8cd1a4 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
@@ -53,7 +53,7 @@ const _$SubscriptionPeriodUnitEnumMap = <SubscriptionPeriodUnit, dynamic>{
 
 SKProductDiscountWrapper _$SKProductDiscountWrapperFromJson(Map json) {
   return SKProductDiscountWrapper(
-      price: (json['price'] as num)?.toDouble(),
+      price: json['price'] as String,
       priceLocale: json['priceLocale'] == null
           ? null
           : PriceLocaleWrapper.fromJson(json['priceLocale'] as Map),
@@ -84,7 +84,7 @@ SKProductWrapper _$SKProductWrapperFromJson(Map json) {
       downloadContentVersion: json['downloadContentVersion'] as String,
       subscriptionGroupIdentifier:
           json['subscriptionGroupIdentifier'] as String,
-      price: (json['price'] as num)?.toDouble(),
+      price: json['price'] as String,
       downloadable: json['downloadable'] as bool,
       downloadContentLengths: (json['downloadContentLengths'] as List)
           ?.map((e) => e as int)
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
index d107b59afe58..3d2ec3f17376 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
@@ -37,7 +37,7 @@ void main() {
     'unit': 2
   };
   final Map<String, dynamic> discountMap = <String, dynamic>{
-    'price': 1.0,
+    'price': '1.0',
     'priceLocale': localeMap,
     'numberOfPeriods': 1,
     'paymentMode': 2,
@@ -50,7 +50,7 @@ void main() {
     'priceLocale': localeMap,
     'downloadContentVersion': 'version',
     'subscriptionGroupIdentifier': 'com.group',
-    'price': 1.0,
+    'price': '1.0',
     'downloadable': true,
     'downloadContentLengths': <int>[1, 2],
     'subscriptionPeriod': subMap,
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
index 7e49730ffe88..cc806d068b76 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
@@ -15,7 +15,7 @@ void main() {
     'unit': 2
   };
   final Map<String, dynamic> discountMap = <String, dynamic>{
-    'price': 1.0,
+    'price': '1.0',
     'priceLocale': localeMap,
     'numberOfPeriods': 1,
     'paymentMode': 2,
@@ -28,7 +28,7 @@ void main() {
     'priceLocale': localeMap,
     'downloadContentVersion': 'version',
     'subscriptionGroupIdentifier': 'com.group',
-    'price': 1.0,
+    'price': '1.0',
     'downloadable': true,
     'downloadContentLengths': <int>[1, 2],
     'subscriptionPeriod': subMap,
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
index 2db357355889..7bb623860a12 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
@@ -19,7 +19,7 @@ void main() {
     'unit': 2
   };
   final Map<String, dynamic> discountMap = <String, dynamic>{
-    'price': 1.0,
+    'price': '1.0',
     'priceLocale': localeMap,
     'numberOfPeriods': 1,
     'paymentMode': 2,
@@ -32,7 +32,7 @@ void main() {
     'priceLocale': localeMap,
     'downloadContentVersion': 'version',
     'subscriptionGroupIdentifier': 'com.group',
-    'price': 1.0,
+    'price': '1.0',
     'downloadable': true,
     'downloadContentLengths': <int>[1, 2],
     'subscriptionPeriod': subMap,

From db0b180fdc608c18b9cddaa27a60840354b4dadb Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@users.noreply.github.com>
Date: Thu, 21 Feb 2019 17:00:28 -0800
Subject: [PATCH 162/410] [video_player] Cast the NSInteger to long and use %ld
 formatter (#1250)

* Cast the NSInteger to long and use %ld formatter

This avoids platform dependent compilations errors and is the official recommendation by Apple: https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/Strings/Articles/formatSpecifiers.html

Also remove a couple of unused vars.
---
 packages/video_player/ios/Classes/VideoPlayerPlugin.m | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/video_player/ios/Classes/VideoPlayerPlugin.m b/packages/video_player/ios/Classes/VideoPlayerPlugin.m
index 16110a5e4e47..2d8b6ee1b950 100644
--- a/packages/video_player/ios/Classes/VideoPlayerPlugin.m
+++ b/packages/video_player/ios/Classes/VideoPlayerPlugin.m
@@ -153,7 +153,7 @@ - (CGAffineTransform)fixTransform:(AVAssetTrack*)videoTrack {
   // displays the video https://github.com/flutter/flutter/issues/17606#issuecomment-413473181
   if (transform.tx == 0 && transform.ty == 0) {
     NSInteger rotationDegrees = (NSInteger)round(radiansToDegrees(atan2(transform.b, transform.a)));
-    NSLog(@"TX and TY are 0. Rotation: %d. Natural width,height: %f, %f", rotationDegrees,
+    NSLog(@"TX and TY are 0. Rotation: %ld. Natural width,height: %f, %f", (long)rotationDegrees,
           videoTrack.naturalSize.width, videoTrack.naturalSize.height);
     if (rotationDegrees == 90) {
       NSLog(@"Setting transform tx");
@@ -185,8 +185,6 @@ - (instancetype)initWithPlayerItem:(AVPlayerItem*)item frameUpdater:(FLTFrameUpd
           if (_disposed) return;
           if ([videoTrack statusOfValueForKey:@"preferredTransform"
                                         error:nil] == AVKeyValueStatusLoaded) {
-            CGSize size = videoTrack.naturalSize;
-
             // Rotate the video by using a videoComposition and the preferredTransform
             _preferredTransform = [self fixTransform:videoTrack];
             // Note:
@@ -209,8 +207,6 @@ - (instancetype)initWithPlayerItem:(AVPlayerItem*)item frameUpdater:(FLTFrameUpd
   _player = [AVPlayer playerWithPlayerItem:item];
   _player.actionAtItemEnd = AVPlayerActionAtItemEndNone;
 
-  CGSize size = item.presentationSize;
-
   [self createVideoOutputAndDisplayLink:frameUpdater];
 
   [self addObservers:item];

From 443b58f288702ff7227370d0fb69edf02a525730 Mon Sep 17 00:00:00 2001
From: Mike N <mjn4000@gmail.com>
Date: Thu, 21 Feb 2019 17:45:46 -0800
Subject: [PATCH 163/410] [camera] 28180 fix exif data bug for first time
 camera use android (#1241)

Fix an issue in android camera plugin where orientation data was not captured
the first time the camera is used.

Fixes flutter/flutter#28180
---
 packages/camera/CHANGELOG.md                          |  4 ++++
 .../java/io/flutter/plugins/camera/CameraPlugin.java  | 11 ++++++-----
 packages/camera/pubspec.yaml                          |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index b681b9da0472..d5b86843ef47 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0+2
+
+* Fix orientation of captured photos when camera is used for the first time on Android.
+
 ## 0.4.0+1
 
 * Remove categories.
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index 32597d09f536..4612f2bbb8a5 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -96,15 +96,16 @@ public void onActivityStarted(Activity activity) {}
 
           @Override
           public void onActivityResumed(Activity activity) {
+            boolean wasRequestingPermission = requestingPermission;
             if (requestingPermission) {
               requestingPermission = false;
+            }
+            if (activity != CameraPlugin.this.activity) {
               return;
             }
-            if (activity == CameraPlugin.this.activity) {
-              orientationEventListener.enable();
-              if (camera != null) {
-                camera.open(null);
-              }
+            orientationEventListener.enable();
+            if (camera != null && !wasRequestingPermission) {
+              camera.open(null);
             }
           }
 
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index fc199161c531..6f560124bae0 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.4.0+1
+version: 0.4.0+2
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From 41d0540985c6fdb6b456911bcc048f54766d0847 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Thu, 21 Feb 2019 18:02:07 -0800
Subject: [PATCH 164/410] Disable analyzer errors (#1253)

Unfortunately we can't fix this and still be compatible with stable, so
for now `prefer_collection_literals` is just being disabled to unbreak CI.
---
 packages/google_maps_flutter/example/lib/scrolling_map.dart | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/google_maps_flutter/example/lib/scrolling_map.dart b/packages/google_maps_flutter/example/lib/scrolling_map.dart
index 0ec271845aab..fd1661f53938 100644
--- a/packages/google_maps_flutter/example/lib/scrolling_map.dart
+++ b/packages/google_maps_flutter/example/lib/scrolling_map.dart
@@ -48,6 +48,9 @@ class ScrollingMapBody extends StatelessWidget {
                         zoom: 11.0,
                       ),
                       gestureRecognizers:
+                          // TODO(mklim): Remove this when collection literals
+                          // makes it to stable.
+                          // ignore: prefer_collection_literals
                           <Factory<OneSequenceGestureRecognizer>>[
                         Factory<OneSequenceGestureRecognizer>(
                           () => EagerGestureRecognizer(),
@@ -82,6 +85,9 @@ class ScrollingMapBody extends StatelessWidget {
                         zoom: 11.0,
                       ),
                       gestureRecognizers:
+                          // TODO(mklim): Remove this when collection literals
+                          // makes it to stable.
+                          // ignore: prefer_collection_literals
                           <Factory<OneSequenceGestureRecognizer>>[
                         Factory<OneSequenceGestureRecognizer>(
                           () => ScaleGestureRecognizer(),

From 0223a65a86c14f38de56c03f294235ad3536b1fb Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Fri, 22 Feb 2019 09:42:48 -0800
Subject: [PATCH 165/410] Don't register the Maps and Camera plugin for
 background FlutterViews. (#1255)

Background FlutterViews do not have an activity, the Maps and Camera
plugins are foreground only and assumed and activity is available which
can result in a crash when the plugin is registered by a background
FlutterView.

We workaround by just not registering the plugins if there is no
activity.

Similar to https://github.com/flutter/plugins/pull/1125
---
 packages/camera/CHANGELOG.md                                 | 4 ++++
 .../main/java/io/flutter/plugins/camera/CameraPlugin.java    | 5 +++++
 packages/camera/pubspec.yaml                                 | 2 +-
 packages/google_maps_flutter/CHANGELOG.md                    | 4 ++++
 .../java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java | 5 +++++
 packages/google_maps_flutter/pubspec.yaml                    | 2 +-
 6 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index d5b86843ef47..c29670baaae0 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0+3
+
+* Fixed a crash when the plugin is registered by a background FlutterView.
+
 ## 0.4.0+2
 
 * Fix orientation of captured photos when camera is used for the first time on Android.
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index 4612f2bbb8a5..8cdc95e19790 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -137,6 +137,11 @@ public void onActivityDestroyed(Activity activity) {}
   }
 
   public static void registerWith(Registrar registrar) {
+    if (registrar.activity() == null) {
+      // When a background flutter view tries to register the plugin, the registrar has no activity.
+      // We stop the registration process as this plugin is foreground only.
+      return;
+    }
     final MethodChannel channel =
         new MethodChannel(registrar.messenger(), "plugins.flutter.io/camera");
 
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 6f560124bae0..dcbff327f044 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.4.0+2
+version: 0.4.0+3
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>
diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index d6c1c7025c89..dc62d4968476 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0+4
+
+* Fixed a crash when the plugin is registered by a background FlutterView.
+
 ## 0.2.0+3
 
 * Fixed a memory leak on Android - the map was not properly disposed.
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
index e0cf092c1835..aced16772d50 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
@@ -27,6 +27,11 @@ public class GoogleMapsPlugin implements Application.ActivityLifecycleCallbacks
   private final int registrarActivityHashCode;
 
   public static void registerWith(Registrar registrar) {
+    if (registrar.activity() == null) {
+      // When a background flutter view tries to register the plugin, the registrar has no activity.
+      // We stop the registration process as this plugin is foreground only.
+      return;
+    }
     final GoogleMapsPlugin plugin = new GoogleMapsPlugin(registrar);
     registrar.activity().getApplication().registerActivityLifecycleCallbacks(plugin);
     registrar
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index cbeedc3248ee..5b6463040e97 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.2.0+3
+version: 0.2.0+4
 
 dependencies:
   flutter:

From c2b9d52d79d50da39d5d0467bc96816f96c5275f Mon Sep 17 00:00:00 2001
From: Sebastian Roth <sebastian.roth@gmail.com>
Date: Sat, 23 Feb 2019 02:15:17 +0800
Subject: [PATCH 166/410] Reduce Android compiler warnings, prevent NPE (#963)

* Reduce Android compiler warnings, prevent NPE

* Upgrade Android gradle plugin to 3.3.1

* Save few object allocations (nit)
---
 packages/firebase_auth/CHANGELOG.md           |   5 +
 packages/firebase_auth/android/build.gradle   |   2 +-
 .../firebaseauth/FirebaseAuthPlugin.java      | 135 +++++++++++++-----
 .../example/android/build.gradle              |   2 +-
 packages/firebase_auth/pubspec.yaml           |   2 +-
 5 files changed, 106 insertions(+), 40 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index f8cf387b89f2..d14179509e1f 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.8.1+3
+
+* Reduce compiler warnings in Android plugin
+* Raise errors early when accessing methods that require a Firebase User
+
 ## 0.8.1+2
 
 * Log messages about automatic configuration of the default app are now less confusing.
diff --git a/packages/firebase_auth/android/build.gradle b/packages/firebase_auth/android/build.gradle
index 2150001cff02..80a2b7308e92 100755
--- a/packages/firebase_auth/android/build.gradle
+++ b/packages/firebase_auth/android/build.gradle
@@ -22,7 +22,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }
 
diff --git a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
index e88b4b66cfc2..ce7010ee4fb0 100755
--- a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
+++ b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
@@ -24,6 +24,7 @@
 import com.google.firebase.auth.FirebaseAuthException;
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.FirebaseUserMetadata;
 import com.google.firebase.auth.GetTokenResult;
 import com.google.firebase.auth.GithubAuthProvider;
 import com.google.firebase.auth.GoogleAuthProvider;
@@ -265,13 +266,19 @@ private Map<String, Object> getVerifyPhoneNumberExceptionMap(FirebaseException e
 
   private void handleLinkWithEmailAndPassword(
       MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    final FirebaseUser currentUser = firebaseAuth.getCurrentUser();
+    if (currentUser == null) {
+      markUserRequired(result);
+      return;
+    }
+
     Map<String, String> arguments = call.arguments();
     String email = arguments.get("email");
     String password = arguments.get("password");
 
     AuthCredential credential = EmailAuthProvider.getCredential(email, password);
-    firebaseAuth
-        .getCurrentUser()
+
+    currentUser
         .linkWithCredential(credential)
         .addOnCompleteListener(new SignInCompleteListener(result));
   }
@@ -325,29 +332,43 @@ private void handleSendPasswordResetEmail(
 
   private void handleSendEmailVerification(
       @SuppressWarnings("unused") MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    firebaseAuth
-        .getCurrentUser()
-        .sendEmailVerification()
-        .addOnCompleteListener(new TaskVoidCompleteListener(result));
+    final FirebaseUser currentUser = firebaseAuth.getCurrentUser();
+    if (currentUser == null) {
+      markUserRequired(result);
+      return;
+    }
+
+    currentUser.sendEmailVerification().addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
-  private void handleReload(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    firebaseAuth
-        .getCurrentUser()
-        .reload()
-        .addOnCompleteListener(new TaskVoidCompleteListener(result));
+  private void handleReload(
+      @SuppressWarnings("unused") MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    final FirebaseUser currentUser = firebaseAuth.getCurrentUser();
+    if (currentUser == null) {
+      markUserRequired(result);
+      return;
+    }
+
+    currentUser.reload().addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
-  private void handleDelete(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
-    firebaseAuth
-        .getCurrentUser()
-        .delete()
-        .addOnCompleteListener(new TaskVoidCompleteListener(result));
+  private void handleDelete(
+      @SuppressWarnings("unused") MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    final FirebaseUser currentUser = firebaseAuth.getCurrentUser();
+    if (currentUser == null) {
+      markUserRequired(result);
+      return;
+    }
+
+    currentUser.delete().addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
   private AuthCredential getCredential(Map<String, Object> arguments) {
     AuthCredential credential;
+
+    @SuppressWarnings("unchecked")
     Map<String, String> data = (Map<String, String>) arguments.get("data");
+
     switch ((String) arguments.get("provider")) {
       case EmailAuthProvider.PROVIDER_ID:
         {
@@ -400,7 +421,10 @@ private AuthCredential getCredential(Map<String, Object> arguments) {
 
   private void handleSignInWithCredential(
       MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+
+    @SuppressWarnings("unchecked")
     AuthCredential credential = getCredential((Map<String, Object>) call.arguments());
+
     firebaseAuth
         .signInWithCredential(credential)
         .addOnCompleteListener(new SignInCompleteListener(result));
@@ -408,21 +432,31 @@ private void handleSignInWithCredential(
 
   private void handleReauthenticateWithCredential(
       MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    final FirebaseUser currentUser = firebaseAuth.getCurrentUser();
+    if (currentUser == null) {
+      markUserRequired(result);
+      return;
+    }
+
+    @SuppressWarnings("unchecked")
     AuthCredential credential = getCredential((Map<String, Object>) call.arguments());
-    firebaseAuth
-        .getCurrentUser()
+
+    currentUser
         .reauthenticate(credential)
         .addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
   private void handleUnlinkFromProvider(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    final FirebaseUser currentUser = firebaseAuth.getCurrentUser();
+    if (currentUser == null) {
+      markUserRequired(result);
+      return;
+    }
+
     Map<String, String> arguments = call.arguments();
     final String provider = arguments.get("provider");
 
-    firebaseAuth
-        .getCurrentUser()
-        .unlink(provider)
-        .addOnCompleteListener(new SignInCompleteListener(result));
+    currentUser.unlink(provider).addOnCompleteListener(new SignInCompleteListener(result));
   }
 
   private void handleSignInWithCustomToken(
@@ -435,22 +469,28 @@ private void handleSignInWithCustomToken(
         .addOnCompleteListener(new SignInCompleteListener(result));
   }
 
-  private void handleSignOut(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
+  private void handleSignOut(
+      @SuppressWarnings("unused") MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
     firebaseAuth.signOut();
     result.success(null);
   }
 
   private void handleGetToken(MethodCall call, final Result result, FirebaseAuth firebaseAuth) {
+    final FirebaseUser currentUser = firebaseAuth.getCurrentUser();
+    if (currentUser == null) {
+      markUserRequired(result);
+      return;
+    }
+
     Map<String, Boolean> arguments = call.arguments();
     boolean refresh = arguments.get("refresh");
 
-    firebaseAuth
-        .getCurrentUser()
+    currentUser
         .getIdToken(refresh)
         .addOnCompleteListener(
             new OnCompleteListener<GetTokenResult>() {
               public void onComplete(@NonNull Task<GetTokenResult> task) {
-                if (task.isSuccessful()) {
+                if (task.isSuccessful() && task.getResult() != null) {
                   String idToken = task.getResult().getToken();
                   result.success(idToken);
                 } else {
@@ -461,26 +501,40 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
   }
 
   private void handleUpdateEmail(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    final FirebaseUser currentUser = firebaseAuth.getCurrentUser();
+    if (currentUser == null) {
+      markUserRequired(result);
+      return;
+    }
+
     Map<String, String> arguments = call.arguments();
     final String email = arguments.get("email");
 
-    firebaseAuth
-        .getCurrentUser()
-        .updateEmail(email)
-        .addOnCompleteListener(new TaskVoidCompleteListener(result));
+    currentUser.updateEmail(email).addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
   private void handleUpdatePassword(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    final FirebaseUser currentUser = firebaseAuth.getCurrentUser();
+    if (currentUser == null) {
+      markUserRequired(result);
+      return;
+    }
+
     Map<String, String> arguments = call.arguments();
     final String password = arguments.get("password");
 
-    firebaseAuth
-        .getCurrentUser()
+    currentUser
         .updatePassword(password)
         .addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
   private void handleUpdateProfile(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    final FirebaseUser currentUser = firebaseAuth.getCurrentUser();
+    if (currentUser == null) {
+      markUserRequired(result);
+      return;
+    }
+
     Map<String, String> arguments = call.arguments();
 
     UserProfileChangeRequest.Builder builder = new UserProfileChangeRequest.Builder();
@@ -491,8 +545,7 @@ private void handleUpdateProfile(MethodCall call, Result result, FirebaseAuth fi
       builder.setPhotoUri(Uri.parse(arguments.get("photoUrl")));
     }
 
-    firebaseAuth
-        .getCurrentUser()
+    currentUser
         .updateProfile(builder.build())
         .addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
@@ -624,15 +677,19 @@ private Map<String, Object> mapFromUser(FirebaseUser user) {
     if (user != null) {
       List<Map<String, Object>> providerData = new ArrayList<>();
       for (UserInfo userInfo : user.getProviderData()) {
-        // Ignore phone provider since firebase provider is a super set of the phone provider.
+        // Ignore phone provider since firebase provider is a super set of the phone
+        // provider.
         if (userInfo.getProviderId().equals("phone")) {
           continue;
         }
         providerData.add(Collections.unmodifiableMap(userInfoToMap(userInfo)));
       }
       Map<String, Object> userMap = userInfoToMap(user);
-      userMap.put("creationTimestamp", user.getMetadata().getCreationTimestamp());
-      userMap.put("lastSignInTimestamp", user.getMetadata().getLastSignInTimestamp());
+      final FirebaseUserMetadata metadata = user.getMetadata();
+      if (metadata != null) {
+        userMap.put("creationTimestamp", metadata.getCreationTimestamp());
+        userMap.put("lastSignInTimestamp", metadata.getLastSignInTimestamp());
+      }
       userMap.put("isAnonymous", user.isAnonymous());
       userMap.put("isEmailVerified", user.isEmailVerified());
       userMap.put("providerData", Collections.unmodifiableList(providerData));
@@ -642,6 +699,10 @@ private Map<String, Object> mapFromUser(FirebaseUser user) {
     }
   }
 
+  private void markUserRequired(Result result) {
+    result.error("USER_REQUIRED", "Please authenticate with Firebase first", null);
+  }
+
   private void reportException(Result result, @Nullable Exception exception) {
     if (exception != null) {
       if (exception instanceof FirebaseAuthException) {
diff --git a/packages/firebase_auth/example/android/build.gradle b/packages/firebase_auth/example/android/build.gradle
index 6ca85f908e0b..4e7865bfca32 100755
--- a/packages/firebase_auth/example/android/build.gradle
+++ b/packages/firebase_auth/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.1'
         classpath 'com.google.gms:google-services:4.2.0'
     }
 }
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index d5395ab5304f..3f20fe6b86d4 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.1+2"
+version: "0.8.1+3"
 
 flutter:
   plugin:

From 8d9e174d17632ae139265cf2910e65fc57eaacf7 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Fri, 22 Feb 2019 10:23:14 -0800
Subject: [PATCH 167/410] Skip Gradle's static permission check for the Maps
 MyLocation feature. (#1256)

Only applications that use the MyLocation feature needs to add the
location permission to the Android manifest, but in some configurations
Gradle fails the build if the permission is not included.

Fixes https://github.com/flutter/flutter/issues/28339
---
 packages/google_maps_flutter/CHANGELOG.md                    | 4 ++++
 .../io/flutter/plugins/googlemaps/GoogleMapController.java   | 5 +++++
 packages/google_maps_flutter/pubspec.yaml                    | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index dc62d4968476..9d18a3850ca3 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0+5
+
+* Skip the Gradle Android permissions lint for MyLocation (https://github.com/flutter/flutter/issues/28339)
+
 ## 0.2.0+4
 
 * Fixed a crash when the plugin is registered by a background FlutterView.
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index 5aeba443ed95..c8d541f17785 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -416,6 +416,11 @@ public void setMyLocationEnabled(boolean myLocationEnabled) {
 
   private void updateMyLocationEnabled() {
     if (hasLocationPermission()) {
+      // The plugin doesn't add the location permission by default so that apps that don't need
+      // the feature won't require the permission.
+      // Gradle is doing a static check for missing permission and in some configurations will
+      // fail the build if the permission is missing. The following disables the Gradle lint.
+      //noinspection ResourceType
       googleMap.setMyLocationEnabled(myLocationEnabled);
     } else {
       // TODO(amirh): Make the options update fail.
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 5b6463040e97..361415fe6716 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.2.0+4
+version: 0.2.0+5
 
 dependencies:
   flutter:

From 462e3dd6b217126cfa16cba68f83332d2bbf407d Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Fri, 22 Feb 2019 10:53:37 -0800
Subject: [PATCH 168/410] Suppress unchecked cast warning for the
 PlatformViewFactory creation parameters. (#1257)

---
 packages/google_maps_flutter/CHANGELOG.md                        | 1 +
 .../java/io/flutter/plugins/googlemaps/GoogleMapFactory.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 9d18a3850ca3..46a7aad44e13 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 0.2.0+5
 
 * Skip the Gradle Android permissions lint for MyLocation (https://github.com/flutter/flutter/issues/28339)
+* Suppress unchecked cast warning for the PlatformViewFactory creation parameters.
 
 ## 0.2.0+4
 
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
index 5d85ad2731ff..ee0fdb6119c6 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
@@ -21,6 +21,7 @@ public GoogleMapFactory(AtomicInteger state, Registrar registrar) {
     mPluginRegistrar = registrar;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public PlatformView create(Context context, int id, Object args) {
     Map<String, Object> params = (Map<String, Object>) args;

From 06339f5867911e11334f17be1f17f4ff77c7d4f4 Mon Sep 17 00:00:00 2001
From: Feu <fabricio@feu.com.br>
Date: Mon, 25 Feb 2019 00:02:25 -0300
Subject: [PATCH 169/410] [cloud_firestore,firebase_database,firebase_storage]
 handling error = nil on getFlutterError (#1274)

When `getFlutterError` was introduced(https://github.com/flutter/plugins/pull/1226), some plugins started to throw exceptions for successful operations. This fixed the issue. Related issues include flutter/flutter#28344; flutter/flutter#28065; flutter/flutter#28103
It also fixed an unintentional typo introduced in the same PR.(https://github.com/flutter/plugins/pull/1226)
---
 packages/cloud_firestore/CHANGELOG.md                         | 4 ++++
 packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m   | 4 +++-
 packages/cloud_firestore/pubspec.yaml                         | 2 +-
 packages/firebase_database/CHANGELOG.md                       | 4 ++++
 .../firebase_database/ios/Classes/FirebaseDatabasePlugin.m    | 4 +++-
 packages/firebase_database/pubspec.yaml                       | 2 +-
 packages/firebase_storage/CHANGELOG.md                        | 4 ++++
 packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m | 2 +-
 packages/firebase_storage/pubspec.yaml                        | 2 +-
 9 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 7b5e33f8ab47..153ba087e15c 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.5+2
+
+* Fixing PlatformException(Error 0, null, null) which happened when a successful operation was performed.
+
 ## 0.9.5+1
 
 * Log messages about automatic configuration of the default app are now less confusing.
diff --git a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
index ca56ec320a06..6a4850cb0356 100644
--- a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
@@ -7,7 +7,9 @@
 #import <Firebase/Firebase.h>
 
 static FlutterError *getFlutterError(NSError *error) {
-  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code]
+  if (error == nil) return nil;
+
+  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %ld", error.code]
                              message:error.domain
                              details:error.localizedDescription];
 }
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index c95162ae8b34..9875d6de140b 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.5+1
+version: 0.9.5+2
 
 flutter:
   plugin:
diff --git a/packages/firebase_database/CHANGELOG.md b/packages/firebase_database/CHANGELOG.md
index 4b6b09036047..50178e9df472 100644
--- a/packages/firebase_database/CHANGELOG.md
+++ b/packages/firebase_database/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.1+3
+
+* Fixing DatabaseReference.set unhandled exception which happened when a successful operation was performed.
+
 ## 2.0.1+2
 
 * Log messages about automatic configuration of the default app are now less confusing.
diff --git a/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m b/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m
index b375a44acd5e..e9b09cb1f042 100644
--- a/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m
+++ b/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m
@@ -7,7 +7,9 @@
 #import <Firebase/Firebase.h>
 
 static FlutterError *getFlutterError(NSError *error) {
-  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code]
+  if (error == nil) return nil;
+
+  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %ld", error.code]
                              message:error.domain
                              details:error.localizedDescription];
 }
diff --git a/packages/firebase_database/pubspec.yaml b/packages/firebase_database/pubspec.yaml
index f0c1dbc975fc..f5189b7d4ebc 100755
--- a/packages/firebase_database/pubspec.yaml
+++ b/packages/firebase_database/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Database, a cloud-hosted NoSQL database
   with realtime data syncing across Android and iOS clients, and offline access.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_database
-version: 2.0.1+1
+version: 2.0.1+3
 
 flutter:
   plugin:
diff --git a/packages/firebase_storage/CHANGELOG.md b/packages/firebase_storage/CHANGELOG.md
index 9d16936d7064..822a74bcace5 100644
--- a/packages/firebase_storage/CHANGELOG.md
+++ b/packages/firebase_storage/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.0+1
+
+* Reverting error.code casting/formatting to what it was until version 2.0.1.
+
 ## 2.1.0
 
 * Added support for getReferenceFromUrl.
diff --git a/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m b/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
index 70027edf967d..ced82f7fce94 100644
--- a/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
+++ b/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
@@ -7,7 +7,7 @@
 #import <Firebase/Firebase.h>
 
 static FlutterError *getFlutterError(NSError *error) {
-  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code]
+  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %ld", (long)error.code]
                              message:error.domain
                              details:error.localizedDescription];
 }
diff --git a/packages/firebase_storage/pubspec.yaml b/packages/firebase_storage/pubspec.yaml
index 9216639b350f..6bca9061bd71 100755
--- a/packages/firebase_storage/pubspec.yaml
+++ b/packages/firebase_storage/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Storage, a powerful, simple, and
   cost-effective object storage service for Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_storage
-version: 2.1.0
+version: 2.1.0+1
 
 flutter:
   plugin:

From 02c8b8ba4c07767751f0e69ccb0a2b28761a7929 Mon Sep 17 00:00:00 2001
From: Chris Yang <cyang8954@gmail.com>
Date: Sun, 24 Feb 2019 23:07:27 -0800
Subject: [PATCH 170/410] adding nil check for some static methods to avoud
 unwated behaviors (#1279)

This is a similar fix following up https://github.com/flutter/plugins/pull/1274
---
 packages/firebase_core/CHANGELOG.md                         | 4 ++++
 packages/firebase_core/ios/Classes/FirebaseCorePlugin.m     | 6 ++++++
 packages/firebase_core/pubspec.yaml                         | 2 +-
 packages/firebase_database/CHANGELOG.md                     | 4 ++++
 .../firebase_database/ios/Classes/FirebaseDatabasePlugin.m  | 3 +++
 packages/firebase_database/pubspec.yaml                     | 2 +-
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md
index 60386f7caaa6..99ea4b61983f 100644
--- a/packages/firebase_core/CHANGELOG.md
+++ b/packages/firebase_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.1+1
+
+* Add nil check on static functions to prevent crashes or unwanted behaviors.
+
 ## 0.3.1
 
 * Remove an assertion that can interfere with hot-restart.
diff --git a/packages/firebase_core/ios/Classes/FirebaseCorePlugin.m b/packages/firebase_core/ios/Classes/FirebaseCorePlugin.m
index 2c5418e00272..7a2258515df3 100644
--- a/packages/firebase_core/ios/Classes/FirebaseCorePlugin.m
+++ b/packages/firebase_core/ios/Classes/FirebaseCorePlugin.m
@@ -7,6 +7,9 @@
 #import <Firebase/Firebase.h>
 
 static NSDictionary *getDictionaryFromFIROptions(FIROptions *options) {
+  if (!options) {
+    return nil;
+  }
   return @{
     @"googleAppID" : options.googleAppID ?: [NSNull null],
     @"bundleID" : options.bundleID ?: [NSNull null],
@@ -23,6 +26,9 @@
 }
 
 static NSDictionary *getDictionaryFromFIRApp(FIRApp *app) {
+  if (!app) {
+    return nil;
+  }
   return @{@"name" : app.name, @"options" : getDictionaryFromFIROptions(app.options)};
 }
 
diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml
index 818ecf5b2603..2f215ff691eb 100644
--- a/packages/firebase_core/pubspec.yaml
+++ b/packages/firebase_core/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Core, enabling connecting to multiple
   Firebase apps.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_core
-version: 0.3.1
+version: 0.3.1+1
 
 flutter:
   plugin:
diff --git a/packages/firebase_database/CHANGELOG.md b/packages/firebase_database/CHANGELOG.md
index 50178e9df472..7f8995ccbb4b 100644
--- a/packages/firebase_database/CHANGELOG.md
+++ b/packages/firebase_database/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.2
+
+* Fix the issue that `getDictionaryFromError` always returns non nil result even when the parameter is nil.
+
 ## 2.0.1+3
 
 * Fixing DatabaseReference.set unhandled exception which happened when a successful operation was performed.
diff --git a/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m b/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m
index e9b09cb1f042..714094683181 100644
--- a/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m
+++ b/packages/firebase_database/ios/Classes/FirebaseDatabasePlugin.m
@@ -15,6 +15,9 @@
 }
 
 static NSDictionary *getDictionaryFromError(NSError *error) {
+  if (!error) {
+    return nil;
+  }
   return @{
     @"code" : @(error.code),
     @"message" : error.domain ?: [NSNull null],
diff --git a/packages/firebase_database/pubspec.yaml b/packages/firebase_database/pubspec.yaml
index f5189b7d4ebc..d0f669868ba8 100755
--- a/packages/firebase_database/pubspec.yaml
+++ b/packages/firebase_database/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Database, a cloud-hosted NoSQL database
   with realtime data syncing across Android and iOS clients, and offline access.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_database
-version: 2.0.1+3
+version: 2.0.2
 
 flutter:
   plugin:

From fad02d87cc0fff4c930db520b73411f6c06cc7dd Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Mon, 25 Feb 2019 09:00:14 -0800
Subject: [PATCH 171/410] [in_app_purchase] Java API for querying purchases
 (#1259)

Actually responds in the onPurchasesUpdated() handler automatically
called when purchase updates are received.

Exposes BillingClient#queryPurchases, which is meant to be used to get
recently purchased items from the on disk Play cache.

Also exposes BillingClient#queryPurchaseHistoryAsync, which returns the
most recent purchase of the user for each SKU of the given type.

This patch also contains some updates to the Gradle script so that the
example app version is set independently of the Flutter SDK version.

flutter/flutter#26326
---
 .../inapppurchase/InAppPurchasePlugin.java    |  75 +++++++++++--
 .../plugins/inapppurchase/Translator.java     |  33 ++++++
 .../example/android/app/build.gradle          |  16 +--
 .../InAppPurchasePluginTest.java              | 104 ++++++++++++++++++
 .../plugins/inapppurchase/TranslatorTest.java |  80 +++++++++++++-
 5 files changed, 286 insertions(+), 22 deletions(-)

diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
index 89a42d6d2b73..7b45937cfa7e 100644
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
@@ -4,6 +4,8 @@
 
 package io.flutter.plugins.inapppurchase;
 
+import static io.flutter.plugins.inapppurchase.Translator.fromPurchasesList;
+import static io.flutter.plugins.inapppurchase.Translator.fromPurchasesResult;
 import static io.flutter.plugins.inapppurchase.Translator.fromSkuDetailsList;
 
 import android.app.Activity;
@@ -14,6 +16,7 @@
 import com.android.billingclient.api.BillingClientStateListener;
 import com.android.billingclient.api.BillingFlowParams;
 import com.android.billingclient.api.Purchase;
+import com.android.billingclient.api.PurchaseHistoryResponseListener;
 import com.android.billingclient.api.PurchasesUpdatedListener;
 import com.android.billingclient.api.SkuDetails;
 import com.android.billingclient.api.SkuDetailsParams;
@@ -46,6 +49,11 @@ static final class MethodNames {
         "BillingClient#querySkuDetailsAsync(SkuDetailsParams, SkuDetailsResponseListener)";
     static final String LAUNCH_BILLING_FLOW =
         "BillingClient#launchBillingFlow(Activity, BillingFlowParams)";
+    static final String ON_PURCHASES_UPDATED =
+        "PurchasesUpdatedListener#onPurchasesUpdated(int, List<Purchase>)";
+    static final String QUERY_PURCHASES = "queryPurchases(String)";
+    static final String QUERY_PURCHASE_HISTORY_ASYNC =
+        "queryPurchaseHistoryAsync(String, PurchaseHistoryResponseListener)";
 
     private MethodNames() {};
   }
@@ -86,6 +94,12 @@ public void onMethodCall(MethodCall call, Result result) {
         launchBillingFlow(
             (String) call.argument("sku"), (String) call.argument("accountId"), result);
         break;
+      case MethodNames.QUERY_PURCHASES:
+        queryPurchases((String) call.argument("skuType"), result);
+        break;
+      case MethodNames.QUERY_PURCHASE_HISTORY_ASYNC:
+        queryPurchaseHistoryAsync((String) call.argument("skuType"), result);
+        break;
       default:
         result.notImplemented();
     }
@@ -101,7 +115,7 @@ public void onMethodCall(MethodCall call, Result result) {
 
   private void startConnection(final int handle, final Result result) {
     if (billingClient == null) {
-      billingClient = buildBillingClient(context);
+      billingClient = buildBillingClient(context, channel);
     }
 
     billingClient.startConnection(
@@ -181,7 +195,38 @@ private void launchBillingFlow(String sku, @Nullable String accountId, Result re
     result.success(billingClient.launchBillingFlow(activity, paramsBuilder.build()));
   }
 
-  private void updateCachedSkus(List<SkuDetails> skuDetailsList) {
+  private void queryPurchases(String skuType, Result result) {
+    if (billingClientError(result)) {
+      return;
+    }
+
+    // Like in our connect call, consider the billing client responding a "success" here regardless of status code.
+    result.success(fromPurchasesResult(billingClient.queryPurchases(skuType)));
+  }
+
+  private void queryPurchaseHistoryAsync(String skuType, final Result result) {
+    if (billingClientError(result)) {
+      return;
+    }
+
+    billingClient.queryPurchaseHistoryAsync(
+        skuType,
+        new PurchaseHistoryResponseListener() {
+          @Override
+          public void onPurchaseHistoryResponse(int responseCode, List<Purchase> purchasesList) {
+            final Map<String, Object> serialized = new HashMap<>();
+            serialized.put("responseCode", responseCode);
+            serialized.put("purchasesList", fromPurchasesList(purchasesList));
+            result.success(serialized);
+          }
+        });
+  }
+
+  private void updateCachedSkus(@Nullable List<SkuDetails> skuDetailsList) {
+    if (skuDetailsList == null) {
+      return;
+    }
+
     for (SkuDetails skuDetails : skuDetailsList) {
       cachedSkus.put(skuDetails.getSku(), skuDetails);
     }
@@ -196,14 +241,26 @@ private boolean billingClientError(Result result) {
     return true;
   }
 
-  private static BillingClient buildBillingClient(Context context) {
+  private static BillingClient buildBillingClient(Context context, MethodChannel channel) {
     return BillingClient.newBuilder(context)
-        .setListener(
-            new PurchasesUpdatedListener() {
-              @Override
-              public void onPurchasesUpdated(
-                  int responseCode, @Nullable List<Purchase> purchases) {}
-            })
+        .setListener(new PluginPurchaseListener(channel))
         .build();
   }
+
+  @VisibleForTesting
+  /*package*/ static class PluginPurchaseListener implements PurchasesUpdatedListener {
+    private final MethodChannel channel;
+
+    PluginPurchaseListener(MethodChannel channel) {
+      this.channel = channel;
+    }
+
+    @Override
+    public void onPurchasesUpdated(int responseCode, @Nullable List<Purchase> purchases) {
+      final Map<String, Object> callbackArgs = new HashMap<>();
+      callbackArgs.put("responseCode", responseCode);
+      callbackArgs.put("purchases", fromPurchasesList(purchases));
+      channel.invokeMethod(MethodNames.ON_PURCHASES_UPDATED, callbackArgs);
+    }
+  }
 }
diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
index 89c96a0665b7..faa55cb8ec5b 100644
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
@@ -5,6 +5,8 @@
 package io.flutter.plugins.inapppurchase;
 
 import androidx.annotation.Nullable;
+import com.android.billingclient.api.Purchase;
+import com.android.billingclient.api.Purchase.PurchasesResult;
 import com.android.billingclient.api.SkuDetails;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -44,4 +46,35 @@ static List<HashMap<String, Object>> fromSkuDetailsList(
     }
     return output;
   }
+
+  static HashMap<String, Object> fromPurchase(Purchase purchase) {
+    HashMap<String, Object> info = new HashMap<>();
+    info.put("orderId", purchase.getOrderId());
+    info.put("packageName", purchase.getPackageName());
+    info.put("purchaseTime", purchase.getPurchaseTime());
+    info.put("purchaseToken", purchase.getPurchaseToken());
+    info.put("signature", purchase.getSignature());
+    info.put("sku", purchase.getSku());
+    info.put("isAutoRenewing", purchase.isAutoRenewing());
+    return info;
+  }
+
+  static List<HashMap<String, Object>> fromPurchasesList(@Nullable List<Purchase> purchases) {
+    if (purchases == null) {
+      return Collections.emptyList();
+    }
+
+    List<HashMap<String, Object>> serialized = new ArrayList<>();
+    for (Purchase purchase : purchases) {
+      serialized.add(fromPurchase(purchase));
+    }
+    return serialized;
+  }
+
+  static HashMap<String, Object> fromPurchasesResult(PurchasesResult purchasesResult) {
+    HashMap<String, Object> info = new HashMap<>();
+    info.put("responseCode", purchasesResult.getResponseCode());
+    info.put("purchasesList", fromPurchasesList(purchasesResult.getPurchasesList()));
+    return info;
+  }
 }
diff --git a/packages/in_app_purchase/example/android/app/build.gradle b/packages/in_app_purchase/example/android/app/build.gradle
index 969da0095eb8..3d569e23a4c2 100644
--- a/packages/in_app_purchase/example/android/app/build.gradle
+++ b/packages/in_app_purchase/example/android/app/build.gradle
@@ -27,6 +27,8 @@ project.ext {
     KEYSTORE_STORE_PASSWORD = keystoreProperties['storePassword']
     KEYSTORE_KEY_ALIAS = keystoreProperties['keyAlias']
     KEYSTORE_KEY_PASSWORD = keystoreProperties['keyPassword']
+    VERSION_CODE = 1
+    VERSION_NAME = "0.0.1"
 }
 
 if (project.APP_ID == "io.flutter.plugins.inapppurchaseexample.DEFAULT_DO_NOT_USE") {
@@ -46,16 +48,6 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
@@ -79,8 +71,8 @@ android {
         applicationId project.APP_ID
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        versionCode project.VERSION_CODE
+        versionName project.VERSION_NAME
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
index 5a4b84cccd3c..2a515aea4ad9 100644
--- a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
+++ b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
@@ -4,8 +4,13 @@
 import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.IS_READY;
 import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.LAUNCH_BILLING_FLOW;
 import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.ON_DISCONNECT;
+import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.ON_PURCHASES_UPDATED;
+import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.QUERY_PURCHASES;
+import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.QUERY_PURCHASE_HISTORY_ASYNC;
 import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.QUERY_SKU_DETAILS;
 import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.START_CONNECTION;
+import static io.flutter.plugins.inapppurchase.Translator.fromPurchasesList;
+import static io.flutter.plugins.inapppurchase.Translator.fromPurchasesResult;
 import static io.flutter.plugins.inapppurchase.Translator.fromSkuDetailsList;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
@@ -14,6 +19,7 @@
 import static org.junit.Assert.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.contains;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -27,12 +33,17 @@
 import com.android.billingclient.api.BillingClient.SkuType;
 import com.android.billingclient.api.BillingClientStateListener;
 import com.android.billingclient.api.BillingFlowParams;
+import com.android.billingclient.api.Purchase;
+import com.android.billingclient.api.Purchase.PurchasesResult;
+import com.android.billingclient.api.PurchaseHistoryResponseListener;
+import com.android.billingclient.api.PurchasesUpdatedListener;
 import com.android.billingclient.api.SkuDetails;
 import com.android.billingclient.api.SkuDetailsParams;
 import com.android.billingclient.api.SkuDetailsResponseListener;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.Result;
+import io.flutter.plugins.inapppurchase.InAppPurchasePlugin.PluginPurchaseListener;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -279,6 +290,93 @@ public void launchBillingFlow_skuNotFound() {
     verify(result, never()).success(any());
   }
 
+  @Test
+  public void queryPurchases() {
+    establishConnectedBillingClient(null, null);
+    PurchasesResult purchasesResult = mock(PurchasesResult.class);
+    when(purchasesResult.getResponseCode()).thenReturn(BillingResponse.OK);
+    Purchase purchase = buildPurchase("foo");
+    when(purchasesResult.getPurchasesList()).thenReturn(asList(purchase));
+    when(mockBillingClient.queryPurchases(SkuType.INAPP)).thenReturn(purchasesResult);
+
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("skuType", SkuType.INAPP);
+    plugin.onMethodCall(new MethodCall(QUERY_PURCHASES, arguments), result);
+
+    // Verify we pass the response to result
+    ArgumentCaptor<HashMap<String, Object>> resultCaptor = ArgumentCaptor.forClass(HashMap.class);
+    verify(result, never()).error(any(), any(), any());
+    verify(result, times(1)).success(resultCaptor.capture());
+    assertEquals(fromPurchasesResult(purchasesResult), resultCaptor.getValue());
+  }
+
+  @Test
+  public void queryPurchases_clientDisconnected() {
+    // Prepare the launch call after disconnecting the client
+    plugin.onMethodCall(new MethodCall(END_CONNECTION, null), mock(Result.class));
+
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("skuType", SkuType.INAPP);
+    plugin.onMethodCall(new MethodCall(QUERY_PURCHASES, arguments), result);
+
+    // Assert that we sent an error back.
+    verify(result).error(contains("UNAVAILABLE"), contains("BillingClient"), any());
+    verify(result, never()).success(any());
+  }
+
+  @Test
+  public void queryPurchaseHistoryAsync() {
+    // Set up an established billing client and all our mocked responses
+    establishConnectedBillingClient(null, null);
+    ArgumentCaptor<HashMap<String, Object>> resultCaptor = ArgumentCaptor.forClass(HashMap.class);
+    int responseCode = BillingResponse.OK;
+    List<Purchase> purchasesList = asList(buildPurchase("foo"));
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("skuType", SkuType.INAPP);
+    ArgumentCaptor<PurchaseHistoryResponseListener> listenerCaptor =
+        ArgumentCaptor.forClass(PurchaseHistoryResponseListener.class);
+
+    plugin.onMethodCall(new MethodCall(QUERY_PURCHASE_HISTORY_ASYNC, arguments), result);
+
+    // Verify we pass the data to result
+    verify(mockBillingClient)
+        .queryPurchaseHistoryAsync(eq(SkuType.INAPP), listenerCaptor.capture());
+    listenerCaptor.getValue().onPurchaseHistoryResponse(responseCode, purchasesList);
+    verify(result).success(resultCaptor.capture());
+    HashMap<String, Object> resultData = resultCaptor.getValue();
+    assertEquals(responseCode, resultData.get("responseCode"));
+    assertEquals(fromPurchasesList(purchasesList), resultData.get("purchasesList"));
+  }
+
+  @Test
+  public void queryPurchaseHistoryAsync_clientDisconnected() {
+    // Prepare the launch call after disconnecting the client
+    plugin.onMethodCall(new MethodCall(END_CONNECTION, null), mock(Result.class));
+
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("skuType", SkuType.INAPP);
+    plugin.onMethodCall(new MethodCall(QUERY_PURCHASE_HISTORY_ASYNC, arguments), result);
+
+    // Assert that we sent an error back.
+    verify(result).error(contains("UNAVAILABLE"), contains("BillingClient"), any());
+    verify(result, never()).success(any());
+  }
+
+  @Test
+  public void onPurchasesUpdatedListener() {
+    PluginPurchaseListener listener = new PluginPurchaseListener(mockMethodChannel);
+
+    int responseCode = BillingResponse.OK;
+    List<Purchase> purchasesList = asList(buildPurchase("foo"));
+    ArgumentCaptor<HashMap<String, Object>> resultCaptor = ArgumentCaptor.forClass(HashMap.class);
+    doNothing().when(mockMethodChannel).invokeMethod(eq(ON_PURCHASES_UPDATED), resultCaptor.capture());
+    listener.onPurchasesUpdated(responseCode, purchasesList);
+
+    HashMap<String, Object> resultData = resultCaptor.getValue();
+    assertEquals(responseCode, resultData.get("responseCode"));
+    assertEquals(fromPurchasesList(purchasesList), resultData.get("purchases"));
+  }
+
   private void establishConnectedBillingClient(
       @Nullable Map<String, Integer> arguments, @Nullable Result result) {
     if (arguments == null) {
@@ -319,4 +417,10 @@ private SkuDetails buildSkuDetails(String id) {
     when(details.getSku()).thenReturn(id);
     return details;
   }
+
+  private Purchase buildPurchase(String orderId) {
+    Purchase purchase = mock(Purchase.class);
+    when(purchase.getOrderId()).thenReturn(orderId);
+    return purchase;
+  }
 }
diff --git a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java
index 0322a749f3cb..007ba8d5f600 100644
--- a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java
+++ b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java
@@ -5,9 +5,15 @@
 package io.flutter.plugins.inapppurchase;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import com.android.billingclient.api.BillingClient.BillingResponse;
+import com.android.billingclient.api.Purchase;
+import com.android.billingclient.api.Purchase.PurchasesResult;
 import com.android.billingclient.api.SkuDetails;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +23,8 @@
 public class TranslatorTest {
   private static final String SKU_DETAIL_EXAMPLE_JSON =
       "{\"productId\":\"example\",\"type\":\"inapp\",\"price\":\"$0.99\",\"price_amount_micros\":990000,\"price_currency_code\":\"USD\",\"title\":\"Example title\",\"description\":\"Example description.\"}";
+  private static final String PURCHASE_EXAMPLE_JSON =
+      "{\"orderId\":\"foo\",\"packageName\":\"bar\",\"productId\":\"consumable\",\"purchaseTime\":11111111,\"purchaseState\":0,\"purchaseToken\":\"baz\"}";
 
   @Test
   public void fromSkuDetail() throws JSONException {
@@ -44,7 +52,68 @@ public void fromSkuDetailsList() throws JSONException {
 
   @Test
   public void fromSkuDetailsList_null() {
-    assertEquals(0, Translator.fromSkuDetailsList(null).size());
+    assertEquals(Collections.emptyList(), Translator.fromSkuDetailsList(null));
+  }
+
+  @Test
+  public void fromPurchase() throws JSONException {
+    final Purchase expected = new Purchase(PURCHASE_EXAMPLE_JSON, "signature");
+
+    assertSerialized(expected, Translator.fromPurchase(expected));
+  }
+
+  @Test
+  public void fromPurchasesList() throws JSONException {
+    final String purchase2Json =
+        "{\"orderId\":\"foo2\",\"packageName\":\"bar\",\"productId\":\"consumable\",\"purchaseTime\":11111111,\"purchaseState\":0,\"purchaseToken\":\"baz\"}";
+    final String signature = "signature";
+    final List<Purchase> expected =
+        Arrays.asList(
+            new Purchase(PURCHASE_EXAMPLE_JSON, signature), new Purchase(purchase2Json, signature));
+
+    final List<HashMap<String, Object>> serialized = Translator.fromPurchasesList(expected);
+
+    assertEquals(expected.size(), serialized.size());
+    assertSerialized(expected.get(0), serialized.get(0));
+    assertSerialized(expected.get(1), serialized.get(1));
+  }
+
+  @Test
+  public void fromPurchasesList_null() {
+    assertEquals(Collections.emptyList(), Translator.fromPurchasesList(null));
+  }
+
+  @Test
+  public void fromPurchasesResult() throws JSONException {
+    PurchasesResult result = mock(PurchasesResult.class);
+    final String purchase2Json =
+        "{\"orderId\":\"foo2\",\"packageName\":\"bar\",\"productId\":\"consumable\",\"purchaseTime\":11111111,\"purchaseState\":0,\"purchaseToken\":\"baz\"}";
+    final String signature = "signature";
+    final List<Purchase> expectedPurchases =
+        Arrays.asList(
+            new Purchase(PURCHASE_EXAMPLE_JSON, signature), new Purchase(purchase2Json, signature));
+    when(result.getPurchasesList()).thenReturn(expectedPurchases);
+    when(result.getResponseCode()).thenReturn(BillingResponse.OK);
+
+    final HashMap<String, Object> serialized = Translator.fromPurchasesResult(result);
+
+    assertEquals(BillingResponse.OK, serialized.get("responseCode"));
+    List<Map<String, Object>> serializedPurchases =
+        (List<Map<String, Object>>) serialized.get("purchasesList");
+    assertEquals(expectedPurchases.size(), serializedPurchases.size());
+    assertSerialized(expectedPurchases.get(0), serializedPurchases.get(0));
+    assertSerialized(expectedPurchases.get(1), serializedPurchases.get(1));
+  }
+
+  @Test
+  public void fromPurchasesResult_null() throws JSONException {
+    PurchasesResult result = mock(PurchasesResult.class);
+    when(result.getResponseCode()).thenReturn(BillingResponse.ERROR);
+
+    final HashMap<String, Object> serialized = Translator.fromPurchasesResult(result);
+
+    assertEquals(BillingResponse.ERROR, serialized.get("responseCode"));
+    assertEquals(Collections.emptyList(), serialized.get("purchasesList"));
   }
 
   private void assertSerialized(SkuDetails expected, Map<String, Object> serialized) {
@@ -64,4 +133,13 @@ private void assertSerialized(SkuDetails expected, Map<String, Object> serialize
     assertEquals(expected.getTitle(), serialized.get("title"));
     assertEquals(expected.getType(), serialized.get("type"));
   }
+
+  private void assertSerialized(Purchase expected, Map<String, Object> serialized) {
+    assertEquals(expected.getOrderId(), serialized.get("orderId"));
+    assertEquals(expected.getPackageName(), serialized.get("packageName"));
+    assertEquals(expected.getPurchaseTime(), serialized.get("purchaseTime"));
+    assertEquals(expected.getPurchaseToken(), serialized.get("purchaseToken"));
+    assertEquals(expected.getSignature(), serialized.get("signature"));
+    assertEquals(expected.getSku(), serialized.get("sku"));
+  }
 }

From 724ec4d6b9e76fb9d5f61e2f390df3ebcb9d07a8 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Mon, 25 Feb 2019 11:29:06 -0800
Subject: [PATCH 172/410] [google_maps_flutter] Update the sample app in
 README.md (#1271)

---
 packages/google_maps_flutter/CHANGELOG.md |  4 ++
 packages/google_maps_flutter/README.md    | 83 ++++++++++++-----------
 packages/google_maps_flutter/pubspec.yaml |  2 +-
 3 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 46a7aad44e13..d762e465e236 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0+6
+
+* Updated the sample app in README.md.
+
 ## 0.2.0+5
 
 * Skip the Gradle Android permissions lint for MyLocation (https://github.com/flutter/flutter/issues/28339)
diff --git a/packages/google_maps_flutter/README.md b/packages/google_maps_flutter/README.md
index a00e69840464..dc37bd8bca0a 100644
--- a/packages/google_maps_flutter/README.md
+++ b/packages/google_maps_flutter/README.md
@@ -87,64 +87,65 @@ You can now add a `GoogleMap` widget to your widget tree.
 The map view can be controlled with the `GoogleMapController` that is passed to
 the `GoogleMap`'s `onMapCreated` callback.
 
+### Sample Usage
+
 ```dart
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 
-void main() {
-  runApp(MaterialApp(
-    home: Scaffold(
-      appBar: AppBar(title: const Text('Google Maps demo')),
-      body: MapsDemo(),
-    ),
-  ));
+void main() => runApp(MyApp());
+
+class MyApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      title: 'Flutter Google Maps Demo',
+      home: MapSample(),
+    );
+  }
 }
 
-class MapsDemo extends StatefulWidget {
+class MapSample extends StatefulWidget {
   @override
-  State createState() => MapsDemoState();
+  State<MapSample> createState() => MapSampleState();
 }
 
-class MapsDemoState extends State<MapsDemo> {
+class MapSampleState extends State<MapSample> {
+  Completer<GoogleMapController> _controller = Completer();
 
-  GoogleMapController mapController;
+  static final CameraPosition _kGooglePlex = CameraPosition(
+    target: LatLng(37.42796133580664, -122.085749655962),
+    zoom: 14.4746,
+  );
+
+  static final CameraPosition _kLake = CameraPosition(
+      bearing: 192.8334901395799,
+      target: LatLng(37.43296265331129, -122.08832357078792),
+      tilt: 59.440717697143555,
+      zoom: 19.151926040649414);
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: EdgeInsets.all(15.0),
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-        children: <Widget>[
-          Center(
-            child: SizedBox(
-              width: 300.0,
-              height: 200.0,
-              child: GoogleMap(
-                onMapCreated: _onMapCreated,
-              ),
-            ),
-          ),
-          RaisedButton(
-            child: const Text('Go to London'),
-            onPressed: mapController == null ? null : () {
-              mapController.animateCamera(CameraUpdate.newCameraPosition(
-                const CameraPosition(
-                  bearing: 270.0,
-                  target: LatLng(51.5160895, -0.1294527),
-                  tilt: 30.0,
-                  zoom: 17.0,
-                ),
-              ));
-            },
-          ),
-        ],
+    return new Scaffold(
+      body: GoogleMap(
+        mapType: MapType.hybrid,
+        initialCameraPosition: _kGooglePlex,
+        onMapCreated: (GoogleMapController controller) {
+          _controller.complete(controller);
+        },
+      ),
+      floatingActionButton: FloatingActionButton.extended(
+        onPressed: _goToTheLake,
+        label: Text('To the lake!'),
       ),
     );
   }
 
-  void _onMapCreated(GoogleMapController controller) {
-    setState(() { mapController = controller; });
+  Future<void> _goToTheLake() async {
+    final GoogleMapController controller = await _controller.future;
+    controller.animateCamera(CameraUpdate.newCameraPosition(_kLake));
   }
 }
 ```
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 361415fe6716..f6b502346b37 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.2.0+5
+version: 0.2.0+6
 
 dependencies:
   flutter:

From 347f508dd403f6b26789852b503199af5e8ee9f6 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Mon, 25 Feb 2019 16:39:22 -0800
Subject: [PATCH 173/410] [in_app_purchase] Fix CI formatting errors. (#1281)

---
 .../inapppurchase/InAppPurchasePluginTest.java       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
index 2a515aea4ad9..c7fd09a62e18 100644
--- a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
+++ b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
@@ -36,7 +36,6 @@
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.Purchase.PurchasesResult;
 import com.android.billingclient.api.PurchaseHistoryResponseListener;
-import com.android.billingclient.api.PurchasesUpdatedListener;
 import com.android.billingclient.api.SkuDetails;
 import com.android.billingclient.api.SkuDetailsParams;
 import com.android.billingclient.api.SkuDetailsResponseListener;
@@ -134,7 +133,8 @@ public void endConnection() {
     MethodCall disconnectCall = new MethodCall(END_CONNECTION, null);
     plugin.onMethodCall(disconnectCall, result);
 
-    // Verify that the client is disconnected and that the OnDisconnect callback has been triggered
+    // Verify that the client is disconnected and that the OnDisconnect callback has
+    // been triggered
     verify(result, times(1)).success(any());
     verify(mockBillingClient, times(1)).endConnection();
     stateListener.onBillingServiceDisconnected();
@@ -146,7 +146,7 @@ public void endConnection() {
   @Test
   public void querySkuDetailsAsync() {
     // Connect a billing client and set up the SKU query listeners
-    establishConnectedBillingClient(/*arguments=*/ null, /*result=*/ null);
+    establishConnectedBillingClient(/* arguments= */ null, /* result= */ null);
     String skuType = BillingClient.SkuType.INAPP;
     List<String> skusList = asList("id1", "id2");
     HashMap<String, Object> arguments = new HashMap<>();
@@ -369,7 +369,9 @@ public void onPurchasesUpdatedListener() {
     int responseCode = BillingResponse.OK;
     List<Purchase> purchasesList = asList(buildPurchase("foo"));
     ArgumentCaptor<HashMap<String, Object>> resultCaptor = ArgumentCaptor.forClass(HashMap.class);
-    doNothing().when(mockMethodChannel).invokeMethod(eq(ON_PURCHASES_UPDATED), resultCaptor.capture());
+    doNothing()
+        .when(mockMethodChannel)
+        .invokeMethod(eq(ON_PURCHASES_UPDATED), resultCaptor.capture());
     listener.onPurchasesUpdated(responseCode, purchasesList);
 
     HashMap<String, Object> resultData = resultCaptor.getValue();
@@ -393,7 +395,7 @@ private void establishConnectedBillingClient(
 
   private void queryForSkus(List<String> skusList) {
     // Set up the query method call
-    establishConnectedBillingClient(/*arguments=*/ null, /*result=*/ null);
+    establishConnectedBillingClient(/* arguments= */ null, /* result= */ null);
     HashMap<String, Object> arguments = new HashMap<>();
     String skuType = SkuType.INAPP;
     arguments.put("skuType", skuType);

From bb750096d81e8f7d1280875c73bbcc3633f7b513 Mon Sep 17 00:00:00 2001
From: Chris Yang <cyang8954@gmail.com>
Date: Tue, 26 Feb 2019 13:01:14 -0800
Subject: [PATCH 174/410] [firebase_auth] update example app and README (#1219)

This is an improvement of the documentation and the example for [flutter/flutter#16217](https://github.com/flutter/flutter/issues/16217)

Added a registration flow and a sign in with email&password flow in the example app.
Separated the example app into 2 parts: registration and SignIn/SignOut.
Updated README, added a list of supported authentication methods and an example of registration.
---
 packages/firebase_auth/CHANGELOG.md           |   5 +
 packages/firebase_auth/README.md              |  24 +
 packages/firebase_auth/example/lib/main.dart  | 176 +----
 .../example/lib/register_page.dart            |  96 +++
 .../example/lib/signin_page.dart              | 631 ++++++++++++++++++
 packages/firebase_auth/pubspec.yaml           |   2 +-
 6 files changed, 778 insertions(+), 156 deletions(-)
 create mode 100644 packages/firebase_auth/example/lib/register_page.dart
 create mode 100644 packages/firebase_auth/example/lib/signin_page.dart

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index d14179509e1f..ed09cb3c1bdf 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.8.1+4
+
+* Update README.
+* Update the example app with separate pages for registration and sign-in.
+
 ## 0.8.1+3
 
 * Reduce compiler warnings in Android plugin
diff --git a/packages/firebase_auth/README.md b/packages/firebase_auth/README.md
index 58657deabdd0..a263eca9f1ec 100755
--- a/packages/firebase_auth/README.md
+++ b/packages/firebase_auth/README.md
@@ -83,11 +83,35 @@ _handleSignIn()
     .catchError((e) => print(e));
 ```
 
+### Register a user
+
+```dart
+final FirebaseUser user = await _auth.createUserWithEmailAndPassword(
+      email: 'an email',
+      password: 'a password',
+    );
+```
+
+### Supported Firebase authentication methods
+
+* Google
+* Email and Password
+* Phone
+* Anonymously
+* GitHub
+* Facebook
+* Twitter
+
 ### Phone Auth
 
 You can use Firebase Authentication to sign in a user by sending an SMS message to
 the user's phone. The user signs in using a one-time code contained in the SMS message.
 
+### After authentication
+
+After a successful authentication, you will receive a `FirebaseUser` object. You can use this object to check if the email is verified, to update email, to send verification email and so on. See the [FirebaseUser](https://pub.dartlang.org/documentation/firebase_auth/latest/firebase_auth/FirebaseUser-class.html) API documentation for more details on the `FirebaseUser` object.
+
+
 #### iOS setup
 
 1. Enable Phone as a Sign-In method in the [Firebase console](https://console.firebase.google.com/u/0/project/_/authentication/providers)
diff --git a/packages/firebase_auth/example/lib/main.dart b/packages/firebase_auth/example/lib/main.dart
index 9d4141e1e58d..f3eeb38cab6a 100755
--- a/packages/firebase_auth/example/lib/main.dart
+++ b/packages/firebase_auth/example/lib/main.dart
@@ -2,15 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:async';
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:firebase_auth/firebase_auth.dart';
-import 'package:google_sign_in/google_sign_in.dart';
-
-final FirebaseAuth _auth = FirebaseAuth.instance;
-final GoogleSignIn _googleSignIn = GoogleSignIn();
+import './register_page.dart';
+import './signin_page.dart';
 
 void main() {
   runApp(MyApp());
@@ -36,108 +31,7 @@ class MyHomePage extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  Future<String> _message = Future<String>.value('');
-  TextEditingController _smsCodeController = TextEditingController();
-  String verificationId;
-  final String testSmsCode = '888888';
-  final String testPhoneNumber = '+1 408-555-6969';
-
-  Future<String> _testSignInAnonymously() async {
-    final FirebaseUser user = await _auth.signInAnonymously();
-    assert(user != null);
-    assert(user.isAnonymous);
-    assert(!user.isEmailVerified);
-    assert(await user.getIdToken() != null);
-    if (Platform.isIOS) {
-      // Anonymous auth doesn't show up as a provider on iOS
-      assert(user.providerData.isEmpty);
-    } else if (Platform.isAndroid) {
-      // Anonymous auth does show up as a provider on Android
-      assert(user.providerData.length == 1);
-      assert(user.providerData[0].providerId == 'firebase');
-      assert(user.providerData[0].uid != null);
-      assert(user.providerData[0].displayName == null);
-      assert(user.providerData[0].photoUrl == null);
-      assert(user.providerData[0].email == null);
-    }
-
-    final FirebaseUser currentUser = await _auth.currentUser();
-    assert(user.uid == currentUser.uid);
-
-    return 'signInAnonymously succeeded: $user';
-  }
-
-  Future<String> _testSignInWithGoogle() async {
-    final GoogleSignInAccount googleUser = await _googleSignIn.signIn();
-    final GoogleSignInAuthentication googleAuth =
-        await googleUser.authentication;
-    final AuthCredential credential = GoogleAuthProvider.getCredential(
-      accessToken: googleAuth.accessToken,
-      idToken: googleAuth.idToken,
-    );
-    final FirebaseUser user = await _auth.signInWithCredential(credential);
-    assert(user.email != null);
-    assert(user.displayName != null);
-    assert(!user.isAnonymous);
-    assert(await user.getIdToken() != null);
-
-    final FirebaseUser currentUser = await _auth.currentUser();
-    assert(user.uid == currentUser.uid);
-
-    return 'signInWithGoogle succeeded: $user';
-  }
-
-  Future<void> _testVerifyPhoneNumber() async {
-    final PhoneVerificationCompleted verificationCompleted =
-        (FirebaseUser user) {
-      setState(() {
-        _message =
-            Future<String>.value('signInWithPhoneNumber auto succeeded: $user');
-      });
-    };
-
-    final PhoneVerificationFailed verificationFailed =
-        (AuthException authException) {
-      setState(() {
-        _message = Future<String>.value(
-            'Phone number verification failed. Code: ${authException.code}. Message: ${authException.message}');
-      });
-    };
-
-    final PhoneCodeSent codeSent =
-        (String verificationId, [int forceResendingToken]) async {
-      this.verificationId = verificationId;
-      _smsCodeController.text = testSmsCode;
-    };
-
-    final PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout =
-        (String verificationId) {
-      this.verificationId = verificationId;
-      _smsCodeController.text = testSmsCode;
-    };
-
-    await _auth.verifyPhoneNumber(
-        phoneNumber: testPhoneNumber,
-        timeout: const Duration(seconds: 5),
-        verificationCompleted: verificationCompleted,
-        verificationFailed: verificationFailed,
-        codeSent: codeSent,
-        codeAutoRetrievalTimeout: codeAutoRetrievalTimeout);
-  }
-
-  Future<String> _testSignInWithPhoneNumber(String smsCode) async {
-    final AuthCredential credential = PhoneAuthProvider.getCredential(
-      verificationId: verificationId,
-      smsCode: smsCode,
-    );
-    final FirebaseUser user = await _auth.signInWithCredential(credential);
-    final FirebaseUser currentUser = await _auth.currentUser();
-    assert(user.uid == currentUser.uid);
-
-    _smsCodeController.text = '';
-    return 'signInWithPhoneNumber succeeded: $user';
-  }
-
+  FirebaseUser user;
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -147,58 +41,30 @@ class _MyHomePageState extends State<MyHomePage> {
       body: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          MaterialButton(
-              child: const Text('Test signInAnonymously'),
-              onPressed: () {
-                setState(() {
-                  _message = _testSignInAnonymously();
-                });
-              }),
-          MaterialButton(
-              child: const Text('Test signInWithGoogle'),
-              onPressed: () {
-                setState(() {
-                  _message = _testSignInWithGoogle();
-                });
-              }),
-          MaterialButton(
-              child: const Text('Test verifyPhoneNumber'),
-              onPressed: () {
-                _testVerifyPhoneNumber();
-              }),
           Container(
-            margin: const EdgeInsets.only(
-              top: 8.0,
-              bottom: 8.0,
-              left: 16.0,
-              right: 16.0,
+            child: RaisedButton(
+              child: const Text('Test registration'),
+              onPressed: () => _pushPage(context, RegisterPage()),
             ),
-            child: TextField(
-              controller: _smsCodeController,
-              decoration: const InputDecoration(
-                hintText: 'SMS Code',
-              ),
+            padding: const EdgeInsets.all(16),
+            alignment: Alignment.center,
+          ),
+          Container(
+            child: RaisedButton(
+              child: const Text('Test SignIn/SignOut'),
+              onPressed: () => _pushPage(context, SignInPage()),
             ),
+            padding: const EdgeInsets.all(16),
+            alignment: Alignment.center,
           ),
-          MaterialButton(
-              child: const Text('Test signInWithPhoneNumber'),
-              onPressed: () {
-                if (_smsCodeController.text != null) {
-                  setState(() {
-                    _message =
-                        _testSignInWithPhoneNumber(_smsCodeController.text);
-                  });
-                }
-              }),
-          FutureBuilder<String>(
-              future: _message,
-              builder: (_, AsyncSnapshot<String> snapshot) {
-                return Text(snapshot.data ?? '',
-                    style:
-                        const TextStyle(color: Color.fromARGB(255, 0, 155, 0)));
-              }),
         ],
       ),
     );
   }
+
+  void _pushPage(BuildContext context, Widget page) {
+    Navigator.of(context).push(
+      MaterialPageRoute<void>(builder: (_) => page),
+    );
+  }
 }
diff --git a/packages/firebase_auth/example/lib/register_page.dart b/packages/firebase_auth/example/lib/register_page.dart
new file mode 100644
index 000000000000..4783dcfc83f2
--- /dev/null
+++ b/packages/firebase_auth/example/lib/register_page.dart
@@ -0,0 +1,96 @@
+import 'package:flutter/material.dart';
+import 'package:firebase_auth/firebase_auth.dart';
+
+final FirebaseAuth _auth = FirebaseAuth.instance;
+
+class RegisterPage extends StatefulWidget {
+  final String title = 'Registration';
+  @override
+  State<StatefulWidget> createState() => RegisterPageState();
+}
+
+class RegisterPageState extends State<RegisterPage> {
+  final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
+  final TextEditingController _emailController = TextEditingController();
+  final TextEditingController _passwordController = TextEditingController();
+  bool _success;
+  String _userEmail;
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(widget.title),
+      ),
+      body: Form(
+        key: _formKey,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: <Widget>[
+            TextFormField(
+              controller: _emailController,
+              decoration: InputDecoration(labelText: 'Email'),
+              validator: (String value) {
+                if (value.isEmpty) {
+                  return 'Please enter some text';
+                }
+              },
+            ),
+            TextFormField(
+              controller: _passwordController,
+              decoration: InputDecoration(labelText: 'Password'),
+              validator: (String value) {
+                if (value.isEmpty) {
+                  return 'Please enter some text';
+                }
+              },
+            ),
+            Container(
+              padding: const EdgeInsets.symmetric(vertical: 16.0),
+              alignment: Alignment.center,
+              child: RaisedButton(
+                onPressed: () async {
+                  if (_formKey.currentState.validate()) {
+                    _register();
+                  }
+                },
+                child: const Text('Submit'),
+              ),
+            ),
+            Container(
+              alignment: Alignment.center,
+              child: Text(_success == null
+                  ? ''
+                  : (_success
+                      ? 'Successfully registered ' + _userEmail
+                      : 'Registration failed')),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+
+  @override
+  void dispose() {
+    // Clean up the controller when the Widget is disposed
+    _emailController.dispose();
+    _passwordController.dispose();
+    super.dispose();
+  }
+
+  // Example code for registration.
+  void _register() async {
+    final FirebaseUser user = await _auth.createUserWithEmailAndPassword(
+      email: _emailController.text,
+      password: _passwordController.text,
+    );
+    if (user != null) {
+      setState(() {
+        _success = true;
+        _userEmail = user.email;
+      });
+    } else {
+      _success = false;
+    }
+  }
+}
diff --git a/packages/firebase_auth/example/lib/signin_page.dart b/packages/firebase_auth/example/lib/signin_page.dart
new file mode 100644
index 000000000000..411a9f433d40
--- /dev/null
+++ b/packages/firebase_auth/example/lib/signin_page.dart
@@ -0,0 +1,631 @@
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:firebase_auth/firebase_auth.dart';
+import 'package:google_sign_in/google_sign_in.dart';
+
+final FirebaseAuth _auth = FirebaseAuth.instance;
+final GoogleSignIn _googleSignIn = GoogleSignIn();
+
+class SignInPage extends StatefulWidget {
+  final String title = 'Registration';
+  @override
+  State<StatefulWidget> createState() => SignInPageState();
+}
+
+class SignInPageState extends State<SignInPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(widget.title),
+        actions: <Widget>[
+          Builder(builder: (BuildContext context) {
+            return FlatButton(
+              child: const Text('Sign out'),
+              textColor: Theme.of(context).buttonColor,
+              onPressed: () async {
+                final FirebaseUser user = await _auth.currentUser();
+                if (user == null) {
+                  Scaffold.of(context).showSnackBar(SnackBar(
+                    content: const Text('No one has signed in.'),
+                  ));
+                  return;
+                }
+                _signOut();
+                final String uid = user.uid;
+                Scaffold.of(context).showSnackBar(SnackBar(
+                  content: Text(uid + ' has successfully signed out.'),
+                ));
+              },
+            );
+          })
+        ],
+      ),
+      body: Builder(builder: (BuildContext context) {
+        return ListView(
+          scrollDirection: Axis.vertical,
+          children: <Widget>[
+            _EmailPasswordForm(),
+            _AnonymouslySignInSection(),
+            _GoogleSignInSection(),
+            _PhoneSignInSection(Scaffold.of(context)),
+            _OtherProvidersSignInSection(),
+          ],
+        );
+      }),
+    );
+  }
+
+  // Example code for sign out.
+  void _signOut() async {
+    await _auth.signOut();
+  }
+}
+
+class _EmailPasswordForm extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() => _EmailPasswordFormState();
+}
+
+class _EmailPasswordFormState extends State<_EmailPasswordForm> {
+  final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
+  final TextEditingController _emailController = TextEditingController();
+  final TextEditingController _passwordController = TextEditingController();
+  bool _success;
+  String _userEmail;
+  @override
+  Widget build(BuildContext context) {
+    return Form(
+      key: _formKey,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
+          Container(
+            child: const Text('Test sign in with email and password'),
+            padding: const EdgeInsets.all(16),
+            alignment: Alignment.center,
+          ),
+          TextFormField(
+            controller: _emailController,
+            decoration: InputDecoration(labelText: 'Email'),
+            validator: (String value) {
+              if (value.isEmpty) {
+                return 'Please enter some text';
+              }
+            },
+          ),
+          TextFormField(
+            controller: _passwordController,
+            decoration: InputDecoration(labelText: 'Password'),
+            validator: (String value) {
+              if (value.isEmpty) {
+                return 'Please enter some text';
+              }
+            },
+          ),
+          Container(
+            padding: const EdgeInsets.symmetric(vertical: 16.0),
+            alignment: Alignment.center,
+            child: RaisedButton(
+              onPressed: () async {
+                if (_formKey.currentState.validate()) {
+                  _signInWithEmailAndPassword();
+                }
+              },
+              child: const Text('Submit'),
+            ),
+          ),
+          Container(
+            alignment: Alignment.center,
+            padding: const EdgeInsets.symmetric(horizontal: 16),
+            child: Text(
+              _success == null
+                  ? ''
+                  : (_success
+                      ? 'Successfully signed in ' + _userEmail
+                      : 'Sign in failed'),
+              style: TextStyle(color: Colors.red),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+
+  @override
+  void dispose() {
+    _emailController.dispose();
+    _passwordController.dispose();
+    super.dispose();
+  }
+
+  // Example code of how to sign in with email and password.
+  void _signInWithEmailAndPassword() async {
+    final FirebaseUser user = await _auth.signInWithEmailAndPassword(
+      email: _emailController.text,
+      password: _passwordController.text,
+    );
+    if (user != null) {
+      setState(() {
+        _success = true;
+        _userEmail = user.email;
+      });
+    } else {
+      _success = false;
+    }
+  }
+}
+
+class _AnonymouslySignInSection extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() => _AnonymouslySignInSectionState();
+}
+
+class _AnonymouslySignInSectionState extends State<_AnonymouslySignInSection> {
+  bool _success;
+  String _userID;
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: <Widget>[
+        Container(
+          child: const Text('Test sign in anonymously'),
+          padding: const EdgeInsets.all(16),
+          alignment: Alignment.center,
+        ),
+        Container(
+          padding: const EdgeInsets.symmetric(vertical: 16.0),
+          alignment: Alignment.center,
+          child: RaisedButton(
+            onPressed: () async {
+              _signInAnonymously();
+            },
+            child: const Text('Sign in anonymously'),
+          ),
+        ),
+        Container(
+          alignment: Alignment.center,
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          child: Text(
+            _success == null
+                ? ''
+                : (_success
+                    ? 'Successfully signed in, uid: ' + _userID
+                    : 'Sign in failed'),
+            style: TextStyle(color: Colors.red),
+          ),
+        )
+      ],
+    );
+  }
+
+  // Example code of how to sign in anonymously.
+  void _signInAnonymously() async {
+    final FirebaseUser user = await _auth.signInAnonymously();
+    assert(user != null);
+    assert(user.isAnonymous);
+    assert(!user.isEmailVerified);
+    assert(await user.getIdToken() != null);
+    if (Platform.isIOS) {
+      // Anonymous auth doesn't show up as a provider on iOS
+      assert(user.providerData.isEmpty);
+    } else if (Platform.isAndroid) {
+      // Anonymous auth does show up as a provider on Android
+      assert(user.providerData.length == 1);
+      assert(user.providerData[0].providerId == 'firebase');
+      assert(user.providerData[0].uid != null);
+      assert(user.providerData[0].displayName == null);
+      assert(user.providerData[0].photoUrl == null);
+      assert(user.providerData[0].email == null);
+    }
+
+    final FirebaseUser currentUser = await _auth.currentUser();
+    assert(user.uid == currentUser.uid);
+    setState(() {
+      if (user != null) {
+        _success = true;
+        _userID = user.uid;
+      } else {
+        _success = false;
+      }
+    });
+  }
+}
+
+class _GoogleSignInSection extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() => _GoogleSignInSectionState();
+}
+
+class _GoogleSignInSectionState extends State<_GoogleSignInSection> {
+  bool _success;
+  String _userID;
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: <Widget>[
+        Container(
+          child: const Text('Test sign in with Google'),
+          padding: const EdgeInsets.all(16),
+          alignment: Alignment.center,
+        ),
+        Container(
+          padding: const EdgeInsets.symmetric(vertical: 16.0),
+          alignment: Alignment.center,
+          child: RaisedButton(
+            onPressed: () async {
+              _signInWithGoogle();
+            },
+            child: const Text('Sign in with Google'),
+          ),
+        ),
+        Container(
+          alignment: Alignment.center,
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          child: Text(
+            _success == null
+                ? ''
+                : (_success
+                    ? 'Successfully signed in, uid: ' + _userID
+                    : 'Sign in failed'),
+            style: TextStyle(color: Colors.red),
+          ),
+        )
+      ],
+    );
+  }
+
+  // Example code of how to sign in with google.
+  void _signInWithGoogle() async {
+    final GoogleSignInAccount googleUser = await _googleSignIn.signIn();
+    final GoogleSignInAuthentication googleAuth =
+        await googleUser.authentication;
+    final AuthCredential credential = GoogleAuthProvider.getCredential(
+      accessToken: googleAuth.accessToken,
+      idToken: googleAuth.idToken,
+    );
+    final FirebaseUser user = await _auth.signInWithCredential(credential);
+    assert(user.email != null);
+    assert(user.displayName != null);
+    assert(!user.isAnonymous);
+    assert(await user.getIdToken() != null);
+
+    final FirebaseUser currentUser = await _auth.currentUser();
+    assert(user.uid == currentUser.uid);
+    setState(() {
+      if (user != null) {
+        _success = true;
+        _userID = user.uid;
+      } else {
+        _success = false;
+      }
+    });
+  }
+}
+
+class _PhoneSignInSection extends StatefulWidget {
+  _PhoneSignInSection(this._scaffold);
+
+  final ScaffoldState _scaffold;
+  @override
+  State<StatefulWidget> createState() => _PhoneSignInSectionState();
+}
+
+class _PhoneSignInSectionState extends State<_PhoneSignInSection> {
+  final TextEditingController _phoneNumberController = TextEditingController();
+  final TextEditingController _smsController = TextEditingController();
+
+  String _message = '';
+  String _verificationId;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: <Widget>[
+        Container(
+          child: const Text('Test sign in with phone number'),
+          padding: const EdgeInsets.all(16),
+          alignment: Alignment.center,
+        ),
+        TextFormField(
+          controller: _phoneNumberController,
+          decoration:
+              InputDecoration(labelText: 'Phone number (+x xxx-xxx-xxxx)'),
+          validator: (String value) {
+            if (value.isEmpty) {
+              return 'Phone number (+x xxx-xxx-xxxx)';
+            }
+          },
+        ),
+        Container(
+          padding: const EdgeInsets.symmetric(vertical: 16.0),
+          alignment: Alignment.center,
+          child: RaisedButton(
+            onPressed: () async {
+              _verifyPhoneNumber();
+            },
+            child: const Text('Verify phone number'),
+          ),
+        ),
+        TextField(
+          controller: _smsController,
+          decoration: InputDecoration(labelText: 'Verification code'),
+        ),
+        Container(
+          padding: const EdgeInsets.symmetric(vertical: 16.0),
+          alignment: Alignment.center,
+          child: RaisedButton(
+            onPressed: () async {
+              _signInWithPhoneNumber();
+            },
+            child: const Text('Sign in with phone number'),
+          ),
+        ),
+        Container(
+          alignment: Alignment.center,
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          child: Text(
+            _message,
+            style: TextStyle(color: Colors.red),
+          ),
+        )
+      ],
+    );
+  }
+
+  // Exmaple code of how to veify phone number
+  void _verifyPhoneNumber() async {
+    setState(() {
+      _message = '';
+    });
+    final PhoneVerificationCompleted verificationCompleted =
+        (FirebaseUser user) {
+      setState(() {
+        _message = 'signInWithPhoneNumber auto succeeded: $user';
+      });
+    };
+
+    final PhoneVerificationFailed verificationFailed =
+        (AuthException authException) {
+      setState(() {
+        _message =
+            'Phone number verification failed. Code: ${authException.code}. Message: ${authException.message}';
+      });
+    };
+
+    final PhoneCodeSent codeSent =
+        (String verificationId, [int forceResendingToken]) async {
+      widget._scaffold.showSnackBar(SnackBar(
+        content:
+            const Text('Please check your phone for the verification code.'),
+      ));
+      _verificationId = verificationId;
+    };
+
+    final PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout =
+        (String verificationId) {
+      _verificationId = verificationId;
+    };
+
+    await _auth.verifyPhoneNumber(
+        phoneNumber: _phoneNumberController.text,
+        timeout: const Duration(seconds: 5),
+        verificationCompleted: verificationCompleted,
+        verificationFailed: verificationFailed,
+        codeSent: codeSent,
+        codeAutoRetrievalTimeout: codeAutoRetrievalTimeout);
+  }
+
+  // Example code of how to sign in with phone.
+  void _signInWithPhoneNumber() async {
+    final AuthCredential credential = PhoneAuthProvider.getCredential(
+      verificationId: _verificationId,
+      smsCode: _smsController.text,
+    );
+    final FirebaseUser user = await _auth.signInWithCredential(credential);
+    final FirebaseUser currentUser = await _auth.currentUser();
+    assert(user.uid == currentUser.uid);
+    setState(() {
+      if (user != null) {
+        _message = 'Successfully signed in, uid: ' + user.uid;
+      } else {
+        _message = 'Sign in failed';
+      }
+    });
+  }
+}
+
+class _OtherProvidersSignInSection extends StatefulWidget {
+  _OtherProvidersSignInSection();
+
+  @override
+  State<StatefulWidget> createState() => _OtherProvidersSignInSectionState();
+}
+
+class _OtherProvidersSignInSectionState
+    extends State<_OtherProvidersSignInSection> {
+  final TextEditingController _tokenController = TextEditingController();
+  final TextEditingController _tokenSecretController = TextEditingController();
+
+  String _message = '';
+  int _selection = 0;
+  bool _showAuthSecretTextField = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: <Widget>[
+        Container(
+          child: const Text(
+              'Test other providers authentication. (We do not provide an API to obtain the token for below providers. Please use a third party service to obtain token for below providers.)'),
+          padding: const EdgeInsets.all(16),
+          alignment: Alignment.center,
+        ),
+        Container(
+          padding: const EdgeInsets.symmetric(vertical: 16.0),
+          alignment: Alignment.center,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: <Widget>[
+              Radio<int>(
+                value: 0,
+                groupValue: _selection,
+                onChanged: _handleRadioButtonSelected,
+              ),
+              Text(
+                'Github',
+                style: TextStyle(fontSize: 16.0),
+              ),
+              Radio<int>(
+                value: 1,
+                groupValue: _selection,
+                onChanged: _handleRadioButtonSelected,
+              ),
+              Text(
+                'Facebook',
+                style: TextStyle(
+                  fontSize: 16.0,
+                ),
+              ),
+              Radio<int>(
+                value: 2,
+                groupValue: _selection,
+                onChanged: _handleRadioButtonSelected,
+              ),
+              Text(
+                'Twitter',
+                style: TextStyle(fontSize: 16.0),
+              ),
+            ],
+          ),
+        ),
+        TextField(
+          controller: _tokenController,
+          decoration: InputDecoration(labelText: 'Enter provider\'s token'),
+        ),
+        Container(
+          child: _showAuthSecretTextField
+              ? TextField(
+                  controller: _tokenSecretController,
+                  decoration: InputDecoration(
+                      labelText: 'Enter provider\'s authTokenSecret'),
+                )
+              : null,
+        ),
+        Container(
+          padding: const EdgeInsets.symmetric(vertical: 16.0),
+          alignment: Alignment.center,
+          child: RaisedButton(
+            onPressed: () async {
+              _signInWithOtherProvider();
+            },
+            child: const Text('Sign in'),
+          ),
+        ),
+        Container(
+          alignment: Alignment.center,
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          child: Text(
+            _message,
+            style: TextStyle(color: Colors.red),
+          ),
+        )
+      ],
+    );
+  }
+
+  void _handleRadioButtonSelected(int value) {
+    setState(() {
+      _selection = value;
+      if (_selection == 2) {
+        _showAuthSecretTextField = true;
+      } else {
+        _showAuthSecretTextField = false;
+      }
+    });
+  }
+
+  void _signInWithOtherProvider() {
+    switch (_selection) {
+      case 0:
+        _signInWithGithub();
+        break;
+      case 1:
+        _signInWithFacebook();
+        break;
+      case 2:
+        _signInWithTwitter();
+        break;
+      default:
+    }
+  }
+
+  // Example code of how to sign in with Github.
+  void _signInWithGithub() async {
+    final AuthCredential credential = GithubAuthProvider.getCredential(
+      token: _tokenController.text,
+    );
+    final FirebaseUser user = await _auth.signInWithCredential(credential);
+    assert(user.email != null);
+    assert(user.displayName != null);
+    assert(!user.isAnonymous);
+    assert(await user.getIdToken() != null);
+
+    final FirebaseUser currentUser = await _auth.currentUser();
+    assert(user.uid == currentUser.uid);
+    setState(() {
+      if (user != null) {
+        _message = 'Successfully signed in with Github. ' + user.uid;
+      } else {
+        _message = 'Failed to sign in with Github. ';
+      }
+    });
+  }
+
+  // Example code of how to sign in with Facebook.
+  void _signInWithFacebook() async {
+    final AuthCredential credential = FacebookAuthProvider.getCredential(
+      accessToken: _tokenController.text,
+    );
+    final FirebaseUser user = await _auth.signInWithCredential(credential);
+    assert(user.email != null);
+    assert(user.displayName != null);
+    assert(!user.isAnonymous);
+    assert(await user.getIdToken() != null);
+
+    final FirebaseUser currentUser = await _auth.currentUser();
+    assert(user.uid == currentUser.uid);
+    setState(() {
+      if (user != null) {
+        _message = 'Successfully signed in with Facebook. ' + user.uid;
+      } else {
+        _message = 'Failed to sign in with Facebook. ';
+      }
+    });
+  }
+
+  // Example code of how to sign in with Twitter.
+  void _signInWithTwitter() async {
+    final AuthCredential credential = TwitterAuthProvider.getCredential(
+        authToken: _tokenController.text,
+        authTokenSecret: _tokenSecretController.text);
+    final FirebaseUser user = await _auth.signInWithCredential(credential);
+    assert(user.email != null);
+    assert(user.displayName != null);
+    assert(!user.isAnonymous);
+    assert(await user.getIdToken() != null);
+
+    final FirebaseUser currentUser = await _auth.currentUser();
+    assert(user.uid == currentUser.uid);
+    setState(() {
+      if (user != null) {
+        _message = 'Successfully signed in with Twitter. ' + user.uid;
+      } else {
+        _message = 'Failed to sign in with Twitter. ';
+      }
+    });
+  }
+}
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 3f20fe6b86d4..49c1eb8ff24f 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.1+3"
+version: "0.8.1+4"
 
 flutter:
   plugin:

From 10030840c2766131d27e4e889d65b784ffbff80d Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Tue, 26 Feb 2019 14:11:17 -0800
Subject: [PATCH 175/410] [in_app_purchase] Minor bugfixes and code cleanup
 (#1284)

Some refactoring split out from a future patch on querying the purchase
history.

1. Moved all Android app-specific information to the keystore.properties
   file. I initially didn't put everything there because normally the
   keystore file only has signing information. But the app ID, verison
   name, and version code all do need to be potentially modified in the
   example to get it up and running. They're not inherently sensitive
   like the signing information is but it probably makes sense to keep
   them out of source control for the plugin repo too.
2. Fixed the MethodChannel argument naming for some of the new methods.
3. Added a missing `BillingResponse` code.
4. Changed the `BillingClient#_callbacks` to be a map of lists instead
   of a list of maps. The OnPurchasesUpdated() listener is a singleton
   and we never really have a good opportunity to pass down a `handle`.
   It makes more sense to me to store these by name. Also deleted the
   `remove` code since it would cause `handle` to be off for future
   entries.
5. Fixed a concurrency issue on Android in the example app, and tweaked
   the UI slightly.
---
 .../inapppurchase/InAppPurchasePlugin.java    |   6 +-
 .../example/android/app/build.gradle          |  10 +-
 .../InAppPurchasePluginTest.java              |   2 +-
 .../example/keystore.example.properties       |   5 +-
 .../in_app_purchase/example/lib/main.dart     | 136 ++++++++++--------
 .../billing_client_wrapper.dart               |  22 +--
 .../enum_converters.g.dart                    |   1 +
 7 files changed, 101 insertions(+), 81 deletions(-)

diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
index 7b45937cfa7e..a9f46e703f65 100644
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
@@ -51,9 +51,9 @@ static final class MethodNames {
         "BillingClient#launchBillingFlow(Activity, BillingFlowParams)";
     static final String ON_PURCHASES_UPDATED =
         "PurchasesUpdatedListener#onPurchasesUpdated(int, List<Purchase>)";
-    static final String QUERY_PURCHASES = "queryPurchases(String)";
+    static final String QUERY_PURCHASES = "BillingClient#queryPurchases(String)";
     static final String QUERY_PURCHASE_HISTORY_ASYNC =
-        "queryPurchaseHistoryAsync(String, PurchaseHistoryResponseListener)";
+        "BillingClient#queryPurchaseHistoryAsync(String, PurchaseHistoryResponseListener)";
 
     private MethodNames() {};
   }
@@ -259,7 +259,7 @@ private static BillingClient buildBillingClient(Context context, MethodChannel c
     public void onPurchasesUpdated(int responseCode, @Nullable List<Purchase> purchases) {
       final Map<String, Object> callbackArgs = new HashMap<>();
       callbackArgs.put("responseCode", responseCode);
-      callbackArgs.put("purchases", fromPurchasesList(purchases));
+      callbackArgs.put("purchasesList", fromPurchasesList(purchases));
       channel.invokeMethod(MethodNames.ON_PURCHASES_UPDATED, callbackArgs);
     }
   }
diff --git a/packages/in_app_purchase/example/android/app/build.gradle b/packages/in_app_purchase/example/android/app/build.gradle
index 3d569e23a4c2..57541c5237ad 100644
--- a/packages/in_app_purchase/example/android/app/build.gradle
+++ b/packages/in_app_purchase/example/android/app/build.gradle
@@ -21,14 +21,16 @@ try {
 }
 
 project.ext {
-    // TODO(YOU): Set this to match your package ID in the Play Developer Console (see example/README.md).
-    APP_ID = "io.flutter.plugins.inapppurchaseexample.DEFAULT_DO_NOT_USE"
+    // TODO(YOU): Create release keys and a `keystore.properties` file. See
+    // `example/README.md` for more info and `keystore.example.properties` for an
+    // example.
+    APP_ID = configured ? keystoreProperties['appId'] : "io.flutter.plugins.inapppurchaseexample.DEFAULT_DO_NOT_USE"
     KEYSTORE_STORE_FILE = configured ? rootProject.file(keystoreProperties['storeFile']) : null
     KEYSTORE_STORE_PASSWORD = keystoreProperties['storePassword']
     KEYSTORE_KEY_ALIAS = keystoreProperties['keyAlias']
     KEYSTORE_KEY_PASSWORD = keystoreProperties['keyPassword']
-    VERSION_CODE = 1
-    VERSION_NAME = "0.0.1"
+    VERSION_CODE = configured ? keystoreProperties['versionCode'].toInteger() : 1
+    VERSION_NAME = configured ? keystoreProperties['versionName'] : "0.0.1"
 }
 
 if (project.APP_ID == "io.flutter.plugins.inapppurchaseexample.DEFAULT_DO_NOT_USE") {
diff --git a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
index c7fd09a62e18..582e277d2ce0 100644
--- a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
+++ b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
@@ -376,7 +376,7 @@ public void onPurchasesUpdatedListener() {
 
     HashMap<String, Object> resultData = resultCaptor.getValue();
     assertEquals(responseCode, resultData.get("responseCode"));
-    assertEquals(fromPurchasesList(purchasesList), resultData.get("purchases"));
+    assertEquals(fromPurchasesList(purchasesList), resultData.get("purchasesList"));
   }
 
   private void establishConnectedBillingClient(
diff --git a/packages/in_app_purchase/example/keystore.example.properties b/packages/in_app_purchase/example/keystore.example.properties
index 07be54f3118e..ccbbb3653569 100644
--- a/packages/in_app_purchase/example/keystore.example.properties
+++ b/packages/in_app_purchase/example/keystore.example.properties
@@ -1,4 +1,7 @@
 storePassword=???
 keyPassword=???
 keyAlias=???
-storeFile=???
\ No newline at end of file
+storeFile=???
+appId=io.flutter.plugins.inapppurchaseexample.DEFAULT_DO_NOT_USE
+versionCode=1
+versionName=0.0.1
\ No newline at end of file
diff --git a/packages/in_app_purchase/example/lib/main.dart b/packages/in_app_purchase/example/lib/main.dart
index f3ba2024348e..52ad8e530599 100644
--- a/packages/in_app_purchase/example/lib/main.dart
+++ b/packages/in_app_purchase/example/lib/main.dart
@@ -9,6 +9,12 @@ import 'package:in_app_purchase/in_app_purchase_connection.dart';
 
 void main() => runApp(MyApp());
 
+const List<String> _kProductIds = <String>[
+  'consumable',
+  'upgrade',
+  'subscription'
+];
+
 class MyApp extends StatefulWidget {
   @override
   _MyAppState createState() => _MyAppState();
@@ -27,55 +33,40 @@ class _MyAppState extends State<MyApp> {
         appBar: AppBar(
           title: const Text('IAP Example'),
         ),
-        body: Column(
+        body: ListView(
           children: [
             FutureBuilder(
               future: _buildConnectionCheckTile(),
               builder: (BuildContext context, AsyncSnapshot snapshot) {
                 if (snapshot.error != null) {
-                  return Column(children: <Widget>[
-                    buildListCard(ListTile(
-                        title: Text(
-                            'Error connecting: ' + snapshot.error.toString())))
-                  ]);
+                  return buildListCard(ListTile(
+                      title: Text(
+                          'Error connecting: ' + snapshot.error.toString())));
                 } else if (!snapshot.hasData) {
-                  return Column(children: <Widget>[
-                    buildListCard(
-                        ListTile(title: const Text('Trying to connect...')))
-                  ]);
+                  return Card(
+                      child:
+                          ListTile(title: const Text('Trying to connect...')));
                 }
-                return Column(
-                  children: snapshot.data,
-                );
+                return snapshot.data;
               },
             ),
-            Expanded(
-              child: FutureBuilder(
-                future: InAppPurchaseConnection.instance.queryProductDetails(
-                    <String>['consumable', 'upgrade', 'subscription'].toSet()),
-                builder: (BuildContext context,
-                    AsyncSnapshot<ProductDetailsResponse> snapshot) {
-                  if (snapshot.error != null) {
-                    return Center(
-                      child: Text('Error: ' + snapshot.error.toString()),
-                    );
-                  } else if (!snapshot.hasData) {
-                    return Column(children: <Widget>[
-                      buildListCard(ListTile(title: const Text('Loading...')))
-                    ]);
-                  }
-                  return Column(
-                    children: <Widget>[
-                      Center(child: Text('Products')),
-                      Expanded(
-                        child: ListView(
-                          children: _buildProductList(snapshot.data),
-                        ),
-                      ),
-                    ],
+            FutureBuilder(
+              future: _buildProductList(),
+              builder: (BuildContext context, AsyncSnapshot snapshot) {
+                if (snapshot.error != null) {
+                  return Center(
+                    child: buildListCard(ListTile(
+                        title: Text('Error fetching products'),
+                        subtitle: snapshot.error)),
                   );
-                },
-              ),
+                } else if (!snapshot.hasData) {
+                  return Card(
+                      child: (ListTile(
+                          leading: CircularProgressIndicator(),
+                          title: Text('Fetching products...'))));
+                }
+                return snapshot.data;
+              },
             ),
           ],
         ),
@@ -83,36 +74,52 @@ class _MyAppState extends State<MyApp> {
     );
   }
 
-  Future<List<ListTile>> _buildConnectionCheckTile() async {
+  Future<Card> _buildConnectionCheckTile() async {
     final bool available = await InAppPurchaseConnection.instance.isAvailable();
-    final Widget storeHeader = buildListCard(
-      ListTile(
-        leading: Icon(available ? Icons.check : Icons.block),
-        title: Text(
-            'The store is ' + (available ? 'available' : 'unavailable') + '.'),
-      ),
+    final Widget storeHeader = ListTile(
+      leading: Icon(available ? Icons.check : Icons.block,
+          color: available ? Colors.green : ThemeData.light().errorColor),
+      title: Text(
+          'The store is ' + (available ? 'available' : 'unavailable') + '.'),
     );
-    final List<ListTile> children = <ListTile>[storeHeader];
+    final List<Widget> children = <Widget>[storeHeader];
 
     if (!available) {
-      children.add(
-        buildListCard(
-          ListTile(
-            title: Text('Not connected',
-                style: TextStyle(color: ThemeData.light().errorColor)),
-            subtitle: const Text(
-                'Unable to connect to the payments processor. Has this app been configured correctly? See the example README for instructions.'),
-          ),
+      children.addAll([
+        Divider(),
+        ListTile(
+          title: Text('Not connected',
+              style: TextStyle(color: ThemeData.light().errorColor)),
+          subtitle: const Text(
+              'Unable to connect to the payments processor. Has this app been configured correctly? See the example README for instructions.'),
         ),
-      );
+      ]);
     }
-    return children;
+    return Card(child: Column(children: children));
   }
 
-  List<ListTile> _buildProductList(ProductDetailsResponse response) {
-    List<ListTile> productDetailsCards = response.productDetails.map(
+  Future<Card> _buildProductList() async {
+    final bool available = await InAppPurchaseConnection.instance.isAvailable();
+    if (!available) {
+      return Card();
+    }
+    final ListTile productHeader = ListTile(
+        title: Text('Products for Sale',
+            style: Theme.of(context).textTheme.headline));
+    ProductDetailsResponse response = await InAppPurchaseConnection.instance
+        .queryProductDetails(_kProductIds.toSet());
+    List<ListTile> productList = <ListTile>[];
+    if (!response.notFoundIDs.isEmpty) {
+      productList.add(ListTile(
+          title: Text('[${response.notFoundIDs.join(", ")}] not found',
+              style: TextStyle(color: ThemeData.light().errorColor)),
+          subtitle: Text(
+              'This app needs special configuration to run. Please see example/README.md for instructions.')));
+    }
+
+    productList.addAll(response.productDetails.map(
       (ProductDetails productDetails) {
-        return buildListCard(ListTile(
+        return ListTile(
           title: Text(
             productDetails.title,
           ),
@@ -120,10 +127,13 @@ class _MyAppState extends State<MyApp> {
             productDetails.description,
           ),
           trailing: Text(productDetails.price),
-        ));
+        );
       },
-    ).toList();
-    return productDetailsCards;
+    ));
+
+    return Card(
+        child:
+            Column(children: <Widget>[productHeader, Divider()] + productList));
   }
 
   static ListTile buildListCard(ListTile innerTile) =>
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
index daf14c17be0e..99cf5fd00118 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
@@ -10,6 +10,9 @@ import '../channel.dart';
 import 'sku_details_wrapper.dart';
 import 'enum_converters.dart';
 
+const String _kOnBillingServiceDisconnected =
+    'BillingClientStateListener#onBillingServiceDisconnected()';
+
 /// This class can be used directly instead of [InAppPurchaseConnection] to call
 /// Play-specific billing APIs.
 ///
@@ -35,7 +38,7 @@ class BillingClient {
   // matching callback here to remember, and then once its twin is triggered it
   // sends the handle back over the platform channel. We then access that handle
   // in this array and call it in Dart code. See also [_callHandler].
-  List<Map<String, Function>> _callbacks = <Map<String, Function>>[];
+  Map<String, List<Function>> _callbacks = <String, List<Function>>{};
 
   /// Calls
   /// [`BillingClient#isReady()`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.html#isReady())
@@ -56,13 +59,12 @@ class BillingClient {
   Future<BillingResponse> startConnection(
       {@required
           OnBillingServiceDisconnected onBillingServiceDisconnected}) async {
-    final Map<String, Function> callbacks = <String, Function>{
-      'OnBillingServiceDisconnected': onBillingServiceDisconnected,
-    };
-    _callbacks.add(callbacks);
+    List<Function> disconnectCallbacks =
+        _callbacks[_kOnBillingServiceDisconnected] ??= [];
+    disconnectCallbacks.add(onBillingServiceDisconnected);
     return BillingResponseConverter().fromJson(await channel.invokeMethod(
         "BillingClient#startConnection(BillingClientStateListener)",
-        <String, dynamic>{'handle': _callbacks.length - 1}));
+        <String, dynamic>{'handle': disconnectCallbacks.length - 1}));
   }
 
   /// Calls
@@ -134,10 +136,9 @@ class BillingClient {
 
   Future<void> _callHandler(MethodCall call) async {
     switch (call.method) {
-      case 'BillingClientStateListener#onBillingServiceDisconnected()':
+      case _kOnBillingServiceDisconnected:
         final int handle = call.arguments['handle'];
-        await _callbacks[handle]['OnBillingServiceDisconnected']();
-        _callbacks.removeAt(handle);
+        await _callbacks[_kOnBillingServiceDisconnected][handle]();
         break;
     }
   }
@@ -163,6 +164,9 @@ enum BillingResponse {
   @JsonValue(-2)
   featureNotSupported,
 
+  @JsonValue(-1)
+  serviceDisconnected,
+
   @JsonValue(0)
   ok,
 
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart
index c8fd5024ba22..3af571bdf5a8 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart
@@ -27,6 +27,7 @@ T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
 
 const _$BillingResponseEnumMap = <BillingResponse, dynamic>{
   BillingResponse.featureNotSupported: -2,
+  BillingResponse.serviceDisconnected: -1,
   BillingResponse.ok: 0,
   BillingResponse.userCanceled: 1,
   BillingResponse.serviceUnavailable: 2,

From 1a8d07a4819d29fd88b22a6816ef77a398789a1c Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Wed, 27 Feb 2019 07:17:53 -0800
Subject: [PATCH 176/410] [google_maps_flutter] Marker APIs are now widget
 based (iOS Changes) (#1240)

* Maps Widget Marker IOS impl

* Make JSON Conversions part of a class

* fix formatting issues

* Remove all usages of id

* Fix NSDictionary usage

* Fix compile error
---
 .../ios/Classes/GoogleMapController.h         |   3 -
 .../ios/Classes/GoogleMapController.m         | 278 +++++-------------
 .../ios/Classes/GoogleMapMarkerController.h   |  16 +-
 .../ios/Classes/GoogleMapMarkerController.m   | 192 +++++++++++-
 .../ios/Classes/JsonConversions.h             |  15 +
 .../ios/Classes/JsonConversions.m             |  35 +++
 6 files changed, 331 insertions(+), 208 deletions(-)
 create mode 100644 packages/google_maps_flutter/ios/Classes/JsonConversions.h
 create mode 100644 packages/google_maps_flutter/ios/Classes/JsonConversions.m

diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
index 572d96ab8439..5de2fdd08fb1 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
@@ -32,9 +32,6 @@
 - (void)animateWithCameraUpdate:(GMSCameraUpdate*)cameraUpdate;
 - (void)moveWithCameraUpdate:(GMSCameraUpdate*)cameraUpdate;
 - (GMSCameraPosition*)cameraPosition;
-- (NSString*)addMarkerWithPosition:(CLLocationCoordinate2D)position;
-- (FLTGoogleMapMarkerController*)markerWithId:(NSString*)markerId;
-- (void)removeMarkerWithId:(NSString*)markerId;
 @end
 
 // Allows the engine to create new Google Map instances.
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index 6fbcad81e149..d062cadd0665 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -3,18 +3,16 @@
 // found in the LICENSE file.
 
 #import "GoogleMapController.h"
+#import "JsonConversions.h"
 
 #pragma mark - Conversion of JSON-like values sent via platform channels. Forward declarations.
 
-static id positionToJson(GMSCameraPosition* position);
-static double toDouble(id json);
-static CLLocationCoordinate2D toLocation(id json);
-static GMSCameraPosition* toOptionalCameraPosition(id json);
-static GMSCoordinateBounds* toOptionalBounds(id json);
-static GMSCameraUpdate* toCameraUpdate(id json);
-static void interpretMapOptions(id json, id<FLTGoogleMapOptionsSink> sink);
-static void interpretMarkerOptions(id json, id<FLTGoogleMapMarkerOptionsSink> sink,
-                                   NSObject<FlutterPluginRegistrar>* registrar);
+static NSDictionary* PositionToJson(GMSCameraPosition* position);
+static GMSCameraPosition* ToOptionalCameraPosition(NSDictionary* json);
+static GMSCoordinateBounds* ToOptionalBounds(NSArray* json);
+static GMSCameraUpdate* ToCameraUpdate(NSArray* data);
+static void InterpretMapOptions(NSDictionary* data, id<FLTGoogleMapOptionsSink> sink);
+static double ToDouble(NSNumber* data) { return [FLTGoogleMapJsonConversions toDouble:data]; }
 
 @implementation FLTGoogleMapFactory {
   NSObject<FlutterPluginRegistrar>* _registrar;
@@ -45,7 +43,6 @@ - (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
 @implementation FLTGoogleMapController {
   GMSMapView* _mapView;
   int64_t _viewId;
-  NSMutableDictionary* _markers;
   FlutterMethodChannel* _channel;
   BOOL _trackCameraPosition;
   NSObject<FlutterPluginRegistrar>* _registrar;
@@ -54,6 +51,7 @@ @implementation FLTGoogleMapController {
   // TODO(cyanglaz): Remove this temporary fix once the Maps SDK issue is resolved.
   // https://github.com/flutter/flutter/issues/27550
   BOOL _cameraDidInitialSetup;
+  FLTMarkersController* _markersController;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -63,11 +61,10 @@ - (instancetype)initWithFrame:(CGRect)frame
   if ([super init]) {
     _viewId = viewId;
 
-    GMSCameraPosition* camera = toOptionalCameraPosition(args[@"initialCameraPosition"]);
+    GMSCameraPosition* camera = ToOptionalCameraPosition(args[@"initialCameraPosition"]);
     _mapView = [GMSMapView mapWithFrame:frame camera:camera];
-    _markers = [NSMutableDictionary dictionaryWithCapacity:1];
     _trackCameraPosition = NO;
-    interpretMapOptions(args[@"options"], self);
+    InterpretMapOptions(args[@"options"], self);
     NSString* channelName =
         [NSString stringWithFormat:@"plugins.flutter.io/google_maps_%lld", viewId];
     _channel = [FlutterMethodChannel methodChannelWithName:channelName
@@ -81,6 +78,8 @@ - (instancetype)initWithFrame:(CGRect)frame
     _mapView.delegate = weakSelf;
     _registrar = registrar;
     _cameraDidInitialSetup = NO;
+    _markersController = [[FLTMarkersController alloc] init:_channel mapView:_mapView];
+    [_markersController addMarkers:args[@"markersToAdd"]];
   }
   return self;
 }
@@ -91,33 +90,26 @@ - (UIView*)view {
 
 - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   if ([call.method isEqualToString:@"map#show"]) {
-    [self showAtX:toDouble(call.arguments[@"x"]) Y:toDouble(call.arguments[@"y"])];
+    [self showAtX:ToDouble(call.arguments[@"x"]) Y:ToDouble(call.arguments[@"y"])];
     result(nil);
   } else if ([call.method isEqualToString:@"map#hide"]) {
     [self hide];
     result(nil);
   } else if ([call.method isEqualToString:@"camera#animate"]) {
-    [self animateWithCameraUpdate:toCameraUpdate(call.arguments[@"cameraUpdate"])];
+    [self animateWithCameraUpdate:ToCameraUpdate(call.arguments[@"cameraUpdate"])];
     result(nil);
   } else if ([call.method isEqualToString:@"camera#move"]) {
-    [self moveWithCameraUpdate:toCameraUpdate(call.arguments[@"cameraUpdate"])];
+    [self moveWithCameraUpdate:ToCameraUpdate(call.arguments[@"cameraUpdate"])];
     result(nil);
   } else if ([call.method isEqualToString:@"map#update"]) {
-    interpretMapOptions(call.arguments[@"options"], self);
-    result(positionToJson([self cameraPosition]));
+    InterpretMapOptions(call.arguments[@"options"], self);
+    result(PositionToJson([self cameraPosition]));
   } else if ([call.method isEqualToString:@"map#waitForMap"]) {
     result(nil);
-  } else if ([call.method isEqualToString:@"marker#add"]) {
-    NSDictionary* options = call.arguments[@"options"];
-    NSString* markerId = [self addMarkerWithPosition:toLocation(options[@"position"])];
-    interpretMarkerOptions(options, [self markerWithId:markerId], _registrar);
-    result(markerId);
-  } else if ([call.method isEqualToString:@"marker#update"]) {
-    interpretMarkerOptions(call.arguments[@"options"],
-                           [self markerWithId:call.arguments[@"marker"]], _registrar);
-    result(nil);
-  } else if ([call.method isEqualToString:@"marker#remove"]) {
-    [self removeMarkerWithId:call.arguments[@"marker"]];
+  } else if ([call.method isEqualToString:@"markers#update"]) {
+    [_markersController addMarkers:call.arguments[@"markersToAdd"]];
+    [_markersController changeMarkers:call.arguments[@"markersToChange"]];
+    [_markersController removeMarkerIds:call.arguments[@"markerIdsToRemove"]];
     result(nil);
   } else {
     result(FlutterMethodNotImplemented);
@@ -150,25 +142,6 @@ - (GMSCameraPosition*)cameraPosition {
   }
 }
 
-- (NSString*)addMarkerWithPosition:(CLLocationCoordinate2D)position {
-  FLTGoogleMapMarkerController* markerController =
-      [[FLTGoogleMapMarkerController alloc] initWithPosition:position mapView:_mapView];
-  _markers[markerController.markerId] = markerController;
-  return markerController.markerId;
-}
-
-- (FLTGoogleMapMarkerController*)markerWithId:(NSString*)markerId {
-  return _markers[markerId];
-}
-
-- (void)removeMarkerWithId:(NSString*)markerId {
-  FLTGoogleMapMarkerController* markerController = _markers[markerId];
-  if (markerController) {
-    [markerController setVisible:NO];
-    [_markers removeObjectForKey:markerId];
-  }
-}
-
 #pragma mark - FLTGoogleMapOptionsSink methods
 
 - (void)setCamera:(GMSCameraPosition*)camera {
@@ -234,7 +207,7 @@ - (void)mapView:(GMSMapView*)mapView didChangeCameraPosition:(GMSCameraPosition*
     [mapView moveCamera:[GMSCameraUpdate setCamera:_mapView.camera]];
   }
   if (_trackCameraPosition) {
-    [_channel invokeMethod:@"camera#onMove" arguments:@{@"position" : positionToJson(position)}];
+    [_channel invokeMethod:@"camera#onMove" arguments:@{@"position" : PositionToJson(position)}];
   }
 }
 
@@ -244,233 +217,140 @@ - (void)mapView:(GMSMapView*)mapView idleAtCameraPosition:(GMSCameraPosition*)po
 
 - (BOOL)mapView:(GMSMapView*)mapView didTapMarker:(GMSMarker*)marker {
   NSString* markerId = marker.userData[0];
-  [_channel invokeMethod:@"marker#onTap" arguments:@{@"marker" : markerId}];
-  return [marker.userData[1] boolValue];
+  return [_markersController onMarkerTap:markerId];
 }
 
 - (void)mapView:(GMSMapView*)mapView didTapInfoWindowOfMarker:(GMSMarker*)marker {
   NSString* markerId = marker.userData[0];
-  [_channel invokeMethod:@"infoWindow#onTap" arguments:@{@"marker" : markerId}];
+  [_markersController onInfoWindowTap:markerId];
 }
 
 @end
 
 #pragma mark - Implementations of JSON conversion functions.
 
-static id locationToJson(CLLocationCoordinate2D position) {
+static NSArray* LocationToJson(CLLocationCoordinate2D position) {
   return @[ @(position.latitude), @(position.longitude) ];
 }
 
-static id positionToJson(GMSCameraPosition* position) {
+static NSDictionary* PositionToJson(GMSCameraPosition* position) {
   if (!position) {
     return nil;
   }
   return @{
-    @"target" : locationToJson([position target]),
+    @"target" : LocationToJson([position target]),
     @"zoom" : @([position zoom]),
     @"bearing" : @([position bearing]),
     @"tilt" : @([position viewingAngle]),
   };
 }
 
-static bool toBool(id json) {
-  NSNumber* data = json;
-  return data.boolValue;
-}
+static float ToFloat(NSNumber* data) { return [FLTGoogleMapJsonConversions toFloat:data]; }
 
-static int toInt(id json) {
-  NSNumber* data = json;
-  return data.intValue;
+static CLLocationCoordinate2D ToLocation(NSArray* data) {
+  return [FLTGoogleMapJsonConversions toLocation:data];
 }
 
-static double toDouble(id json) {
-  NSNumber* data = json;
-  return data.doubleValue;
-}
+static int ToInt(NSNumber* data) { return [FLTGoogleMapJsonConversions toInt:data]; }
 
-static float toFloat(id json) {
-  NSNumber* data = json;
-  return data.floatValue;
-}
+static BOOL ToBool(NSNumber* data) { return [FLTGoogleMapJsonConversions toBool:data]; }
 
-static CLLocationCoordinate2D toLocation(id json) {
-  NSArray* data = json;
-  return CLLocationCoordinate2DMake(toDouble(data[0]), toDouble(data[1]));
-}
+static CGPoint ToPoint(NSArray* data) { return [FLTGoogleMapJsonConversions toPoint:data]; }
 
-static CGPoint toPoint(id json) {
-  NSArray* data = json;
-  return CGPointMake(toDouble(data[0]), toDouble(data[1]));
+static GMSCameraPosition* ToCameraPosition(NSDictionary* data) {
+  return [GMSCameraPosition cameraWithTarget:ToLocation(data[@"target"])
+                                        zoom:ToFloat(data[@"zoom"])
+                                     bearing:ToDouble(data[@"bearing"])
+                                viewingAngle:ToDouble(data[@"tilt"])];
 }
 
-static GMSCameraPosition* toCameraPosition(id json) {
-  NSDictionary* data = json;
-  return [GMSCameraPosition cameraWithTarget:toLocation(data[@"target"])
-                                        zoom:toFloat(data[@"zoom"])
-                                     bearing:toDouble(data[@"bearing"])
-                                viewingAngle:toDouble(data[@"tilt"])];
+static GMSCameraPosition* ToOptionalCameraPosition(NSDictionary* json) {
+  return json ? ToCameraPosition(json) : nil;
 }
 
-static GMSCameraPosition* toOptionalCameraPosition(id json) {
-  return json ? toCameraPosition(json) : nil;
+static GMSCoordinateBounds* ToBounds(NSArray* data) {
+  return [[GMSCoordinateBounds alloc] initWithCoordinate:ToLocation(data[0])
+                                              coordinate:ToLocation(data[1])];
 }
 
-static GMSCoordinateBounds* toBounds(id json) {
-  NSArray* data = json;
-  return [[GMSCoordinateBounds alloc] initWithCoordinate:toLocation(data[0])
-                                              coordinate:toLocation(data[1])];
+static GMSCoordinateBounds* ToOptionalBounds(NSArray* data) {
+  return (data[0] == [NSNull null]) ? nil : ToBounds(data[0]);
 }
 
-static GMSCoordinateBounds* toOptionalBounds(id json) {
-  NSArray* data = json;
-  return (data[0] == [NSNull null]) ? nil : toBounds(data[0]);
-}
-
-static GMSMapViewType toMapViewType(id json) {
-  int value = toInt(json);
+static GMSMapViewType ToMapViewType(NSNumber* json) {
+  int value = ToInt(json);
   return (GMSMapViewType)(value == 0 ? 5 : value);
 }
 
-static GMSCameraUpdate* toCameraUpdate(id json) {
-  NSArray* data = json;
+static GMSCameraUpdate* ToCameraUpdate(NSArray* data) {
   NSString* update = data[0];
   if ([update isEqualToString:@"newCameraPosition"]) {
-    return [GMSCameraUpdate setCamera:toCameraPosition(data[1])];
+    return [GMSCameraUpdate setCamera:ToCameraPosition(data[1])];
   } else if ([update isEqualToString:@"newLatLng"]) {
-    return [GMSCameraUpdate setTarget:toLocation(data[1])];
+    return [GMSCameraUpdate setTarget:ToLocation(data[1])];
   } else if ([update isEqualToString:@"newLatLngBounds"]) {
-    return [GMSCameraUpdate fitBounds:toBounds(data[1]) withPadding:toDouble(data[2])];
+    return [GMSCameraUpdate fitBounds:ToBounds(data[1]) withPadding:ToDouble(data[2])];
   } else if ([update isEqualToString:@"newLatLngZoom"]) {
-    return [GMSCameraUpdate setTarget:toLocation(data[1]) zoom:toFloat(data[2])];
+    return [GMSCameraUpdate setTarget:ToLocation(data[1]) zoom:ToFloat(data[2])];
   } else if ([update isEqualToString:@"scrollBy"]) {
-    return [GMSCameraUpdate scrollByX:toDouble(data[1]) Y:toDouble(data[2])];
+    return [GMSCameraUpdate scrollByX:ToDouble(data[1]) Y:ToDouble(data[2])];
   } else if ([update isEqualToString:@"zoomBy"]) {
     if (data.count == 2) {
-      return [GMSCameraUpdate zoomBy:toFloat(data[1])];
+      return [GMSCameraUpdate zoomBy:ToFloat(data[1])];
     } else {
-      return [GMSCameraUpdate zoomBy:toFloat(data[1]) atPoint:toPoint(data[2])];
+      return [GMSCameraUpdate zoomBy:ToFloat(data[1]) atPoint:ToPoint(data[2])];
     }
   } else if ([update isEqualToString:@"zoomIn"]) {
     return [GMSCameraUpdate zoomIn];
   } else if ([update isEqualToString:@"zoomOut"]) {
     return [GMSCameraUpdate zoomOut];
   } else if ([update isEqualToString:@"zoomTo"]) {
-    return [GMSCameraUpdate zoomTo:toFloat(data[1])];
+    return [GMSCameraUpdate zoomTo:ToFloat(data[1])];
   }
   return nil;
 }
 
-static void interpretMapOptions(id json, id<FLTGoogleMapOptionsSink> sink) {
-  NSDictionary* data = json;
-  id cameraTargetBounds = data[@"cameraTargetBounds"];
+static void InterpretMapOptions(NSDictionary* data, id<FLTGoogleMapOptionsSink> sink) {
+  NSArray* cameraTargetBounds = data[@"cameraTargetBounds"];
   if (cameraTargetBounds) {
-    [sink setCameraTargetBounds:toOptionalBounds(cameraTargetBounds)];
+    [sink setCameraTargetBounds:ToOptionalBounds(cameraTargetBounds)];
   }
-  id compassEnabled = data[@"compassEnabled"];
+  NSNumber* compassEnabled = data[@"compassEnabled"];
   if (compassEnabled) {
-    [sink setCompassEnabled:toBool(compassEnabled)];
+    [sink setCompassEnabled:ToBool(compassEnabled)];
   }
-  id mapType = data[@"mapType"];
+  NSNumber* mapType = data[@"mapType"];
   if (mapType) {
-    [sink setMapType:toMapViewType(mapType)];
+    [sink setMapType:ToMapViewType(mapType)];
   }
-  id minMaxZoomPreference = data[@"minMaxZoomPreference"];
-  if (minMaxZoomPreference) {
-    NSArray* zoomData = minMaxZoomPreference;
-    float minZoom = (zoomData[0] == [NSNull null]) ? kGMSMinZoomLevel : toFloat(zoomData[0]);
-    float maxZoom = (zoomData[1] == [NSNull null]) ? kGMSMaxZoomLevel : toFloat(zoomData[1]);
+  NSArray* zoomData = data[@"minMaxZoomPreference"];
+  if (zoomData) {
+    float minZoom = (zoomData[0] == [NSNull null]) ? kGMSMinZoomLevel : ToFloat(zoomData[0]);
+    float maxZoom = (zoomData[1] == [NSNull null]) ? kGMSMaxZoomLevel : ToFloat(zoomData[1]);
     [sink setMinZoom:minZoom maxZoom:maxZoom];
   }
-  id rotateGesturesEnabled = data[@"rotateGesturesEnabled"];
+  NSNumber* rotateGesturesEnabled = data[@"rotateGesturesEnabled"];
   if (rotateGesturesEnabled) {
-    [sink setRotateGesturesEnabled:toBool(rotateGesturesEnabled)];
+    [sink setRotateGesturesEnabled:ToBool(rotateGesturesEnabled)];
   }
-  id scrollGesturesEnabled = data[@"scrollGesturesEnabled"];
+  NSNumber* scrollGesturesEnabled = data[@"scrollGesturesEnabled"];
   if (scrollGesturesEnabled) {
-    [sink setScrollGesturesEnabled:toBool(scrollGesturesEnabled)];
+    [sink setScrollGesturesEnabled:ToBool(scrollGesturesEnabled)];
   }
-  id tiltGesturesEnabled = data[@"tiltGesturesEnabled"];
+  NSNumber* tiltGesturesEnabled = data[@"tiltGesturesEnabled"];
   if (tiltGesturesEnabled) {
-    [sink setTiltGesturesEnabled:toBool(tiltGesturesEnabled)];
+    [sink setTiltGesturesEnabled:ToBool(tiltGesturesEnabled)];
   }
-  id trackCameraPosition = data[@"trackCameraPosition"];
+  NSNumber* trackCameraPosition = data[@"trackCameraPosition"];
   if (trackCameraPosition) {
-    [sink setTrackCameraPosition:toBool(trackCameraPosition)];
+    [sink setTrackCameraPosition:ToBool(trackCameraPosition)];
   }
-  id zoomGesturesEnabled = data[@"zoomGesturesEnabled"];
+  NSNumber* zoomGesturesEnabled = data[@"zoomGesturesEnabled"];
   if (zoomGesturesEnabled) {
-    [sink setZoomGesturesEnabled:toBool(zoomGesturesEnabled)];
+    [sink setZoomGesturesEnabled:ToBool(zoomGesturesEnabled)];
   }
-  id myLocationEnabled = data[@"myLocationEnabled"];
+  NSNumber* myLocationEnabled = data[@"myLocationEnabled"];
   if (myLocationEnabled) {
-    [sink setMyLocationEnabled:toBool(myLocationEnabled)];
-  }
-}
-
-static void interpretMarkerOptions(id json, id<FLTGoogleMapMarkerOptionsSink> sink,
-                                   NSObject<FlutterPluginRegistrar>* registrar) {
-  NSDictionary* data = json;
-  id alpha = data[@"alpha"];
-  if (alpha) {
-    [sink setAlpha:toFloat(alpha)];
-  }
-  id anchor = data[@"anchor"];
-  if (anchor) {
-    [sink setAnchor:toPoint(anchor)];
-  }
-  id draggable = data[@"draggable"];
-  if (draggable) {
-    [sink setDraggable:toBool(draggable)];
-  }
-  id icon = data[@"icon"];
-  if (icon) {
-    NSArray* iconData = icon;
-    UIImage* image;
-    if ([iconData[0] isEqualToString:@"defaultMarker"]) {
-      CGFloat hue = (iconData.count == 1) ? 0.0f : toDouble(iconData[1]);
-      image = [GMSMarker markerImageWithColor:[UIColor colorWithHue:hue / 360.0
-                                                         saturation:1.0
-                                                         brightness:0.7
-                                                              alpha:1.0]];
-    } else if ([iconData[0] isEqualToString:@"fromAsset"]) {
-      if (iconData.count == 2) {
-        image = [UIImage imageNamed:[registrar lookupKeyForAsset:iconData[1]]];
-      } else {
-        image = [UIImage imageNamed:[registrar lookupKeyForAsset:iconData[1]
-                                                     fromPackage:iconData[2]]];
-      }
-    }
-    [sink setIcon:image];
-  }
-  id flat = data[@"flat"];
-  if (flat) {
-    [sink setFlat:toBool(flat)];
-  }
-  id infoWindowAnchor = data[@"infoWindowAnchor"];
-  if (infoWindowAnchor) {
-    [sink setInfoWindowAnchor:toPoint(infoWindowAnchor)];
-  }
-  id infoWindowText = data[@"infoWindowText"];
-  if (infoWindowText) {
-    NSArray* infoWindowTextData = infoWindowText;
-    NSString* title = (infoWindowTextData[0] == [NSNull null]) ? nil : infoWindowTextData[0];
-    NSString* snippet = (infoWindowTextData[1] == [NSNull null]) ? nil : infoWindowTextData[1];
-    [sink setInfoWindowTitle:title snippet:snippet];
-  }
-  id position = data[@"position"];
-  if (position) {
-    [sink setPosition:toLocation(position)];
-  }
-  id rotation = data[@"rotation"];
-  if (rotation) {
-    [sink setRotation:toDouble(rotation)];
-  }
-  id visible = data[@"visible"];
-  if (visible) {
-    [sink setVisible:toBool(visible)];
-  }
-  id zIndex = data[@"zIndex"];
-  if (zIndex) {
-    [sink setZIndex:toInt(zIndex)];
+    [sink setMyLocationEnabled:ToBool(myLocationEnabled)];
   }
 }
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h
index 14f657a13f4e..ddc194f66c41 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h
@@ -4,6 +4,7 @@
 
 #import <Flutter/Flutter.h>
 #import <GoogleMaps/GoogleMaps.h>
+#import "GoogleMapController.h"
 
 // Defines marker UI options writable from Flutter.
 @protocol FLTGoogleMapMarkerOptionsSink
@@ -24,5 +25,18 @@
 // Defines marker controllable by Flutter.
 @interface FLTGoogleMapMarkerController : NSObject <FLTGoogleMapMarkerOptionsSink>
 @property(atomic, readonly) NSString* markerId;
-- (instancetype)initWithPosition:(CLLocationCoordinate2D)position mapView:(GMSMapView*)mapView;
+- (instancetype)initMarkerWithPosition:(CLLocationCoordinate2D)position
+                              markerId:(NSString*)markerId
+                               mapView:(GMSMapView*)mapView;
+- (BOOL)consumeTapEvents;
+- (void)removeMarker;
+@end
+
+@interface FLTMarkersController : NSObject
+- (instancetype)init:(FlutterMethodChannel*)methodChannel mapView:(GMSMapView*)mapView;
+- (void)addMarkers:(NSArray*)markersToAdd;
+- (void)changeMarkers:(NSArray*)markersToChange;
+- (void)removeMarkerIds:(NSArray*)markerIdsToRemove;
+- (BOOL)onMarkerTap:(NSString*)markerId;
+- (void)onInfoWindowTap:(NSString*)markerId;
 @end
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
index 600c755625c4..404352f4cf73 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
@@ -3,23 +3,35 @@
 // found in the LICENSE file.
 
 #import "GoogleMapMarkerController.h"
+#import "JsonConversions.h"
 
-static uint64_t _nextMarkerId = 0;
+static UIImage* ExtractIcon(NSObject<FlutterPluginRegistrar>* registrar, NSArray* icon);
+static void InterpretInfoWindow(id<FLTGoogleMapMarkerOptionsSink> sink, NSDictionary* data);
 
 @implementation FLTGoogleMapMarkerController {
   GMSMarker* _marker;
   GMSMapView* _mapView;
+  BOOL _consumeTapEvents;
 }
-- (instancetype)initWithPosition:(CLLocationCoordinate2D)position mapView:(GMSMapView*)mapView {
+- (instancetype)initMarkerWithPosition:(CLLocationCoordinate2D)position
+                              markerId:(NSString*)markerId
+                               mapView:(GMSMapView*)mapView {
   self = [super init];
   if (self) {
     _marker = [GMSMarker markerWithPosition:position];
     _mapView = mapView;
-    _markerId = [NSString stringWithFormat:@"%lld", _nextMarkerId++];
-    _marker.userData = @[ _markerId, @(NO) ];
+    _markerId = markerId;
+    _marker.userData = @[ _markerId ];
+    _consumeTapEvents = NO;
   }
   return self;
 }
+- (BOOL)consumeTapEvents {
+  return _consumeTapEvents;
+}
+- (void)removeMarker {
+  _marker.map = nil;
+}
 
 #pragma mark - FLTGoogleMapMarkerOptionsSink methods
 
@@ -30,7 +42,7 @@ - (void)setAnchor:(CGPoint)anchor {
   _marker.groundAnchor = anchor;
 }
 - (void)setConsumeTapEvents:(BOOL)consumes {
-  _marker.userData[1] = @(consumes);
+  _consumeTapEvents = consumes;
 }
 - (void)setDraggable:(BOOL)draggable {
   _marker.draggable = draggable;
@@ -61,3 +73,173 @@ - (void)setZIndex:(int)zIndex {
   _marker.zIndex = zIndex;
 }
 @end
+
+static double ToDouble(NSNumber* data) { return [FLTGoogleMapJsonConversions toDouble:data]; }
+
+static float ToFloat(NSNumber* data) { return [FLTGoogleMapJsonConversions toFloat:data]; }
+
+static CLLocationCoordinate2D ToLocation(NSArray* data) {
+  return [FLTGoogleMapJsonConversions toLocation:data];
+}
+
+static int ToInt(NSNumber* data) { return [FLTGoogleMapJsonConversions toInt:data]; }
+
+static BOOL ToBool(NSNumber* data) { return [FLTGoogleMapJsonConversions toBool:data]; }
+
+static CGPoint ToPoint(NSArray* data) { return [FLTGoogleMapJsonConversions toPoint:data]; }
+
+static void InterpretMarkerOptions(NSDictionary* data, id<FLTGoogleMapMarkerOptionsSink> sink,
+                                   NSObject<FlutterPluginRegistrar>* registrar) {
+  NSNumber* alpha = data[@"alpha"];
+  if (alpha) {
+    [sink setAlpha:ToFloat(alpha)];
+  }
+  NSArray* anchor = data[@"anchor"];
+  if (anchor) {
+    [sink setAnchor:ToPoint(anchor)];
+  }
+  NSNumber* draggable = data[@"draggable"];
+  if (draggable) {
+    [sink setDraggable:ToBool(draggable)];
+  }
+  NSArray* icon = data[@"icon"];
+  if (icon) {
+    UIImage* image = ExtractIcon(registrar, icon);
+    [sink setIcon:image];
+  }
+  NSNumber* flat = data[@"flat"];
+  if (flat) {
+    [sink setFlat:ToBool(flat)];
+  }
+  NSNumber* consumeTapEvents = data[@"consumeTapEvents"];
+  if (consumeTapEvents) {
+    [sink setConsumeTapEvents:ToBool(consumeTapEvents)];
+  }
+  InterpretInfoWindow(sink, data);
+  NSArray* position = data[@"position"];
+  if (position) {
+    [sink setPosition:ToLocation(position)];
+  }
+  NSNumber* rotation = data[@"rotation"];
+  if (rotation) {
+    [sink setRotation:ToDouble(rotation)];
+  }
+  NSNumber* visible = data[@"visible"];
+  if (visible) {
+    [sink setVisible:ToBool(visible)];
+  }
+  NSNumber* zIndex = data[@"zIndex"];
+  if (zIndex) {
+    [sink setZIndex:ToInt(zIndex)];
+  }
+}
+
+static void InterpretInfoWindow(id<FLTGoogleMapMarkerOptionsSink> sink, NSDictionary* data) {
+  NSDictionary* infoWindow = data[@"infoWindow"];
+  if (infoWindow) {
+    NSString* title = infoWindow[@"title"];
+    NSString* snippet = infoWindow[@"snippet"];
+    if (title) {
+      [sink setInfoWindowTitle:title snippet:snippet];
+    }
+    NSArray* infoWindowAnchor = infoWindow[@"infoWindowAnchor"];
+    if (infoWindowAnchor) {
+      [sink setInfoWindowAnchor:ToPoint(infoWindowAnchor)];
+    }
+  }
+}
+
+static UIImage* ExtractIcon(NSObject<FlutterPluginRegistrar>* registrar, NSArray* iconData) {
+  UIImage* image;
+  if ([iconData.firstObject isEqualToString:@"defaultMarker"]) {
+    CGFloat hue = (iconData.count == 1) ? 0.0f : ToDouble(iconData[1]);
+    image = [GMSMarker markerImageWithColor:[UIColor colorWithHue:hue / 360.0
+                                                       saturation:1.0
+                                                       brightness:0.7
+                                                            alpha:1.0]];
+  } else if ([iconData.firstObject isEqualToString:@"fromAsset"]) {
+    if (iconData.count == 2) {
+      image = [UIImage imageNamed:[registrar lookupKeyForAsset:iconData[1]]];
+    } else {
+      image = [UIImage imageNamed:[registrar lookupKeyForAsset:iconData[1]
+                                                   fromPackage:iconData[2]]];
+    }
+  }
+  return image;
+}
+
+@implementation FLTMarkersController {
+  NSMutableDictionary* _markerIdToController;
+  FlutterMethodChannel* _methodChannel;
+  NSObject<FlutterPluginRegistrar>* _registrar;
+  GMSMapView* _mapView;
+}
+- (instancetype)init:(FlutterMethodChannel*)methodChannel mapView:(GMSMapView*)mapView {
+  self = [super init];
+  if (self) {
+    _methodChannel = methodChannel;
+    _mapView = mapView;
+    _markerIdToController = [NSMutableDictionary dictionaryWithCapacity:1];
+  }
+  return self;
+}
+- (void)addMarkers:(NSArray*)markersToAdd {
+  for (NSDictionary* marker in markersToAdd) {
+    CLLocationCoordinate2D position = [FLTMarkersController getPosition:marker];
+    NSString* markerId = [FLTMarkersController getMarkerId:marker];
+    FLTGoogleMapMarkerController* controller =
+        [[FLTGoogleMapMarkerController alloc] initMarkerWithPosition:position
+                                                            markerId:markerId
+                                                             mapView:_mapView];
+    InterpretMarkerOptions(marker, controller, _registrar);
+    _markerIdToController[markerId] = controller;
+  }
+}
+- (void)changeMarkers:(NSArray*)markersToChange {
+  for (NSDictionary* marker in markersToChange) {
+    NSString* markerId = [FLTMarkersController getMarkerId:marker];
+    FLTGoogleMapMarkerController* controller = _markerIdToController[markerId];
+    if (!controller) {
+      continue;
+    }
+    InterpretMarkerOptions(marker, controller, _registrar);
+  }
+}
+- (void)removeMarkerIds:(NSArray*)markerIdsToRemove {
+  for (NSString* markerId in markerIdsToRemove) {
+    if (!markerId) {
+      continue;
+    }
+    FLTGoogleMapMarkerController* controller = _markerIdToController[markerId];
+    if (!controller) {
+      continue;
+    }
+    [controller removeMarker];
+    [_markerIdToController removeObjectForKey:markerId];
+  }
+}
+- (BOOL)onMarkerTap:(NSString*)markerId {
+  if (!markerId) {
+    return NO;
+  }
+  FLTGoogleMapMarkerController* controller = _markerIdToController[markerId];
+  if (!controller) {
+    return NO;
+  }
+  [_methodChannel invokeMethod:@"marker#onTap" arguments:@{@"markerId" : markerId}];
+  return controller.consumeTapEvents;
+}
+- (void)onInfoWindowTap:(NSString*)markerId {
+  if (markerId && _markerIdToController[markerId]) {
+    [_methodChannel invokeMethod:@"infoWindow#onTap" arguments:@{@"markerId" : markerId}];
+  }
+}
+
++ (CLLocationCoordinate2D)getPosition:(NSDictionary*)marker {
+  NSArray* position = marker[@"position"];
+  return ToLocation(position);
+}
++ (NSString*)getMarkerId:(NSDictionary*)marker {
+  return marker[@"markerId"];
+}
+@end
diff --git a/packages/google_maps_flutter/ios/Classes/JsonConversions.h b/packages/google_maps_flutter/ios/Classes/JsonConversions.h
new file mode 100644
index 000000000000..625b2e396f6a
--- /dev/null
+++ b/packages/google_maps_flutter/ios/Classes/JsonConversions.h
@@ -0,0 +1,15 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <Flutter/Flutter.h>
+#import <GoogleMaps/GoogleMaps.h>
+
+@interface FLTGoogleMapJsonConversions : NSObject
++ (bool)toBool:(NSNumber*)data;
++ (int)toInt:(NSNumber*)data;
++ (double)toDouble:(NSNumber*)data;
++ (float)toFloat:(NSNumber*)data;
++ (CLLocationCoordinate2D)toLocation:(NSArray*)data;
++ (CGPoint)toPoint:(NSArray*)data;
+@end
diff --git a/packages/google_maps_flutter/ios/Classes/JsonConversions.m b/packages/google_maps_flutter/ios/Classes/JsonConversions.m
new file mode 100644
index 000000000000..7353c333b8dd
--- /dev/null
+++ b/packages/google_maps_flutter/ios/Classes/JsonConversions.m
@@ -0,0 +1,35 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "JsonConversions.h"
+
+@implementation FLTGoogleMapJsonConversions
+
++ (bool)toBool:(NSNumber*)data {
+  return data.boolValue;
+}
+
++ (int)toInt:(NSNumber*)data {
+  return data.intValue;
+}
+
++ (double)toDouble:(NSNumber*)data {
+  return data.doubleValue;
+}
+
++ (float)toFloat:(NSNumber*)data {
+  return data.floatValue;
+}
+
++ (CLLocationCoordinate2D)toLocation:(NSArray*)data {
+  return CLLocationCoordinate2DMake([FLTGoogleMapJsonConversions toDouble:data[0]],
+                                    [FLTGoogleMapJsonConversions toDouble:data[1]]);
+}
+
++ (CGPoint)toPoint:(NSArray*)data {
+  return CGPointMake([FLTGoogleMapJsonConversions toDouble:data[0]],
+                     [FLTGoogleMapJsonConversions toDouble:data[1]]);
+}
+
+@end
\ No newline at end of file

From 06737e3452725811ae1003b5d374c3931e5b6157 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Wed, 27 Feb 2019 07:22:13 -0800
Subject: [PATCH 177/410] [google_maps_flutter] Marker APIs are now widget
 based (Android) (#1229)

* Marker APIs are now widget based (Android)

note: This commit only deals with Android side of changes.

* Fix format

* Remove MarkerId class
---
 .../flutter/plugins/googlemaps/Convert.java   |  63 +++++++---
 .../plugins/googlemaps/GoogleMapBuilder.java  |   9 +-
 .../googlemaps/GoogleMapController.java       |  81 +++---------
 .../plugins/googlemaps/GoogleMapFactory.java  |   5 +-
 .../googlemaps/GoogleMapOptionsSink.java      |   2 +
 .../plugins/googlemaps/MarkerBuilder.java     |  20 +--
 .../plugins/googlemaps/MarkerController.java  |  23 ++--
 .../plugins/googlemaps/MarkerOptionsSink.java |   2 +-
 .../plugins/googlemaps/MarkersController.java | 115 ++++++++++++++++++
 .../googlemaps/OnCameraMoveListener.java      |  15 ---
 .../OnInfoWindowTappedListener.java           |  11 --
 .../googlemaps/OnMarkerTappedListener.java    |  11 --
 12 files changed, 215 insertions(+), 142 deletions(-)
 create mode 100644 packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java
 delete mode 100644 packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/OnCameraMoveListener.java
 delete mode 100644 packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/OnInfoWindowTappedListener.java
 delete mode 100644 packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/OnMarkerTappedListener.java

diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
index cacb7459161b..34551e90237a 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
@@ -20,6 +20,7 @@
 
 /** Conversions between JSON-like values and GoogleMaps data types. */
 class Convert {
+
   private static BitmapDescriptor toBitmapDescriptor(Object o) {
     final List<?> data = toList(o);
     switch (toString(data.get(0))) {
@@ -101,7 +102,7 @@ private static Float toFloatWrapper(Object o) {
     return (o == null) ? null : toFloat(o);
   }
 
-  static int toInt(Object o) {
+  private static int toInt(Object o) {
     return ((Number) o).intValue();
   }
 
@@ -117,6 +118,15 @@ static Object toJson(CameraPosition position) {
     return data;
   }
 
+  static Object toJson(String markerId) {
+    if (markerId == null) {
+      return null;
+    }
+    final Map<String, Object> data = new HashMap<>(1);
+    data.put("markerId", markerId);
+    return data;
+  }
+
   private static Object toJson(LatLng latLng) {
     return Arrays.asList(latLng.latitude, latLng.longitude);
   }
@@ -138,11 +148,7 @@ private static List<?> toList(Object o) {
     return (List<?>) o;
   }
 
-  static long toLong(Object o) {
-    return ((Number) o).longValue();
-  }
-
-  static Map<?, ?> toMap(Object o) {
+  private static Map<?, ?> toMap(Object o) {
     return (Map<?, ?>) o;
   }
 
@@ -150,7 +156,7 @@ private static float toFractionalPixels(Object o, float density) {
     return toFloat(o) * density;
   }
 
-  static int toPixels(Object o, float density) {
+  private static int toPixels(Object o, float density) {
     return (int) toFractionalPixels(o, density);
   }
 
@@ -211,7 +217,8 @@ static void interpretGoogleMapOptions(Object o, GoogleMapOptionsSink sink) {
     }
   }
 
-  static void interpretMarkerOptions(Object o, MarkerOptionsSink sink) {
+  /** Returns the dartMarkerId of the interpreted marker. */
+  static String interpretMarkerOptions(Object o, MarkerOptionsSink sink) {
     final Map<?, ?> data = toMap(o);
     final Object alpha = data.get("alpha");
     if (alpha != null) {
@@ -222,9 +229,9 @@ static void interpretMarkerOptions(Object o, MarkerOptionsSink sink) {
       final List<?> anchorData = toList(anchor);
       sink.setAnchor(toFloat(anchorData.get(0)), toFloat(anchorData.get(1)));
     }
-    final Object consumesTapEvents = data.get("consumesTapEvents");
-    if (consumesTapEvents != null) {
-      sink.setConsumeTapEvents(toBoolean(consumesTapEvents));
+    final Object consumeTapEvents = data.get("consumeTapEvents");
+    if (consumeTapEvents != null) {
+      sink.setConsumeTapEvents(toBoolean(consumeTapEvents));
     }
     final Object draggable = data.get("draggable");
     if (draggable != null) {
@@ -238,15 +245,10 @@ static void interpretMarkerOptions(Object o, MarkerOptionsSink sink) {
     if (icon != null) {
       sink.setIcon(toBitmapDescriptor(icon));
     }
-    final Object infoWindowAnchor = data.get("infoWindowAnchor");
-    if (infoWindowAnchor != null) {
-      final List<?> anchorData = toList(infoWindowAnchor);
-      sink.setInfoWindowAnchor(toFloat(anchorData.get(0)), toFloat(anchorData.get(1)));
-    }
-    final Object infoWindowText = data.get("infoWindowText");
-    if (infoWindowText != null) {
-      final List<?> textData = toList(infoWindowText);
-      sink.setInfoWindowText(toString(textData.get(0)), toString(textData.get(1)));
+
+    final Object infoWindow = data.get("infoWindow");
+    if (infoWindow != null) {
+      interpretInfoWindowOptions(sink, (Map<String, Object>) infoWindow);
     }
     final Object position = data.get("position");
     if (position != null) {
@@ -264,5 +266,26 @@ static void interpretMarkerOptions(Object o, MarkerOptionsSink sink) {
     if (zIndex != null) {
       sink.setZIndex(toFloat(zIndex));
     }
+    final String markerId = (String) data.get("markerId");
+    if (markerId == null) {
+      throw new IllegalArgumentException("markerId was null");
+    } else {
+      return markerId;
+    }
+  }
+
+  private static void interpretInfoWindowOptions(
+      MarkerOptionsSink sink, Map<String, Object> infoWindow) {
+    String title = (String) infoWindow.get("title");
+    String snippet = (String) infoWindow.get("snippet");
+    // snippet is nullable.
+    if (title != null) {
+      sink.setInfoWindowText(title, snippet);
+    }
+    Object infoWindowAnchor = infoWindow.get("anchor");
+    if (infoWindowAnchor != null) {
+      final List<?> anchorData = toList(infoWindowAnchor);
+      sink.setInfoWindowAnchor(toFloat(anchorData.get(0)), toFloat(anchorData.get(1)));
+    }
   }
 }
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
index ea2b90ad6853..8e8200369486 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
@@ -15,6 +15,7 @@ class GoogleMapBuilder implements GoogleMapOptionsSink {
   private final GoogleMapOptions options = new GoogleMapOptions();
   private boolean trackCameraPosition = false;
   private boolean myLocationEnabled = false;
+  private Object initialMarkers;
 
   GoogleMapController build(
       int id, Context context, AtomicInteger state, PluginRegistry.Registrar registrar) {
@@ -23,10 +24,11 @@ GoogleMapController build(
     controller.init();
     controller.setMyLocationEnabled(myLocationEnabled);
     controller.setTrackCameraPosition(trackCameraPosition);
+    controller.setInitialMarkers(initialMarkers);
     return controller;
   }
 
-  public void setInitialCameraPosition(CameraPosition position) {
+  void setInitialCameraPosition(CameraPosition position) {
     options.camera(position);
   }
 
@@ -84,4 +86,9 @@ public void setZoomGesturesEnabled(boolean zoomGesturesEnabled) {
   public void setMyLocationEnabled(boolean myLocationEnabled) {
     this.myLocationEnabled = myLocationEnabled;
   }
+
+  @Override
+  public void setInitialMarkers(Object initialMarkers) {
+    this.initialMarkers = initialMarkers;
+  }
 }
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index c8d541f17785..55e6a45b85dd 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -12,6 +12,7 @@
 import static io.flutter.plugins.googlemaps.GoogleMapsPlugin.STOPPED;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
@@ -27,13 +28,13 @@
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.android.gms.maps.model.Marker;
-import com.google.android.gms.maps.model.MarkerOptions;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
 import io.flutter.plugin.platform.PlatformView;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -48,7 +49,6 @@ final class GoogleMapController
         GoogleMapOptionsSink,
         MethodChannel.MethodCallHandler,
         OnMapReadyCallback,
-        OnMarkerTappedListener,
         PlatformView {
   private static final String TAG = "GoogleMapController";
   private final int id;
@@ -56,7 +56,6 @@ final class GoogleMapController
   private final MethodChannel methodChannel;
   private final PluginRegistry.Registrar registrar;
   private final MapView mapView;
-  private final Map<String, MarkerController> markers;
   private GoogleMap googleMap;
   private boolean trackCameraPosition = false;
   private boolean myLocationEnabled = false;
@@ -65,6 +64,7 @@ final class GoogleMapController
   private MethodChannel.Result mapReadyResult;
   private final int registrarActivityHashCode;
   private final Context context;
+  private final MarkersController markersController;
 
   GoogleMapController(
       int id,
@@ -77,12 +77,12 @@ final class GoogleMapController
     this.activityState = activityState;
     this.registrar = registrar;
     this.mapView = new MapView(context, options);
-    this.markers = new HashMap<>();
     this.density = context.getResources().getDisplayMetrics().density;
     methodChannel =
         new MethodChannel(registrar.messenger(), "plugins.flutter.io/google_maps_" + id);
     methodChannel.setMethodCallHandler(this);
     this.registrarActivityHashCode = registrar.activity().hashCode();
+    this.markersController = new MarkersController(methodChannel);
   }
 
   @Override
@@ -140,31 +140,6 @@ private CameraPosition getCameraPosition() {
     return trackCameraPosition ? googleMap.getCameraPosition() : null;
   }
 
-  private MarkerBuilder newMarkerBuilder() {
-    return new MarkerBuilder(this);
-  }
-
-  Marker addMarker(MarkerOptions markerOptions, boolean consumesTapEvents) {
-    final Marker marker = googleMap.addMarker(markerOptions);
-    markers.put(marker.getId(), new MarkerController(marker, consumesTapEvents, this));
-    return marker;
-  }
-
-  private void removeMarker(String markerId) {
-    final MarkerController markerController = markers.remove(markerId);
-    if (markerController != null) {
-      markerController.remove();
-    }
-  }
-
-  private MarkerController marker(String markerId) {
-    final MarkerController marker = markers.get(markerId);
-    if (marker == null) {
-      throw new IllegalArgumentException("Unknown marker: " + markerId);
-    }
-    return marker;
-  }
-
   @Override
   public void onMapReady(GoogleMap googleMap) {
     this.googleMap = googleMap;
@@ -178,6 +153,7 @@ public void onMapReady(GoogleMap googleMap) {
     googleMap.setOnCameraIdleListener(this);
     googleMap.setOnMarkerClickListener(this);
     updateMyLocationEnabled();
+    markersController.setGoogleMap(googleMap);
   }
 
   @Override
@@ -212,27 +188,14 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
           result.success(null);
           break;
         }
-      case "marker#add":
-        {
-          final MarkerBuilder markerBuilder = newMarkerBuilder();
-          Convert.interpretMarkerOptions(call.argument("options"), markerBuilder);
-          final String markerId = markerBuilder.build();
-          result.success(markerId);
-          break;
-        }
-      case "marker#remove":
-        {
-          final String markerId = call.argument("marker");
-          removeMarker(markerId);
-          result.success(null);
-          break;
-        }
-      case "marker#update":
+      case "markers#update":
         {
-          final String markerId = call.argument("marker");
-          final MarkerController marker = marker(markerId);
-          Convert.interpretMarkerOptions(call.argument("options"), marker);
-          result.success(null);
+          Object markersToAdd = call.argument("markersToAdd");
+          markersController.addMarkers((List<Object>) markersToAdd);
+          Object markersToChange = call.argument("markersToChange");
+          markersController.changeMarkers((List<Object>) markersToChange);
+          Object markerIdsToRemove = call.argument("markerIdsToRemove");
+          markersController.removeMarkers((List<Object>) markerIdsToRemove);
           break;
         }
       default:
@@ -250,9 +213,7 @@ public void onCameraMoveStarted(int reason) {
 
   @Override
   public void onInfoWindowClick(Marker marker) {
-    final Map<String, Object> arguments = new HashMap<>(2);
-    arguments.put("marker", marker.getId());
-    methodChannel.invokeMethod("infoWindow#onTap", arguments);
+    markersController.onInfoWindowTap(marker.getId());
   }
 
   @Override
@@ -270,17 +231,9 @@ public void onCameraIdle() {
     methodChannel.invokeMethod("camera#onIdle", Collections.singletonMap("map", id));
   }
 
-  @Override
-  public void onMarkerTapped(Marker marker) {
-    final Map<String, Object> arguments = new HashMap<>(2);
-    arguments.put("marker", marker.getId());
-    methodChannel.invokeMethod("marker#onTap", arguments);
-  }
-
   @Override
   public boolean onMarkerClick(Marker marker) {
-    final MarkerController markerController = markers.get(marker.getId());
-    return (markerController != null && markerController.onTap());
+    return markersController.onMarkerTap(marker.getId());
   }
 
   @Override
@@ -414,6 +367,12 @@ public void setMyLocationEnabled(boolean myLocationEnabled) {
     }
   }
 
+  @Override
+  public void setInitialMarkers(Object initialMarkers) {
+    markersController.addMarkers((List<Object>) initialMarkers);
+  }
+
+  @SuppressLint("MissingPermission")
   private void updateMyLocationEnabled() {
     if (hasLocationPermission()) {
       // The plugin doesn't add the location permission by default so that apps that don't need
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
index ee0fdb6119c6..c66dc3e42f54 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
@@ -15,7 +15,7 @@ public class GoogleMapFactory extends PlatformViewFactory {
   private final AtomicInteger mActivityState;
   private final Registrar mPluginRegistrar;
 
-  public GoogleMapFactory(AtomicInteger state, Registrar registrar) {
+  GoogleMapFactory(AtomicInteger state, Registrar registrar) {
     super(StandardMessageCodec.INSTANCE);
     mActivityState = state;
     mPluginRegistrar = registrar;
@@ -32,6 +32,9 @@ public PlatformView create(Context context, int id, Object args) {
       CameraPosition position = Convert.toCameraPosition(params.get("initialCameraPosition"));
       builder.setInitialCameraPosition(position);
     }
+    if (params.containsKey("markersToAdd")) {
+      builder.setInitialMarkers(params.get("markersToAdd"));
+    }
     return builder.build(id, context, mActivityState, mPluginRegistrar);
   }
 }
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
index 3a166bfae503..bf6cc2e2202e 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
@@ -27,4 +27,6 @@ interface GoogleMapOptionsSink {
   void setZoomGesturesEnabled(boolean zoomGesturesEnabled);
 
   void setMyLocationEnabled(boolean myLocationEnabled);
+
+  void setInitialMarkers(Object initialMarkers);
 }
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerBuilder.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerBuilder.java
index 532b078a3441..29e4de00c5b0 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerBuilder.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerBuilder.java
@@ -6,22 +6,22 @@
 
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 
 class MarkerBuilder implements MarkerOptionsSink {
-  private final GoogleMapController mapController;
   private final MarkerOptions markerOptions;
-  private boolean consumesTapEvents;
+  private boolean consumeTapEvents;
 
-  MarkerBuilder(GoogleMapController mapController) {
-    this.mapController = mapController;
+  MarkerBuilder() {
     this.markerOptions = new MarkerOptions();
   }
 
-  String build() {
-    final Marker marker = mapController.addMarker(markerOptions, consumesTapEvents);
-    return marker.getId();
+  MarkerOptions build() {
+    return markerOptions;
+  }
+
+  boolean consumeTapEvents() {
+    return consumeTapEvents;
   }
 
   @Override
@@ -35,8 +35,8 @@ public void setAnchor(float u, float v) {
   }
 
   @Override
-  public void setConsumeTapEvents(boolean consumesTapEvents) {
-    this.consumesTapEvents = consumesTapEvents;
+  public void setConsumeTapEvents(boolean consumeTapEvents) {
+    this.consumeTapEvents = consumeTapEvents;
   }
 
   @Override
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerController.java
index 73e81f6382da..6f3089b126fd 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerController.java
@@ -10,22 +10,15 @@
 
 /** Controller of a single Marker on the map. */
 class MarkerController implements MarkerOptionsSink {
+
   private final Marker marker;
-  private final OnMarkerTappedListener onTappedListener;
+  private final String googleMapsMarkerId;
   private boolean consumeTapEvents;
 
-  MarkerController(
-      Marker marker, boolean consumeTapEvents, OnMarkerTappedListener onTappedListener) {
+  MarkerController(Marker marker, boolean consumeTapEvents) {
     this.marker = marker;
     this.consumeTapEvents = consumeTapEvents;
-    this.onTappedListener = onTappedListener;
-  }
-
-  boolean onTap() {
-    if (onTappedListener != null) {
-      onTappedListener.onMarkerTapped(marker);
-    }
-    return consumeTapEvents;
+    this.googleMapsMarkerId = marker.getId();
   }
 
   void remove() {
@@ -92,4 +85,12 @@ public void setVisible(boolean visible) {
   public void setZIndex(float zIndex) {
     marker.setZIndex(zIndex);
   }
+
+  String getGoogleMapsMarkerId() {
+    return googleMapsMarkerId;
+  }
+
+  boolean consumeTapEvents() {
+    return consumeTapEvents;
+  }
 }
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerOptionsSink.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerOptionsSink.java
index 8b213ddf8983..3f853b9f1459 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerOptionsSink.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerOptionsSink.java
@@ -13,7 +13,7 @@ interface MarkerOptionsSink {
 
   void setAnchor(float u, float v);
 
-  void setConsumeTapEvents(boolean consumesTapEvents);
+  void setConsumeTapEvents(boolean consumeTapEvents);
 
   void setDraggable(boolean draggable);
 
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java
new file mode 100644
index 000000000000..4d0b69f07f2e
--- /dev/null
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java
@@ -0,0 +1,115 @@
+package io.flutter.plugins.googlemaps;
+
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.MarkerOptions;
+import io.flutter.plugin.common.MethodChannel;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+class MarkersController {
+
+  private final Map<String, MarkerController> markerIdToController;
+  private final Map<String, String> googleMapsMarkerIdToDartMarkerId;
+  private final MethodChannel methodChannel;
+  private GoogleMap googleMap;
+
+  MarkersController(MethodChannel methodChannel) {
+    this.markerIdToController = new HashMap<>();
+    this.googleMapsMarkerIdToDartMarkerId = new HashMap<>();
+    this.methodChannel = methodChannel;
+  }
+
+  void setGoogleMap(GoogleMap googleMap) {
+    this.googleMap = googleMap;
+  }
+
+  void addMarkers(List<Object> markersToAdd) {
+    if (markersToAdd != null) {
+      for (Object markerToAdd : markersToAdd) {
+        addMarker(markerToAdd);
+      }
+    }
+  }
+
+  void changeMarkers(List<Object> markersToChange) {
+    if (markersToChange != null) {
+      for (Object markerToChange : markersToChange) {
+        changeMarker(markerToChange);
+      }
+    }
+  }
+
+  void removeMarkers(List<Object> markerIdsToRemove) {
+    if (markerIdsToRemove == null) {
+      return;
+    }
+    for (Object rawMarkerId : markerIdsToRemove) {
+      if (rawMarkerId == null) {
+        continue;
+      }
+      String markerId = (String) rawMarkerId;
+      final MarkerController markerController = markerIdToController.remove(markerId);
+      if (markerController != null) {
+        markerController.remove();
+        googleMapsMarkerIdToDartMarkerId.remove(markerController.getGoogleMapsMarkerId());
+      }
+    }
+  }
+
+  boolean onMarkerTap(String googleMarkerId) {
+    String markerId = googleMapsMarkerIdToDartMarkerId.get(googleMarkerId);
+    if (markerId == null) {
+      return false;
+    }
+    methodChannel.invokeMethod("marker#onTap", Convert.toJson(markerId));
+    MarkerController markerController = markerIdToController.get(markerId);
+    if (markerController != null) {
+      return markerController.consumeTapEvents();
+    }
+    return false;
+  }
+
+  void onInfoWindowTap(String googleMarkerId) {
+    String markerId = googleMapsMarkerIdToDartMarkerId.get(googleMarkerId);
+    if (markerId == null) {
+      return;
+    }
+    methodChannel.invokeMethod("infoWindow#onTap", Convert.toJson(markerId));
+  }
+
+  private void addMarker(Object marker) {
+    if (marker == null) {
+      return;
+    }
+    MarkerBuilder markerBuilder = new MarkerBuilder();
+    String markerId = Convert.interpretMarkerOptions(marker, markerBuilder);
+    MarkerOptions options = markerBuilder.build();
+    addMarker(markerId, options, markerBuilder.consumeTapEvents());
+  }
+
+  private void addMarker(String markerId, MarkerOptions markerOptions, boolean consumeTapEvents) {
+    final Marker marker = googleMap.addMarker(markerOptions);
+    MarkerController controller = new MarkerController(marker, consumeTapEvents);
+    markerIdToController.put(markerId, controller);
+    googleMapsMarkerIdToDartMarkerId.put(marker.getId(), markerId);
+  }
+
+  private void changeMarker(Object marker) {
+    if (marker == null) {
+      return;
+    }
+    String markerId = getMarkerId(marker);
+    MarkerController markerController = markerIdToController.get(markerId);
+    if (markerController != null) {
+      Convert.interpretMarkerOptions(marker, markerController);
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  private static String getMarkerId(Object marker) {
+    Map<String, Object> markerMap = (Map<String, Object>) marker;
+    return (String) markerMap.get("markerId");
+  }
+}
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/OnCameraMoveListener.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/OnCameraMoveListener.java
deleted file mode 100644
index b78feb830c5c..000000000000
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/OnCameraMoveListener.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package io.flutter.plugins.googlemaps;
-
-import com.google.android.gms.maps.model.CameraPosition;
-
-interface OnCameraMoveListener {
-  void onCameraMoveStarted(boolean isGesture);
-
-  void onCameraMove(CameraPosition newPosition);
-
-  void onCameraIdle();
-}
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/OnInfoWindowTappedListener.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/OnInfoWindowTappedListener.java
deleted file mode 100644
index 52341f994794..000000000000
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/OnInfoWindowTappedListener.java
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package io.flutter.plugins.googlemaps;
-
-import com.google.android.gms.maps.model.Marker;
-
-public interface OnInfoWindowTappedListener {
-  void onInfoWindowTapped(Marker marker);
-}
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/OnMarkerTappedListener.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/OnMarkerTappedListener.java
deleted file mode 100644
index 1315f52e8c8b..000000000000
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/OnMarkerTappedListener.java
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package io.flutter.plugins.googlemaps;
-
-import com.google.android.gms.maps.model.Marker;
-
-interface OnMarkerTappedListener {
-  void onMarkerTapped(Marker marker);
-}

From d434feec973bfb9df41f7fdcdf8d2e1f96d1f503 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Wed, 27 Feb 2019 07:47:13 -0800
Subject: [PATCH 178/410] [google_maps_flutter] Marker APIs are now widget
 based (Dart Changes) (#1239)

* Marker APIs are now widget based

Additional Context: Maps Plugin is in the process of being
moved away from a controller based API to a widget based api.
This is to facilitate easier state management and address a
lot of the common issues.

* use collection literals

* Address CR comments

* Revert "use collection literals"

This reverts commit 75956c2f58d2b97a90ce9b2ccfad6fd4856e155d.

* fix collection literal stuff

* Crearte a marker update handler and update TODOs

* ignore collection literals

* Fix test failures

* Move marker updates to their own chunks

* Fix failing tests

* Improved some docs and added some assertions

* Make class private

* Fix all hashCode and equals

* update formatring

* Address all the pending cr comments

* fix failing test

* Do not use => without return value

* remove factory method

* User `Marker marker` instead of `Marker m`

* Update changelog and pubspec.yaml
---
 packages/google_maps_flutter/CHANGELOG.md     |   6 +
 .../example/lib/place_marker.dart             | 227 +++++++------
 .../example/lib/scrolling_map.dart            |  39 ++-
 .../lib/google_maps_flutter.dart              |   1 +
 .../lib/src/controller.dart                   | 168 +++------
 .../lib/src/google_map.dart                   |  48 ++-
 .../google_maps_flutter/lib/src/marker.dart   | 319 +++++++++++-------
 .../lib/src/marker_updates.dart               |  90 +++++
 packages/google_maps_flutter/pubspec.yaml     |   2 +-
 .../test/fake_maps_controllers.dart           | 191 +++++++++++
 .../test/google_map_test.dart                 | 121 +------
 .../test/marker_updates_test.dart             | 175 ++++++++++
 12 files changed, 909 insertions(+), 478 deletions(-)
 create mode 100644 packages/google_maps_flutter/lib/src/marker_updates.dart
 create mode 100644 packages/google_maps_flutter/test/fake_maps_controllers.dart
 create mode 100644 packages/google_maps_flutter/test/marker_updates_test.dart

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index d762e465e236..aa9b4390e7ca 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.3.0
+
+* **Breaking change**. Changed the Marker API to be
+  widget based, it was controller based. Also changed the
+  example app to account for the same.
+
 ## 0.2.0+6
 
 * Updated the sample app in README.md.
diff --git a/packages/google_maps_flutter/example/lib/place_marker.dart b/packages/google_maps_flutter/example/lib/place_marker.dart
index 58cefb0c0022..83479008be3f 100644
--- a/packages/google_maps_flutter/example/lib/place_marker.dart
+++ b/packages/google_maps_flutter/example/lib/place_marker.dart
@@ -25,142 +25,191 @@ class PlaceMarkerBody extends StatefulWidget {
   State<StatefulWidget> createState() => PlaceMarkerBodyState();
 }
 
+typedef Marker MarkerUpdateAction(Marker marker);
+
 class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
   PlaceMarkerBodyState();
 
   static final LatLng center = const LatLng(-33.86711, 151.1947171);
 
   GoogleMapController controller;
-  int _markerCount = 0;
-  Marker _selectedMarker;
+  Map<MarkerId, Marker> markers = <MarkerId, Marker>{};
+  MarkerId selectedMarker;
+  int _markerIdCounter = 1;
 
   void _onMapCreated(GoogleMapController controller) {
     this.controller = controller;
-    controller.onMarkerTapped.add(_onMarkerTapped);
   }
 
   @override
   void dispose() {
-    controller?.onMarkerTapped?.remove(_onMarkerTapped);
     super.dispose();
   }
 
-  void _onMarkerTapped(Marker marker) {
-    if (_selectedMarker != null) {
-      _updateSelectedMarker(
-        const MarkerOptions(icon: BitmapDescriptor.defaultMarker),
-      );
+  void _onMarkerTapped(MarkerId markerId) {
+    final Marker tappedMarker = markers[markerId];
+    if (tappedMarker != null) {
+      setState(() {
+        if (markers.containsKey(selectedMarker)) {
+          final Marker resetOld = markers[selectedMarker]
+              .copyWith(iconParam: BitmapDescriptor.defaultMarker);
+          markers[selectedMarker] = resetOld;
+        }
+        selectedMarker = markerId;
+        final Marker newMarker = tappedMarker.copyWith(
+          iconParam: BitmapDescriptor.defaultMarkerWithHue(
+            BitmapDescriptor.hueGreen,
+          ),
+        );
+        markers[markerId] = newMarker;
+      });
     }
-    setState(() {
-      _selectedMarker = marker;
-    });
-    _updateSelectedMarker(
-      MarkerOptions(
-        icon: BitmapDescriptor.defaultMarkerWithHue(
-          BitmapDescriptor.hueGreen,
-        ),
-      ),
-    );
-  }
-
-  void _updateSelectedMarker(MarkerOptions changes) {
-    controller.updateMarker(_selectedMarker, changes);
   }
 
   void _add() {
-    controller.addMarker(MarkerOptions(
+    final int markerCount = markers.length;
+
+    if (markerCount == 12) {
+      return;
+    }
+
+    final String markerIdVal = 'marker_id_$_markerIdCounter';
+    _markerIdCounter++;
+    final MarkerId markerId = MarkerId(markerIdVal);
+
+    final Marker marker = Marker(
+      markerId: markerId,
       position: LatLng(
-        center.latitude + sin(_markerCount * pi / 6.0) / 20.0,
-        center.longitude + cos(_markerCount * pi / 6.0) / 20.0,
+        center.latitude + sin(_markerIdCounter * pi / 6.0) / 20.0,
+        center.longitude + cos(_markerIdCounter * pi / 6.0) / 20.0,
       ),
-      infoWindowText: InfoWindowText('Marker #${_markerCount + 1}', '*'),
-    ));
+      infoWindow: InfoWindow(title: markerIdVal, snippet: '*'),
+      onTap: () {
+        _onMarkerTapped(markerId);
+      },
+    );
+
     setState(() {
-      _markerCount += 1;
+      markers[markerId] = marker;
     });
   }
 
   void _remove() {
-    controller.removeMarker(_selectedMarker);
     setState(() {
-      _selectedMarker = null;
-      _markerCount -= 1;
+      if (markers.containsKey(selectedMarker)) {
+        markers.remove(selectedMarker);
+      }
     });
   }
 
   void _changePosition() {
-    final LatLng current = _selectedMarker.options.position;
+    final Marker marker = markers[selectedMarker];
+    final LatLng current = marker.position;
     final Offset offset = Offset(
       center.latitude - current.latitude,
       center.longitude - current.longitude,
     );
-    _updateSelectedMarker(
-      MarkerOptions(
-        position: LatLng(
+    setState(() {
+      markers[selectedMarker] = marker.copyWith(
+        positionParam: LatLng(
           center.latitude + offset.dy,
           center.longitude + offset.dx,
         ),
-      ),
-    );
+      );
+    });
   }
 
   void _changeAnchor() {
-    final Offset currentAnchor = _selectedMarker.options.anchor;
+    final Marker marker = markers[selectedMarker];
+    final Offset currentAnchor = marker.anchor;
     final Offset newAnchor = Offset(1.0 - currentAnchor.dy, currentAnchor.dx);
-    _updateSelectedMarker(MarkerOptions(anchor: newAnchor));
+    setState(() {
+      markers[selectedMarker] = marker.copyWith(
+        anchorParam: newAnchor,
+      );
+    });
   }
 
   Future<void> _changeInfoAnchor() async {
-    final Offset currentAnchor = _selectedMarker.options.infoWindowAnchor;
+    final Marker marker = markers[selectedMarker];
+    final Offset currentAnchor = marker.infoWindow.anchor;
     final Offset newAnchor = Offset(1.0 - currentAnchor.dy, currentAnchor.dx);
-    _updateSelectedMarker(MarkerOptions(infoWindowAnchor: newAnchor));
+    setState(() {
+      markers[selectedMarker] = marker.copyWith(
+        infoWindowParam: marker.infoWindow.copyWith(
+          anchorParam: newAnchor,
+        ),
+      );
+    });
   }
 
   Future<void> _toggleDraggable() async {
-    _updateSelectedMarker(
-      MarkerOptions(draggable: !_selectedMarker.options.draggable),
-    );
+    final Marker marker = markers[selectedMarker];
+    setState(() {
+      markers[selectedMarker] = marker.copyWith(
+        draggableParam: !marker.draggable,
+      );
+    });
   }
 
   Future<void> _toggleFlat() async {
-    _updateSelectedMarker(MarkerOptions(flat: !_selectedMarker.options.flat));
+    final Marker marker = markers[selectedMarker];
+    setState(() {
+      markers[selectedMarker] = marker.copyWith(
+        flatParam: !marker.flat,
+      );
+    });
   }
 
   Future<void> _changeInfo() async {
-    final InfoWindowText currentInfo = _selectedMarker.options.infoWindowText;
-    _updateSelectedMarker(MarkerOptions(
-      infoWindowText: InfoWindowText(
-        currentInfo.title,
-        currentInfo.snippet + '*',
-      ),
-    ));
+    final Marker marker = markers[selectedMarker];
+    final String newSnippet = marker.infoWindow.snippet + '*';
+    setState(() {
+      markers[selectedMarker] = marker.copyWith(
+        infoWindowParam: marker.infoWindow.copyWith(
+          snippetParam: newSnippet,
+        ),
+      );
+    });
   }
 
   Future<void> _changeAlpha() async {
-    final double current = _selectedMarker.options.alpha;
-    _updateSelectedMarker(
-      MarkerOptions(alpha: current < 0.1 ? 1.0 : current * 0.75),
-    );
+    final Marker marker = markers[selectedMarker];
+    final double current = marker.alpha;
+    setState(() {
+      markers[selectedMarker] = marker.copyWith(
+        alphaParam: current < 0.1 ? 1.0 : current * 0.75,
+      );
+    });
   }
 
   Future<void> _changeRotation() async {
-    final double current = _selectedMarker.options.rotation;
-    _updateSelectedMarker(
-      MarkerOptions(rotation: current == 330.0 ? 0.0 : current + 30.0),
-    );
+    final Marker marker = markers[selectedMarker];
+    final double current = marker.rotation;
+    setState(() {
+      markers[selectedMarker] = marker.copyWith(
+        rotationParam: current == 330.0 ? 0.0 : current + 30.0,
+      );
+    });
   }
 
   Future<void> _toggleVisible() async {
-    _updateSelectedMarker(
-      MarkerOptions(visible: !_selectedMarker.options.visible),
-    );
+    final Marker marker = markers[selectedMarker];
+    setState(() {
+      markers[selectedMarker] = marker.copyWith(
+        visibleParam: !marker.visible,
+      );
+    });
   }
 
   Future<void> _changeZIndex() async {
-    final double current = _selectedMarker.options.zIndex;
-    _updateSelectedMarker(
-      MarkerOptions(zIndex: current == 12.0 ? 0.0 : current + 1.0),
-    );
+    final Marker marker = markers[selectedMarker];
+    final double current = marker.zIndex;
+    setState(() {
+      markers[selectedMarker] = marker.copyWith(
+        zIndexParam: current == 12.0 ? 0.0 : current + 1.0,
+      );
+    });
   }
 
   @override
@@ -179,6 +228,10 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
                 target: LatLng(-33.852, 151.211),
                 zoom: 11.0,
               ),
+              // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+              // https://github.com/flutter/flutter/issues/28312
+              // ignore: prefer_collection_literals
+              markers: Set<Marker>.of(markers.values),
             ),
           ),
         ),
@@ -193,22 +246,19 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
                       children: <Widget>[
                         FlatButton(
                           child: const Text('add'),
-                          onPressed: (_markerCount == 12) ? null : _add,
+                          onPressed: _add,
                         ),
                         FlatButton(
                           child: const Text('remove'),
-                          onPressed: (_selectedMarker == null) ? null : _remove,
+                          onPressed: _remove,
                         ),
                         FlatButton(
                           child: const Text('change info'),
-                          onPressed:
-                              (_selectedMarker == null) ? null : _changeInfo,
+                          onPressed: _changeInfo,
                         ),
                         FlatButton(
                           child: const Text('change info anchor'),
-                          onPressed: (_selectedMarker == null)
-                              ? null
-                              : _changeInfoAnchor,
+                          onPressed: _changeInfoAnchor,
                         ),
                       ],
                     ),
@@ -216,46 +266,35 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
                       children: <Widget>[
                         FlatButton(
                           child: const Text('change alpha'),
-                          onPressed:
-                              (_selectedMarker == null) ? null : _changeAlpha,
+                          onPressed: _changeAlpha,
                         ),
                         FlatButton(
                           child: const Text('change anchor'),
-                          onPressed:
-                              (_selectedMarker == null) ? null : _changeAnchor,
+                          onPressed: _changeAnchor,
                         ),
                         FlatButton(
                           child: const Text('toggle draggable'),
-                          onPressed: (_selectedMarker == null)
-                              ? null
-                              : _toggleDraggable,
+                          onPressed: _toggleDraggable,
                         ),
                         FlatButton(
                           child: const Text('toggle flat'),
-                          onPressed:
-                              (_selectedMarker == null) ? null : _toggleFlat,
+                          onPressed: _toggleFlat,
                         ),
                         FlatButton(
                           child: const Text('change position'),
-                          onPressed: (_selectedMarker == null)
-                              ? null
-                              : _changePosition,
+                          onPressed: _changePosition,
                         ),
                         FlatButton(
                           child: const Text('change rotation'),
-                          onPressed: (_selectedMarker == null)
-                              ? null
-                              : _changeRotation,
+                          onPressed: _changeRotation,
                         ),
                         FlatButton(
                           child: const Text('toggle visible'),
-                          onPressed:
-                              (_selectedMarker == null) ? null : _toggleVisible,
+                          onPressed: _toggleVisible,
                         ),
                         FlatButton(
                           child: const Text('change zIndex'),
-                          onPressed:
-                              (_selectedMarker == null) ? null : _changeZIndex,
+                          onPressed: _changeZIndex,
                         ),
                       ],
                     ),
diff --git a/packages/google_maps_flutter/example/lib/scrolling_map.dart b/packages/google_maps_flutter/example/lib/scrolling_map.dart
index fd1661f53938..9597e46dc266 100644
--- a/packages/google_maps_flutter/example/lib/scrolling_map.dart
+++ b/packages/google_maps_flutter/example/lib/scrolling_map.dart
@@ -42,14 +42,13 @@ class ScrollingMapBody extends StatelessWidget {
                     width: 300.0,
                     height: 300.0,
                     child: GoogleMap(
-                      onMapCreated: onMapCreated,
                       initialCameraPosition: CameraPosition(
                         target: center,
                         zoom: 11.0,
                       ),
                       gestureRecognizers:
-                          // TODO(mklim): Remove this when collection literals
-                          // makes it to stable.
+                          // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+                          // https://github.com/flutter/flutter/issues/28312
                           // ignore: prefer_collection_literals
                           <Factory<OneSequenceGestureRecognizer>>[
                         Factory<OneSequenceGestureRecognizer>(
@@ -79,14 +78,32 @@ class ScrollingMapBody extends StatelessWidget {
                     width: 300.0,
                     height: 300.0,
                     child: GoogleMap(
-                      onMapCreated: onMapCreated,
                       initialCameraPosition: CameraPosition(
                         target: center,
                         zoom: 11.0,
                       ),
+                      markers:
+                          // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+                          // https://github.com/flutter/flutter/issues/28312
+                          // ignore: prefer_collection_literals
+                          Set<Marker>.of(
+                        <Marker>[
+                          Marker(
+                            markerId: MarkerId("test_marker_id"),
+                            position: LatLng(
+                              center.latitude,
+                              center.longitude,
+                            ),
+                            infoWindow: const InfoWindow(
+                              title: 'An interesting location',
+                              snippet: '*',
+                            ),
+                          )
+                        ],
+                      ),
                       gestureRecognizers:
-                          // TODO(mklim): Remove this when collection literals
-                          // makes it to stable.
+                          // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+                          // https://github.com/flutter/flutter/issues/28312
                           // ignore: prefer_collection_literals
                           <Factory<OneSequenceGestureRecognizer>>[
                         Factory<OneSequenceGestureRecognizer>(
@@ -103,14 +120,4 @@ class ScrollingMapBody extends StatelessWidget {
       ],
     );
   }
-
-  void onMapCreated(GoogleMapController controller) {
-    controller.addMarker(MarkerOptions(
-      position: LatLng(
-        center.latitude,
-        center.longitude,
-      ),
-      infoWindowText: const InfoWindowText('An interesting location', '*'),
-    ));
-  }
 }
diff --git a/packages/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/lib/google_maps_flutter.dart
index 3d9e185cf605..13e2a9828358 100644
--- a/packages/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/lib/google_maps_flutter.dart
@@ -18,5 +18,6 @@ part 'src/camera.dart';
 part 'src/controller.dart';
 part 'src/google_map.dart';
 part 'src/marker.dart';
+part 'src/marker_updates.dart';
 part 'src/location.dart';
 part 'src/ui.dart';
diff --git a/packages/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/lib/src/controller.dart
index e2ff8e5d1ca8..ecfc4d830c62 100644
--- a/packages/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/lib/src/controller.dart
@@ -9,25 +9,26 @@ part of google_maps_flutter;
 /// Change listeners are notified upon changes to any of
 ///
 /// * the [options] property
-/// * the collection of [Marker]s added to this map
 /// * the [isCameraMoving] property
 /// * the [cameraPosition] property
 ///
 /// Listeners are notified after changes have been applied on the platform side.
-///
-/// Marker tap events can be received by adding callbacks to [onMarkerTapped].
 class GoogleMapController extends ChangeNotifier {
   GoogleMapController._(
-      this._id, MethodChannel channel, CameraPosition initialCameraPosition)
-      : assert(_id != null),
-        assert(channel != null),
+    MethodChannel channel,
+    CameraPosition initialCameraPosition,
+    this._googleMapState,
+  )   : assert(channel != null),
         _channel = channel {
     _cameraPosition = initialCameraPosition;
     _channel.setMethodCallHandler(_handleMethodCall);
   }
 
   static Future<GoogleMapController> init(
-      int id, CameraPosition initialCameraPosition) async {
+    int id,
+    CameraPosition initialCameraPosition,
+    _GoogleMapState googleMapState,
+  ) async {
     assert(id != null);
     final MethodChannel channel =
         MethodChannel('plugins.flutter.io/google_maps_$id');
@@ -35,52 +36,28 @@ class GoogleMapController extends ChangeNotifier {
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
     await channel.invokeMethod('map#waitForMap');
-    return GoogleMapController._(id, channel, initialCameraPosition);
+    return GoogleMapController._(
+      channel,
+      initialCameraPosition,
+      googleMapState,
+    );
   }
 
   final MethodChannel _channel;
 
-  /// Callbacks to receive tap events for markers placed on this map.
-  final ArgumentCallbacks<Marker> onMarkerTapped = ArgumentCallbacks<Marker>();
-
-  /// Callbacks to receive tap events for info windows on markers
-  final ArgumentCallbacks<Marker> onInfoWindowTapped =
-      ArgumentCallbacks<Marker>();
-
-  /// The current set of markers on this map.
-  ///
-  /// The returned set will be a detached snapshot of the markers collection.
-  Set<Marker> get markers => Set<Marker>.from(_markers.values);
-  final Map<String, Marker> _markers = <String, Marker>{};
-
   /// True if the map camera is currently moving.
   bool get isCameraMoving => _isCameraMoving;
   bool _isCameraMoving = false;
 
+  final _GoogleMapState _googleMapState;
+
   /// Returns the most recent camera position reported by the platform side.
   /// Will be null, if [GoogleMap.trackCameraPosition] is false.
   CameraPosition get cameraPosition => _cameraPosition;
   CameraPosition _cameraPosition;
 
-  final int _id;
-
   Future<dynamic> _handleMethodCall(MethodCall call) async {
     switch (call.method) {
-      case 'infoWindow#onTap':
-        final String markerId = call.arguments['marker'];
-        final Marker marker = _markers[markerId];
-        if (marker != null) {
-          onInfoWindowTapped(marker);
-        }
-        break;
-
-      case 'marker#onTap':
-        final String markerId = call.arguments['marker'];
-        final Marker marker = _markers[markerId];
-        if (marker != null) {
-          onMarkerTapped(marker);
-        }
-        break;
       case 'camera#onMoveStarted':
         _isCameraMoving = true;
         notifyListeners();
@@ -93,6 +70,12 @@ class GoogleMapController extends ChangeNotifier {
         _isCameraMoving = false;
         notifyListeners();
         break;
+      case 'marker#onTap':
+        _googleMapState.onMarkerTap(call.arguments['markerId']);
+        break;
+      case 'infoWindow#onTap':
+        _googleMapState.onInfoWindowTap(call.arguments['markerId']);
+        break;
       default:
         throw MissingPluginException();
     }
@@ -119,120 +102,47 @@ class GoogleMapController extends ChangeNotifier {
     notifyListeners();
   }
 
-  /// Starts an animated change of the map camera position.
-  ///
-  /// The returned [Future] completes after the change has been started on the
-  /// platform side.
-  Future<void> animateCamera(CameraUpdate cameraUpdate) async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    await _channel.invokeMethod('camera#animate', <String, dynamic>{
-      'cameraUpdate': cameraUpdate._toJson(),
-    });
-  }
-
-  /// Changes the map camera position.
+  /// Updates marker configuration.
   ///
-  /// The returned [Future] completes after the change has been made on the
-  /// platform side.
-  Future<void> moveCamera(CameraUpdate cameraUpdate) async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    await _channel.invokeMethod('camera#move', <String, dynamic>{
-      'cameraUpdate': cameraUpdate._toJson(),
-    });
-  }
-
-  /// Adds a marker to the map, configured using the specified custom [options].
-  ///
-  /// Change listeners are notified once the marker has been added on the
+  /// Change listeners are notified once the update has been made on the
   /// platform side.
   ///
-  /// The returned [Future] completes with the added marker once listeners have
-  /// been notified.
-  Future<Marker> addMarker(MarkerOptions options) async {
-    final MarkerOptions effectiveOptions =
-        MarkerOptions.defaultOptions.copyWith(options);
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> _updateMarkers(_MarkerUpdates markerUpdates) async {
+    assert(markerUpdates != null);
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
-    final String markerId = await _channel.invokeMethod(
-      'marker#add',
-      <String, dynamic>{
-        'options': effectiveOptions._toJson(),
-      },
+    await _channel.invokeMethod(
+      'markers#update',
+      markerUpdates._toMap(),
     );
-    final Marker marker = Marker(markerId, effectiveOptions);
-    _markers[markerId] = marker;
     notifyListeners();
-    return marker;
   }
 
-  /// Updates the specified [marker] with the given [changes]. The marker must
-  /// be a current member of the [markers] set.
+  /// Starts an animated change of the map camera position.
   ///
-  /// Change listeners are notified once the marker has been updated on the
+  /// The returned [Future] completes after the change has been started on the
   /// platform side.
-  ///
-  /// The returned [Future] completes once listeners have been notified.
-  Future<void> updateMarker(Marker marker, MarkerOptions changes) async {
-    assert(marker != null);
-    assert(_markers[marker._id] == marker);
-    assert(changes != null);
+  Future<void> animateCamera(CameraUpdate cameraUpdate) async {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
-    await _channel.invokeMethod('marker#update', <String, dynamic>{
-      'marker': marker._id,
-      'options': changes._toJson(),
+    await _channel.invokeMethod('camera#animate', <String, dynamic>{
+      'cameraUpdate': cameraUpdate._toJson(),
     });
-    marker._options = marker._options.copyWith(changes);
-    notifyListeners();
   }
 
-  /// Removes the specified [marker] from the map. The marker must be a current
-  /// member of the [markers] set.
-  ///
-  /// Change listeners are notified once the marker has been removed on the
-  /// platform side.
-  ///
-  /// The returned [Future] completes once listeners have been notified.
-  Future<void> removeMarker(Marker marker) async {
-    assert(marker != null);
-    assert(_markers[marker._id] == marker);
-    await _removeMarker(marker._id);
-    notifyListeners();
-  }
-
-  /// Removes all [markers] from the map.
+  /// Changes the map camera position.
   ///
-  /// Change listeners are notified once all markers have been removed on the
+  /// The returned [Future] completes after the change has been made on the
   /// platform side.
-  ///
-  /// The returned [Future] completes once listeners have been notified.
-  Future<void> clearMarkers() async {
-    assert(_markers != null);
-    final List<String> markerIds = List<String>.from(_markers.keys);
-    for (String id in markerIds) {
-      await _removeMarker(id);
-    }
-    notifyListeners();
-  }
-
-  /// Helper method to remove a single marker from the map. Consumed by
-  /// [removeMarker] and [clearMarkers].
-  ///
-  /// The returned [Future] completes once the marker has been removed from
-  /// [_markers].
-  Future<void> _removeMarker(String id) async {
+  Future<void> moveCamera(CameraUpdate cameraUpdate) async {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
-    await _channel.invokeMethod('marker#remove', <String, dynamic>{
-      'marker': id,
+    await _channel.invokeMethod('camera#move', <String, dynamic>{
+      'cameraUpdate': cameraUpdate._toJson(),
     });
-    _markers.remove(id);
   }
 }
diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/lib/src/google_map.dart
index a1f1ad408804..365ac0c00148 100644
--- a/packages/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/lib/src/google_map.dart
@@ -21,6 +21,7 @@ class GoogleMap extends StatefulWidget {
     this.tiltGesturesEnabled = true,
     this.trackCameraPosition = false,
     this.myLocationEnabled = false,
+    this.markers,
   }) : assert(initialCameraPosition != null);
 
   final MapCreatedCallback onMapCreated;
@@ -57,6 +58,9 @@ class GoogleMap extends StatefulWidget {
   /// True if the map view should relay camera move events to Flutter.
   final bool trackCameraPosition;
 
+  // Markers to be placed on the map.
+  final Set<Marker> markers;
+
   /// True if a "My Location" layer should be shown on the map.
   ///
   /// This layer includes a location indicator at the current device location,
@@ -101,13 +105,15 @@ class _GoogleMapState extends State<GoogleMap> {
   final Completer<GoogleMapController> _controller =
       Completer<GoogleMapController>();
 
+  Map<MarkerId, Marker> _markers = <MarkerId, Marker>{};
   _GoogleMapOptions _googleMapOptions;
 
   @override
   Widget build(BuildContext context) {
     final Map<String, dynamic> creationParams = <String, dynamic>{
       'initialCameraPosition': widget.initialCameraPosition?._toMap(),
-      'options': _GoogleMapOptions.fromWidget(widget).toMap(),
+      'options': _googleMapOptions.toMap(),
+      'markersToAdd': _serializeMarkerSet(widget.markers),
     };
     if (defaultTargetPlatform == TargetPlatform.android) {
       return AndroidView(
@@ -135,34 +141,58 @@ class _GoogleMapState extends State<GoogleMap> {
   void initState() {
     super.initState();
     _googleMapOptions = _GoogleMapOptions.fromWidget(widget);
+    _markers = _keyByMarkerId(widget.markers);
   }
 
   @override
   void didUpdateWidget(GoogleMap oldWidget) {
     super.didUpdateWidget(oldWidget);
+    _updateOptions();
+    _updateMarkers();
+  }
+
+  void _updateOptions() async {
     final _GoogleMapOptions newOptions = _GoogleMapOptions.fromWidget(widget);
     final Map<String, dynamic> updates =
         _googleMapOptions.updatesMap(newOptions);
-    _updateOptions(updates);
-    _googleMapOptions = newOptions;
-  }
-
-  void _updateOptions(Map<String, dynamic> updates) async {
     if (updates.isEmpty) {
       return;
     }
     final GoogleMapController controller = await _controller.future;
     controller._updateMapOptions(updates);
+    _googleMapOptions = newOptions;
+  }
+
+  void _updateMarkers() async {
+    final GoogleMapController controller = await _controller.future;
+    controller._updateMarkers(
+        _MarkerUpdates.from(_markers.values.toSet(), widget.markers));
+    _markers = _keyByMarkerId(widget.markers);
   }
 
   Future<void> onPlatformViewCreated(int id) async {
-    final GoogleMapController controller =
-        await GoogleMapController.init(id, widget.initialCameraPosition);
+    final GoogleMapController controller = await GoogleMapController.init(
+      id,
+      widget.initialCameraPosition,
+      this,
+    );
     _controller.complete(controller);
     if (widget.onMapCreated != null) {
       widget.onMapCreated(controller);
     }
   }
+
+  void onMarkerTap(String markerIdParam) {
+    assert(markerIdParam != null);
+    final MarkerId markerId = MarkerId(markerIdParam);
+    _markers[markerId].onTap();
+  }
+
+  void onInfoWindowTap(String markerIdParam) {
+    assert(markerIdParam != null);
+    final MarkerId markerId = MarkerId(markerIdParam);
+    _markers[markerId].infoWindow.onTap();
+  }
 }
 
 /// Configuration options for the GoogleMaps user interface.
@@ -237,11 +267,13 @@ class _GoogleMapOptions {
     addIfNonNull('zoomGesturesEnabled', zoomGesturesEnabled);
     addIfNonNull('trackCameraPosition', trackCameraPosition);
     addIfNonNull('myLocationEnabled', myLocationEnabled);
+
     return optionsMap;
   }
 
   Map<String, dynamic> updatesMap(_GoogleMapOptions newOptions) {
     final Map<String, dynamic> prevOptionsMap = toMap();
+
     return newOptions.toMap()
       ..removeWhere(
           (String key, dynamic value) => prevOptionsMap[key] == value);
diff --git a/packages/google_maps_flutter/lib/src/marker.dart b/packages/google_maps_flutter/lib/src/marker.dart
index 3521497f5bec..cd39f689422d 100644
--- a/packages/google_maps_flutter/lib/src/marker.dart
+++ b/packages/google_maps_flutter/lib/src/marker.dart
@@ -4,33 +4,6 @@
 
 part of google_maps_flutter;
 
-/// An icon placed at a particular geographical location on the map's surface.
-/// A marker icon is drawn oriented against the device's screen rather than the
-/// map's surface; that is, it will not necessarily change orientation due to
-/// map rotations, tilting, or zooming.
-///
-/// Markers are owned by a single [GoogleMapController] which fires events
-/// as markers are added, updated, tapped, and removed.
-class Marker {
-  @visibleForTesting
-  Marker(this._id, this._options);
-
-  /// A unique identifier for this marker.
-  ///
-  /// The identirifer is an arbitrary unique string.
-  final String _id;
-  String get id => _id;
-
-  MarkerOptions _options;
-
-  /// The marker configuration options most recently applied programmatically
-  /// via the map controller.
-  ///
-  /// The returned value does not reflect any changes made to the marker through
-  /// touch events. Add listeners to the owning map controller to track those.
-  MarkerOptions get options => _options;
-}
-
 dynamic _offsetToJson(Offset offset) {
   if (offset == null) {
     return null;
@@ -39,11 +12,16 @@ dynamic _offsetToJson(Offset offset) {
 }
 
 /// Text labels for a [Marker] info window.
-class InfoWindowText {
-  const InfoWindowText(this.title, this.snippet);
+class InfoWindow {
+  const InfoWindow({
+    this.title,
+    this.snippet,
+    this.anchor = const Offset(0.5, 0.0),
+    this.onTap,
+  });
 
   /// Text labels specifying that no text is to be displayed.
-  static const InfoWindowText noText = InfoWindowText(null, null);
+  static const InfoWindow noText = InfoWindow();
 
   /// Text displayed in an info window when the user taps the marker.
   ///
@@ -55,33 +33,138 @@ class InfoWindowText {
   /// A null value means no additional text.
   final String snippet;
 
-  dynamic _toJson() => <dynamic>[title, snippet];
+  /// The icon image point that will be the anchor of the info window when
+  /// displayed.
+  ///
+  /// The image point is specified in normalized coordinates: An anchor of
+  /// (0.0, 0.0) means the top left corner of the image. An anchor
+  /// of (1.0, 1.0) means the bottom right corner of the image.
+  final Offset anchor;
+
+  /// onTap callback for this [InfoWindow].
+  final VoidCallback onTap;
+
+  /// Creates a new [InfoWindow] object whose values are the same as this instance,
+  /// unless overwritten by the specified parameters.
+  InfoWindow copyWith({
+    String titleParam,
+    String snippetParam,
+    Offset anchorParam,
+    VoidCallback onTapParam,
+  }) {
+    return InfoWindow(
+      title: titleParam ?? title,
+      snippet: snippetParam ?? snippet,
+      anchor: anchorParam ?? anchor,
+      onTap: onTapParam ?? onTap,
+    );
+  }
+
+  dynamic _toJson() {
+    final Map<String, dynamic> json = <String, dynamic>{};
+
+    void addIfPresent(String fieldName, dynamic value) {
+      if (value != null) {
+        json[fieldName] = value;
+      }
+    }
+
+    addIfPresent('title', title);
+    addIfPresent('snippet', snippet);
+    addIfPresent('anchor', _offsetToJson(anchor));
+
+    return json;
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final InfoWindow typedOther = other;
+    return title == typedOther.title &&
+        snippet == typedOther.snippet &&
+        anchor == typedOther.anchor;
+  }
+
+  @override
+  int get hashCode => hashValues(title.hashCode, snippet, anchor);
+
+  @override
+  String toString() {
+    return 'InfoWindow{title: $title, snippet: $snippet, anchor: $anchor}';
+  }
 }
 
-/// Configuration options for [Marker] instances.
+/// Uniquely identifies a [Marker] among [GoogleMap] markers.
 ///
-/// When used to change configuration, null values will be interpreted as
-/// "do not change this configuration option".
-class MarkerOptions {
+/// This does not have to be globally unique, only unique among the list.
+@immutable
+class MarkerId {
+  MarkerId(this.value) : assert(value != null);
+
+  /// value of the [MarkerId].
+  final String value;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final MarkerId typedOther = other;
+    return value == typedOther.value;
+  }
+
+  @override
+  int get hashCode => value.hashCode;
+
+  @override
+  String toString() {
+    return 'MarkerId{value: $value}';
+  }
+}
+
+/// Marks a geographical location on the map.
+///
+/// A marker icon is drawn oriented against the device's screen rather than
+/// the map's surface; that is, it will not necessarily change orientation
+/// due to map rotations, tilting, or zooming.
+@immutable
+class Marker {
   /// Creates a set of marker configuration options.
   ///
-  /// By default, every non-specified field is null, meaning no desire to change
-  /// marker defaults or current configuration.
-  const MarkerOptions({
-    this.alpha,
-    this.anchor,
-    this.consumeTapEvents,
-    this.draggable,
-    this.flat,
-    this.icon,
-    this.infoWindowAnchor,
-    this.infoWindowText,
-    this.position,
-    this.rotation,
-    this.visible,
-    this.zIndex,
+  /// Default marker options.
+  ///
+  /// Specifies a marker that
+  /// * is fully opaque; [alpha] is 1.0
+  /// * uses icon bottom center to indicate map position; [anchor] is (0.5, 1.0)
+  /// * has default tap handling; [consumeTapEvents] is false
+  /// * is stationary; [draggable] is false
+  /// * is drawn against the screen, not the map; [flat] is false
+  /// * has a default icon; [icon] is `BitmapDescriptor.defaultMarker`
+  /// * anchors the info window at top center; [infoWindowAnchor] is (0.5, 0.0)
+  /// * has no info window text; [infoWindowText] is `InfoWindowText.noText`
+  /// * is positioned at 0, 0; [position] is `LatLng(0.0, 0.0)`
+  /// * has an axis-aligned icon; [rotation] is 0.0
+  /// * is visible; [visible] is true
+  /// * is placed at the base of the drawing order; [zIndex] is 0.0
+  const Marker({
+    @required this.markerId,
+    this.alpha = 1.0,
+    this.anchor = const Offset(0.5, 1.0),
+    this.consumeTapEvents = false,
+    this.draggable = false,
+    this.flat = false,
+    this.icon = BitmapDescriptor.defaultMarker,
+    this.infoWindow = InfoWindow.noText,
+    this.position = const LatLng(0.0, 0.0),
+    this.rotation = 0.0,
+    this.visible = true,
+    this.zIndex = 0.0,
+    this.onTap,
   }) : assert(alpha == null || (0.0 <= alpha && alpha <= 1.0));
 
+  /// Uniquely identifies a [Marker].
+  final MarkerId markerId;
+
   /// The opacity of the marker, between 0.0 and 1.0 inclusive.
   ///
   /// 0.0 means fully transparent, 1.0 means fully opaque.
@@ -109,16 +192,10 @@ class MarkerOptions {
   /// A description of the bitmap used to draw the marker icon.
   final BitmapDescriptor icon;
 
-  /// The icon image point that will be the anchor of the info window when
-  /// displayed.
+  /// A Google Maps InfoWindow.
   ///
-  /// The image point is specified in normalized coordinates: An anchor of
-  /// (0.0, 0.0) means the top left corner of the image. An anchor
-  /// of (1.0, 1.0) means the bottom right corner of the image.
-  final Offset infoWindowAnchor;
-
-  /// Text content for the info window.
-  final InfoWindowText infoWindowText;
+  /// The window is displayed when the marker is tapped.
+  final InfoWindow infoWindow;
 
   /// Geographical location of the marker.
   final LatLng position;
@@ -136,61 +213,43 @@ class MarkerOptions {
   /// earlier, and thus appearing to be closer to the surface of the Earth.
   final double zIndex;
 
-  /// Default marker options.
-  ///
-  /// Specifies a marker that
-  /// * is fully opaque; [alpha] is 1.0
-  /// * uses icon bottom center to indicate map position; [anchor] is (0.5, 1.0)
-  /// * has default tap handling; [consumeTapEvents] is false
-  /// * is stationary; [draggable] is false
-  /// * is drawn against the screen, not the map; [flat] is false
-  /// * has a default icon; [icon] is `BitmapDescriptor.defaultMarker`
-  /// * anchors the info window at top center; [infoWindowAnchor] is (0.5, 0.0)
-  /// * has no info window text; [infoWindowText] is `InfoWindowText.noText`
-  /// * is positioned at 0, 0; [position] is `LatLng(0.0, 0.0)`
-  /// * has an axis-aligned icon; [rotation] is 0.0
-  /// * is visible; [visible] is true
-  /// * is placed at the base of the drawing order; [zIndex] is 0.0
-  static const MarkerOptions defaultOptions = MarkerOptions(
-    alpha: 1.0,
-    anchor: Offset(0.5, 1.0),
-    consumeTapEvents: false,
-    draggable: false,
-    flat: false,
-    icon: BitmapDescriptor.defaultMarker,
-    infoWindowAnchor: Offset(0.5, 0.0),
-    infoWindowText: InfoWindowText.noText,
-    position: LatLng(0.0, 0.0),
-    rotation: 0.0,
-    visible: true,
-    zIndex: 0.0,
-  );
-
-  /// Creates a new options object whose values are the same as this instance,
-  /// unless overwritten by the specified [changes].
-  ///
-  /// Returns this instance, if [changes] is null.
-  MarkerOptions copyWith(MarkerOptions changes) {
-    if (changes == null) {
-      return this;
-    }
-    return MarkerOptions(
-      alpha: changes.alpha ?? alpha,
-      anchor: changes.anchor ?? anchor,
-      consumeTapEvents: changes.consumeTapEvents ?? consumeTapEvents,
-      draggable: changes.draggable ?? draggable,
-      flat: changes.flat ?? flat,
-      icon: changes.icon ?? icon,
-      infoWindowAnchor: changes.infoWindowAnchor ?? infoWindowAnchor,
-      infoWindowText: changes.infoWindowText ?? infoWindowText,
-      position: changes.position ?? position,
-      rotation: changes.rotation ?? rotation,
-      visible: changes.visible ?? visible,
-      zIndex: changes.zIndex ?? zIndex,
+  /// Callbacks to receive tap events for markers placed on this map.
+  final VoidCallback onTap;
+
+  /// Creates a new [Marker] object whose values are the same as this instance,
+  /// unless overwritten by the specified parameters.
+  Marker copyWith({
+    double alphaParam,
+    Offset anchorParam,
+    bool consumeTapEventsParam,
+    bool draggableParam,
+    bool flatParam,
+    BitmapDescriptor iconParam,
+    InfoWindow infoWindowParam,
+    LatLng positionParam,
+    double rotationParam,
+    bool visibleParam,
+    double zIndexParam,
+    VoidCallback onTapParam,
+  }) {
+    return Marker(
+      markerId: markerId,
+      alpha: alphaParam ?? alpha,
+      anchor: anchorParam ?? anchor,
+      consumeTapEvents: consumeTapEventsParam ?? consumeTapEvents,
+      draggable: draggableParam ?? draggable,
+      flat: flatParam ?? flat,
+      icon: iconParam ?? icon,
+      infoWindow: infoWindowParam ?? infoWindow,
+      position: positionParam ?? position,
+      rotation: rotationParam ?? rotation,
+      visible: visibleParam ?? visible,
+      zIndex: zIndexParam ?? zIndex,
+      onTap: onTapParam ?? onTap,
     );
   }
 
-  dynamic _toJson() {
+  Map<String, dynamic> _toJson() {
     final Map<String, dynamic> json = <String, dynamic>{};
 
     void addIfPresent(String fieldName, dynamic value) {
@@ -199,18 +258,52 @@ class MarkerOptions {
       }
     }
 
+    addIfPresent('markerId', markerId.value);
     addIfPresent('alpha', alpha);
     addIfPresent('anchor', _offsetToJson(anchor));
     addIfPresent('consumeTapEvents', consumeTapEvents);
     addIfPresent('draggable', draggable);
     addIfPresent('flat', flat);
     addIfPresent('icon', icon?._toJson());
-    addIfPresent('infoWindowAnchor', _offsetToJson(infoWindowAnchor));
-    addIfPresent('infoWindowText', infoWindowText?._toJson());
+    addIfPresent('infoWindow', infoWindow?._toJson());
     addIfPresent('position', position?._toJson());
     addIfPresent('rotation', rotation);
     addIfPresent('visible', visible);
     addIfPresent('zIndex', zIndex);
     return json;
   }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final Marker typedOther = other;
+    return markerId == typedOther.markerId;
+  }
+
+  @override
+  int get hashCode => markerId.hashCode;
+
+  @override
+  String toString() {
+    return 'Marker{markerId: $markerId, alpha: $alpha, anchor: $anchor, '
+        'consumeTapEvents: $consumeTapEvents, draggable: $draggable, flat: $flat, '
+        'icon: $icon, infoWindow: $infoWindow, position: $position, rotation: $rotation, '
+        'visible: $visible, zIndex: $zIndex, onTap: $onTap}';
+  }
+}
+
+Map<MarkerId, Marker> _keyByMarkerId(Iterable<Marker> markers) {
+  if (markers == null) {
+    return <MarkerId, Marker>{};
+  }
+  return Map<MarkerId, Marker>.fromEntries(markers.map(
+      (Marker marker) => MapEntry<MarkerId, Marker>(marker.markerId, marker)));
+}
+
+List<Map<String, dynamic>> _serializeMarkerSet(Set<Marker> markers) {
+  if (markers == null) {
+    return null;
+  }
+  return markers.map<Map<String, dynamic>>((Marker m) => m._toJson()).toList();
 }
diff --git a/packages/google_maps_flutter/lib/src/marker_updates.dart b/packages/google_maps_flutter/lib/src/marker_updates.dart
new file mode 100644
index 000000000000..6c73b5e6a12d
--- /dev/null
+++ b/packages/google_maps_flutter/lib/src/marker_updates.dart
@@ -0,0 +1,90 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of google_maps_flutter;
+
+/// [Marker] update events to be applied to the [GoogleMap].
+///
+/// Used in [GoogleMapController] when the map is updated.
+class _MarkerUpdates {
+  /// Computes [_MarkerUpdates] given previous and current [Marker]s.
+  _MarkerUpdates.from(Set<Marker> previous, Set<Marker> current) {
+    if (previous == null) {
+      previous = Set<Marker>.identity();
+    }
+
+    if (current == null) {
+      current = Set<Marker>.identity();
+    }
+
+    final Map<MarkerId, Marker> previousMarkers = _keyByMarkerId(previous);
+    final Map<MarkerId, Marker> currentMarkers = _keyByMarkerId(current);
+
+    final Set<MarkerId> prevMarkerIds = previousMarkers.keys.toSet();
+    final Set<MarkerId> currentMarkerIds = currentMarkers.keys.toSet();
+
+    Marker idToCurrentMarker(MarkerId id) {
+      return currentMarkers[id];
+    }
+
+    final Set<MarkerId> _markerIdsToRemove =
+        prevMarkerIds.difference(currentMarkerIds);
+
+    final Set<Marker> _markersToAdd = currentMarkerIds
+        .difference(prevMarkerIds)
+        .map(idToCurrentMarker)
+        .toSet();
+
+    final Set<Marker> _markersToChange = currentMarkerIds
+        .intersection(prevMarkerIds)
+        .map(idToCurrentMarker)
+        .toSet();
+
+    markersToAdd = _markersToAdd;
+    markerIdsToRemove = _markerIdsToRemove;
+    markersToChange = _markersToChange;
+  }
+
+  Set<Marker> markersToAdd;
+  Set<MarkerId> markerIdsToRemove;
+  Set<Marker> markersToChange;
+
+  Map<String, dynamic> _toMap() {
+    final Map<String, dynamic> updateMap = <String, dynamic>{};
+
+    void addIfNonNull(String fieldName, dynamic value) {
+      if (value != null) {
+        updateMap[fieldName] = value;
+      }
+    }
+
+    addIfNonNull('markersToAdd', _serializeMarkerSet(markersToAdd));
+    addIfNonNull('markersToChange', _serializeMarkerSet(markersToChange));
+    addIfNonNull('markerIdsToRemove',
+        markerIdsToRemove.map<dynamic>((MarkerId m) => m.value).toList());
+
+    return updateMap;
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final _MarkerUpdates typedOther = other;
+    return setEquals(markersToAdd, typedOther.markersToAdd) &&
+        setEquals(markerIdsToRemove, typedOther.markerIdsToRemove) &&
+        setEquals(markersToChange, typedOther.markersToChange);
+  }
+
+  @override
+  int get hashCode =>
+      hashValues(markersToAdd, markerIdsToRemove, markersToChange);
+
+  @override
+  String toString() {
+    return '_MarkerUpdates{markersToAdd: $markersToAdd, '
+        'markerIdsToRemove: $markerIdsToRemove, '
+        'markersToChange: $markersToChange}';
+  }
+}
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index f6b502346b37..d7ee75939a20 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.2.0+6
+version: 0.3.0
 
 dependencies:
   flutter:
diff --git a/packages/google_maps_flutter/test/fake_maps_controllers.dart b/packages/google_maps_flutter/test/fake_maps_controllers.dart
new file mode 100644
index 000000000000..fb7308c01e82
--- /dev/null
+++ b/packages/google_maps_flutter/test/fake_maps_controllers.dart
@@ -0,0 +1,191 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+
+class FakePlatformGoogleMap {
+  FakePlatformGoogleMap(int id, Map<dynamic, dynamic> params) {
+    cameraPosition = CameraPosition.fromMap(params['initialCameraPosition']);
+    channel = MethodChannel(
+        'plugins.flutter.io/google_maps_$id', const StandardMethodCodec());
+    channel.setMockMethodCallHandler(onMethodCall);
+    updateOptions(params['options']);
+    updateMarkers(params);
+  }
+
+  MethodChannel channel;
+
+  CameraPosition cameraPosition;
+
+  bool compassEnabled;
+
+  CameraTargetBounds cameraTargetBounds;
+
+  MapType mapType;
+
+  MinMaxZoomPreference minMaxZoomPreference;
+
+  bool rotateGesturesEnabled;
+
+  bool scrollGesturesEnabled;
+
+  bool tiltGesturesEnabled;
+
+  bool zoomGesturesEnabled;
+
+  bool trackCameraPosition;
+
+  bool myLocationEnabled;
+
+  Set<MarkerId> markerIdsToRemove;
+
+  Set<Marker> markersToAdd;
+
+  Set<Marker> markersToChange;
+
+  Future<dynamic> onMethodCall(MethodCall call) {
+    switch (call.method) {
+      case 'map#update':
+        updateOptions(call.arguments['options']);
+        return Future<void>.sync(() {});
+      case 'markers#update':
+        updateMarkers(call.arguments);
+        return Future<void>.sync(() {});
+      default:
+        return Future<void>.sync(() {});
+    }
+  }
+
+  void updateMarkers(Map<dynamic, dynamic> markerUpdates) {
+    if (markerUpdates == null) {
+      return;
+    }
+    markersToAdd = _deserializeMarkers(markerUpdates['markersToAdd']);
+    markerIdsToRemove =
+        _deserializeMarkerIds(markerUpdates['markerIdsToRemove']);
+    markersToChange = _deserializeMarkers(markerUpdates['markersToChange']);
+  }
+
+  Set<MarkerId> _deserializeMarkerIds(List<dynamic> markerIds) {
+    if (markerIds == null) {
+      // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+      // https://github.com/flutter/flutter/issues/28312
+      // ignore: prefer_collection_literals
+      return Set<MarkerId>();
+    }
+    return markerIds.map((dynamic markerId) => MarkerId(markerId)).toSet();
+  }
+
+  Set<Marker> _deserializeMarkers(dynamic markers) {
+    if (markers == null) {
+      // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+      // https://github.com/flutter/flutter/issues/28312
+      // ignore: prefer_collection_literals
+      return Set<Marker>();
+    }
+    final List<dynamic> markersData = markers;
+    // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+    // https://github.com/flutter/flutter/issues/28312
+    // ignore: prefer_collection_literals
+    final Set<Marker> result = Set<Marker>();
+    for (Map<dynamic, dynamic> markerData in markersData) {
+      final String markerId = markerData['markerId'];
+      final bool draggable = markerData['draggable'];
+      final bool visible = markerData['visible'];
+
+      final dynamic infoWindowData = markerData['infoWindow'];
+      InfoWindow infoWindow = InfoWindow.noText;
+      if (infoWindowData != null) {
+        final Map<dynamic, dynamic> infoWindowMap = infoWindowData;
+        infoWindow = InfoWindow(
+          title: infoWindowMap['title'],
+          snippet: infoWindowMap['snippet'],
+        );
+      }
+
+      result.add(Marker(
+        markerId: MarkerId(markerId),
+        draggable: draggable,
+        visible: visible,
+        infoWindow: infoWindow,
+      ));
+    }
+
+    return result;
+  }
+
+  void updateOptions(Map<dynamic, dynamic> options) {
+    if (options.containsKey('compassEnabled')) {
+      compassEnabled = options['compassEnabled'];
+    }
+    if (options.containsKey('cameraTargetBounds')) {
+      final List<dynamic> boundsList = options['cameraTargetBounds'];
+      cameraTargetBounds = boundsList[0] == null
+          ? CameraTargetBounds.unbounded
+          : CameraTargetBounds(LatLngBounds.fromList(boundsList[0]));
+    }
+    if (options.containsKey('mapType')) {
+      mapType = MapType.values[options['mapType']];
+    }
+    if (options.containsKey('minMaxZoomPreference')) {
+      final List<dynamic> minMaxZoomList = options['minMaxZoomPreference'];
+      minMaxZoomPreference =
+          MinMaxZoomPreference(minMaxZoomList[0], minMaxZoomList[1]);
+    }
+    if (options.containsKey('rotateGesturesEnabled')) {
+      rotateGesturesEnabled = options['rotateGesturesEnabled'];
+    }
+    if (options.containsKey('scrollGesturesEnabled')) {
+      scrollGesturesEnabled = options['scrollGesturesEnabled'];
+    }
+    if (options.containsKey('tiltGesturesEnabled')) {
+      tiltGesturesEnabled = options['tiltGesturesEnabled'];
+    }
+    if (options.containsKey('trackCameraPosition')) {
+      trackCameraPosition = options['trackCameraPosition'];
+    }
+    if (options.containsKey('zoomGesturesEnabled')) {
+      zoomGesturesEnabled = options['zoomGesturesEnabled'];
+    }
+    if (options.containsKey('myLocationEnabled')) {
+      myLocationEnabled = options['myLocationEnabled'];
+    }
+  }
+}
+
+class FakePlatformViewsController {
+  FakePlatformGoogleMap lastCreatedView;
+
+  Future<dynamic> fakePlatformViewsMethodHandler(MethodCall call) {
+    switch (call.method) {
+      case 'create':
+        final Map<dynamic, dynamic> args = call.arguments;
+        final Map<dynamic, dynamic> params = _decodeParams(args['params']);
+        lastCreatedView = FakePlatformGoogleMap(
+          args['id'],
+          params,
+        );
+        return Future<int>.sync(() => 1);
+      default:
+        return Future<void>.sync(() {});
+    }
+  }
+
+  void reset() {
+    lastCreatedView = null;
+  }
+}
+
+Map<dynamic, dynamic> _decodeParams(Uint8List paramsMessage) {
+  final ByteBuffer buffer = paramsMessage.buffer;
+  final ByteData messageBytes = buffer.asByteData(
+    paramsMessage.offsetInBytes,
+    paramsMessage.lengthInBytes,
+  );
+  return const StandardMessageCodec().decodeMessage(messageBytes);
+}
diff --git a/packages/google_maps_flutter/test/google_map_test.dart b/packages/google_maps_flutter/test/google_map_test.dart
index 2f20a37a1610..50c36744f607 100644
--- a/packages/google_maps_flutter/test/google_map_test.dart
+++ b/packages/google_maps_flutter/test/google_map_test.dart
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:typed_data';
-
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 
+import 'fake_maps_controllers.dart';
+
 void main() {
-  final _FakePlatformViewsController fakePlatformViewsController =
-      _FakePlatformViewsController();
+  final FakePlatformViewsController fakePlatformViewsController =
+      FakePlatformViewsController();
 
   setUpAll(() {
     SystemChannels.platform_views.setMockMethodCallHandler(
@@ -384,116 +384,3 @@ void main() {
     expect(platformGoogleMap.myLocationEnabled, true);
   });
 }
-
-class FakePlatformGoogleMap {
-  FakePlatformGoogleMap(int id, Map<dynamic, dynamic> params) {
-    cameraPosition = CameraPosition.fromMap(params['initialCameraPosition']);
-    channel = MethodChannel(
-        'plugins.flutter.io/google_maps_$id', const StandardMethodCodec());
-    channel.setMockMethodCallHandler(onMethodCall);
-    updateOptions(params['options']);
-  }
-
-  MethodChannel channel;
-
-  CameraPosition cameraPosition;
-
-  bool compassEnabled;
-
-  CameraTargetBounds cameraTargetBounds;
-
-  MapType mapType;
-
-  MinMaxZoomPreference minMaxZoomPreference;
-
-  bool rotateGesturesEnabled;
-
-  bool scrollGesturesEnabled;
-
-  bool tiltGesturesEnabled;
-
-  bool zoomGesturesEnabled;
-
-  bool trackCameraPosition;
-
-  bool myLocationEnabled;
-
-  Future<dynamic> onMethodCall(MethodCall call) {
-    switch (call.method) {
-      case 'map#update':
-        updateOptions(call.arguments['options']);
-        return Future<void>.sync(() {});
-    }
-    return Future<void>.sync(() {});
-  }
-
-  void updateOptions(Map<dynamic, dynamic> options) {
-    if (options.containsKey('compassEnabled')) {
-      compassEnabled = options['compassEnabled'];
-    }
-    if (options.containsKey('cameraTargetBounds')) {
-      final List<dynamic> boundsList = options['cameraTargetBounds'];
-      cameraTargetBounds = boundsList[0] == null
-          ? CameraTargetBounds.unbounded
-          : CameraTargetBounds(LatLngBounds.fromList(boundsList[0]));
-    }
-    if (options.containsKey('mapType')) {
-      mapType = MapType.values[options['mapType']];
-    }
-    if (options.containsKey('minMaxZoomPreference')) {
-      final List<dynamic> minMaxZoomList = options['minMaxZoomPreference'];
-      minMaxZoomPreference =
-          MinMaxZoomPreference(minMaxZoomList[0], minMaxZoomList[1]);
-    }
-    if (options.containsKey('rotateGesturesEnabled')) {
-      rotateGesturesEnabled = options['rotateGesturesEnabled'];
-    }
-    if (options.containsKey('scrollGesturesEnabled')) {
-      scrollGesturesEnabled = options['scrollGesturesEnabled'];
-    }
-    if (options.containsKey('tiltGesturesEnabled')) {
-      tiltGesturesEnabled = options['tiltGesturesEnabled'];
-    }
-    if (options.containsKey('trackCameraPosition')) {
-      trackCameraPosition = options['trackCameraPosition'];
-    }
-    if (options.containsKey('zoomGesturesEnabled')) {
-      zoomGesturesEnabled = options['zoomGesturesEnabled'];
-    }
-    if (options.containsKey('myLocationEnabled')) {
-      myLocationEnabled = options['myLocationEnabled'];
-    }
-  }
-}
-
-class _FakePlatformViewsController {
-  FakePlatformGoogleMap lastCreatedView;
-
-  Future<dynamic> fakePlatformViewsMethodHandler(MethodCall call) {
-    switch (call.method) {
-      case 'create':
-        final Map<dynamic, dynamic> args = call.arguments;
-        final Map<dynamic, dynamic> params = _decodeParams(args['params']);
-        lastCreatedView = FakePlatformGoogleMap(
-          args['id'],
-          params,
-        );
-        return Future<int>.sync(() => 1);
-      default:
-        return Future<void>.sync(() {});
-    }
-  }
-
-  void reset() {
-    lastCreatedView = null;
-  }
-}
-
-Map<dynamic, dynamic> _decodeParams(Uint8List paramsMessage) {
-  final ByteBuffer buffer = paramsMessage.buffer;
-  final ByteData messageBytes = buffer.asByteData(
-    paramsMessage.offsetInBytes,
-    paramsMessage.lengthInBytes,
-  );
-  return const StandardMessageCodec().decodeMessage(messageBytes);
-}
diff --git a/packages/google_maps_flutter/test/marker_updates_test.dart b/packages/google_maps_flutter/test/marker_updates_test.dart
new file mode 100644
index 000000000000..e9c099082607
--- /dev/null
+++ b/packages/google_maps_flutter/test/marker_updates_test.dart
@@ -0,0 +1,175 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+
+import 'fake_maps_controllers.dart';
+
+Set<Marker> _toSet({Marker m1, Marker m2, Marker m3}) {
+  final Set<Marker> res = Set<Marker>.identity();
+  if (m1 != null) {
+    res.add(m1);
+  }
+  if (m2 != null) {
+    res.add(m2);
+  }
+  if (m3 != null) {
+    res.add(m3);
+  }
+  return res;
+}
+
+Widget _mapWithMarkers(Set<Marker> markers) {
+  return Directionality(
+    textDirection: TextDirection.ltr,
+    child: GoogleMap(
+      initialCameraPosition: const CameraPosition(target: LatLng(10.0, 15.0)),
+      markers: markers,
+    ),
+  );
+}
+
+void main() {
+  final FakePlatformViewsController fakePlatformViewsController =
+      FakePlatformViewsController();
+
+  setUpAll(() {
+    SystemChannels.platform_views.setMockMethodCallHandler(
+        fakePlatformViewsController.fakePlatformViewsMethodHandler);
+  });
+
+  setUp(() {
+    fakePlatformViewsController.reset();
+  });
+
+  testWidgets('Initializing a marker', (WidgetTester tester) async {
+    final Marker m1 = Marker(markerId: MarkerId("marker_1"));
+    await tester.pumpWidget(_mapWithMarkers(_toSet(m1: m1)));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.markersToAdd.length, 1);
+
+    final Marker initializedMarker = platformGoogleMap.markersToAdd.first;
+    expect(initializedMarker, equals(m1));
+    expect(platformGoogleMap.markerIdsToRemove.isEmpty, true);
+    expect(platformGoogleMap.markersToChange.isEmpty, true);
+  });
+
+  testWidgets("Adding a marker", (WidgetTester tester) async {
+    final Marker m1 = Marker(markerId: MarkerId("marker_1"));
+    final Marker m2 = Marker(markerId: MarkerId("marker_2"));
+
+    await tester.pumpWidget(_mapWithMarkers(_toSet(m1: m1)));
+    await tester.pumpWidget(_mapWithMarkers(_toSet(m1: m1, m2: m2)));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.markersToAdd.length, 1);
+
+    final Marker addedMarker = platformGoogleMap.markersToAdd.first;
+    expect(addedMarker, equals(m2));
+    expect(platformGoogleMap.markerIdsToRemove.isEmpty, true);
+
+    expect(platformGoogleMap.markersToChange.length, 1);
+    expect(platformGoogleMap.markersToChange.first, equals(m1));
+  });
+
+  testWidgets("Removing a marker", (WidgetTester tester) async {
+    final Marker m1 = Marker(markerId: MarkerId("marker_1"));
+
+    await tester.pumpWidget(_mapWithMarkers(_toSet(m1: m1)));
+    await tester.pumpWidget(_mapWithMarkers(null));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.markerIdsToRemove.length, 1);
+    expect(platformGoogleMap.markerIdsToRemove.first, equals(m1.markerId));
+
+    expect(platformGoogleMap.markersToChange.isEmpty, true);
+    expect(platformGoogleMap.markersToAdd.isEmpty, true);
+  });
+
+  testWidgets("Updating a marker", (WidgetTester tester) async {
+    final Marker m1 = Marker(markerId: MarkerId("marker_1"));
+    final Marker m2 = Marker(markerId: MarkerId("marker_1"), alpha: 0.5);
+
+    await tester.pumpWidget(_mapWithMarkers(_toSet(m1: m1)));
+    await tester.pumpWidget(_mapWithMarkers(_toSet(m1: m2)));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.markersToChange.length, 1);
+    expect(platformGoogleMap.markersToChange.first, equals(m2));
+
+    expect(platformGoogleMap.markerIdsToRemove.isEmpty, true);
+    expect(platformGoogleMap.markersToAdd.isEmpty, true);
+  });
+
+  testWidgets("Updating a marker", (WidgetTester tester) async {
+    final Marker m1 = Marker(markerId: MarkerId("marker_1"));
+    final Marker m2 = Marker(
+      markerId: MarkerId("marker_1"),
+      infoWindow: const InfoWindow(snippet: 'changed'),
+    );
+
+    await tester.pumpWidget(_mapWithMarkers(_toSet(m1: m1)));
+    await tester.pumpWidget(_mapWithMarkers(_toSet(m1: m2)));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.markersToChange.length, 1);
+
+    final Marker update = platformGoogleMap.markersToChange.first;
+    expect(update, equals(m2));
+    expect(update.infoWindow.snippet, 'changed');
+  });
+
+  testWidgets("Multi Update", (WidgetTester tester) async {
+    Marker m1 = Marker(markerId: MarkerId("marker_1"));
+    Marker m2 = Marker(markerId: MarkerId("marker_2"));
+    final Set<Marker> prev = _toSet(m1: m1, m2: m2);
+    m1 = Marker(markerId: MarkerId("marker_1"), visible: false);
+    m2 = Marker(markerId: MarkerId("marker_2"), draggable: true);
+    final Set<Marker> cur = _toSet(m1: m1, m2: m2);
+
+    await tester.pumpWidget(_mapWithMarkers(prev));
+    await tester.pumpWidget(_mapWithMarkers(cur));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.markersToChange, cur);
+    expect(platformGoogleMap.markerIdsToRemove.isEmpty, true);
+    expect(platformGoogleMap.markersToAdd.isEmpty, true);
+  });
+
+  testWidgets("Multi Update", (WidgetTester tester) async {
+    Marker m2 = Marker(markerId: MarkerId("marker_2"));
+    final Marker m3 = Marker(markerId: MarkerId("marker_3"));
+    final Set<Marker> prev = _toSet(m2: m2, m3: m3);
+
+    // m1 is added, m2 is updated, m3 is removed.
+    final Marker m1 = Marker(markerId: MarkerId("marker_1"));
+    m2 = Marker(markerId: MarkerId("marker_2"), draggable: true);
+    final Set<Marker> cur = _toSet(m1: m1, m2: m2);
+
+    await tester.pumpWidget(_mapWithMarkers(prev));
+    await tester.pumpWidget(_mapWithMarkers(cur));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.markersToChange.length, 1);
+    expect(platformGoogleMap.markersToAdd.length, 1);
+    expect(platformGoogleMap.markerIdsToRemove.length, 1);
+
+    expect(platformGoogleMap.markersToChange.first, equals(m2));
+    expect(platformGoogleMap.markersToAdd.first, equals(m1));
+    expect(platformGoogleMap.markerIdsToRemove.first, equals(m3.markerId));
+  });
+}

From 38238db5a6678435f193f90335531e8be7285164 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Wed, 27 Feb 2019 10:36:08 -0800
Subject: [PATCH 179/410] Add missing license headers (#1289)

---
 .../java/io/flutter/plugins/googlemaps/MarkersController.java | 4 ++++
 .../flutter/plugins/webviewflutter/FlutterCookieManager.java  | 4 ++++
 .../io/flutter/plugins/webviewflutter/FlutterWebView.java     | 4 ++++
 .../io/flutter/plugins/webviewflutter/JavaScriptChannel.java  | 4 ++++
 .../io/flutter/plugins/webviewflutter/WebViewFactory.java     | 4 ++++
 .../flutter/plugins/webviewflutter/WebViewFlutterPlugin.java  | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java
index 4d0b69f07f2e..43f5fe6ff08f 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugins.googlemaps;
 
 import com.google.android.gms.maps.GoogleMap;
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterCookieManager.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterCookieManager.java
index 5aa28fb7d00c..908f877fb922 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterCookieManager.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterCookieManager.java
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugins.webviewflutter;
 
 import android.os.Build;
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index 1ff869b04c61..44fe31fcf758 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -1,3 +1,7 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugins.webviewflutter;
 
 import android.content.Context;
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java
index 1fba623b3913..e7e76b2fa7f0 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java
@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugins.webviewflutter;
 
 import android.webkit.JavascriptInterface;
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFactory.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFactory.java
index e42246275279..b11e7211bb3f 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFactory.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFactory.java
@@ -1,3 +1,7 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugins.webviewflutter;
 
 import android.content.Context;
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
index 2200695e6814..5caeec0247b8 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
@@ -1,3 +1,7 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugins.webviewflutter;
 
 import io.flutter.plugin.common.PluginRegistry.Registrar;

From a4890042fa05cd9e9249696819ffd986e8f1a1cd Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Wed, 27 Feb 2019 16:08:05 -0800
Subject: [PATCH 180/410] Bugfix/account for nsnull (#1291)

* Account for NSNull

* fix changelog

* Remove and disable api key and initialize at the right time

* update changelog

* Fix update initial markers
---
 packages/google_maps_flutter/CHANGELOG.md     |  5 +++++
 .../googlemaps/GoogleMapController.java       | 12 ++++++++++-
 .../ios/Classes/GoogleMapController.m         | 20 +++++++++++++++----
 packages/google_maps_flutter/pubspec.yaml     |  2 +-
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index aa9b4390e7ca..e328c0999493 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.0+1
+
+* Add NSNull Checks for markers controller in iOS.
+* Also address an issue where initial markers are set before initialization.
+
 ## 0.3.0
 
 * **Breaking change**. Changed the Marker API to be
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index 55e6a45b85dd..e7fba92887d2 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -50,6 +50,7 @@ final class GoogleMapController
         MethodChannel.MethodCallHandler,
         OnMapReadyCallback,
         PlatformView {
+
   private static final String TAG = "GoogleMapController";
   private final int id;
   private final AtomicInteger activityState;
@@ -65,6 +66,7 @@ final class GoogleMapController
   private final int registrarActivityHashCode;
   private final Context context;
   private final MarkersController markersController;
+  private List<Object> initialMarkers;
 
   GoogleMapController(
       int id,
@@ -154,6 +156,7 @@ public void onMapReady(GoogleMap googleMap) {
     googleMap.setOnMarkerClickListener(this);
     updateMyLocationEnabled();
     markersController.setGoogleMap(googleMap);
+    updateInitialMarkers();
   }
 
   @Override
@@ -369,7 +372,14 @@ public void setMyLocationEnabled(boolean myLocationEnabled) {
 
   @Override
   public void setInitialMarkers(Object initialMarkers) {
-    markersController.addMarkers((List<Object>) initialMarkers);
+    this.initialMarkers = (List<Object>) initialMarkers;
+    if (googleMap != null) {
+      updateInitialMarkers();
+    }
+  }
+
+  private void updateInitialMarkers() {
+    markersController.addMarkers(initialMarkers);
   }
 
   @SuppressLint("MissingPermission")
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index d062cadd0665..f42e59824063 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -79,7 +79,10 @@ - (instancetype)initWithFrame:(CGRect)frame
     _registrar = registrar;
     _cameraDidInitialSetup = NO;
     _markersController = [[FLTMarkersController alloc] init:_channel mapView:_mapView];
-    [_markersController addMarkers:args[@"markersToAdd"]];
+    id markersToAdd = args[@"markersToAdd"];
+    if ([markersToAdd isKindOfClass:[NSArray class]]) {
+      [_markersController addMarkers:markersToAdd];
+    }
   }
   return self;
 }
@@ -107,9 +110,18 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   } else if ([call.method isEqualToString:@"map#waitForMap"]) {
     result(nil);
   } else if ([call.method isEqualToString:@"markers#update"]) {
-    [_markersController addMarkers:call.arguments[@"markersToAdd"]];
-    [_markersController changeMarkers:call.arguments[@"markersToChange"]];
-    [_markersController removeMarkerIds:call.arguments[@"markerIdsToRemove"]];
+    id markersToAdd = call.arguments[@"markersToAdd"];
+    if ([markersToAdd isKindOfClass:[NSArray class]]) {
+      [_markersController addMarkers:markersToAdd];
+    }
+    id markersToChange = call.arguments[@"markersToChange"];
+    if ([markersToChange isKindOfClass:[NSArray class]]) {
+      [_markersController changeMarkers:markersToChange];
+    }
+    id markerIdsToRemove = call.arguments[@"markerIdsToRemove"];
+    if ([markerIdsToRemove isKindOfClass:[NSArray class]]) {
+      [_markersController removeMarkerIds:markerIdsToRemove];
+    }
     result(nil);
   } else {
     result(FlutterMethodNotImplemented);
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index d7ee75939a20..d34e161e42ed 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.3.0
+version: 0.3.0+1
 
 dependencies:
   flutter:

From ac84635b16679597f9bdb3b274d79c83b23e4f30 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Thu, 28 Feb 2019 09:21:03 -0800
Subject: [PATCH 181/410] Fix icon issue on ios and manifest on android (#1294)

---
 packages/google_maps_flutter/CHANGELOG.md                    | 5 +++++
 .../example/android/app/src/main/AndroidManifest.xml         | 3 ++-
 .../google_maps_flutter/ios/Classes/GoogleMapController.m    | 4 +++-
 .../ios/Classes/GoogleMapMarkerController.h                  | 4 +++-
 .../ios/Classes/GoogleMapMarkerController.m                  | 5 ++++-
 packages/google_maps_flutter/pubspec.yaml                    | 2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index e328c0999493..c2516daabf66 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.0+2
+
+* Address an issue on iOS where icons were not loading.
+* Add apache http library required false for Android.
+
 ## 0.3.0+1
 
 * Add NSNull Checks for markers controller in iOS.
diff --git a/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
index 01a15d7dc18f..2a56a5f87f3d 100644
--- a/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
         android:name="io.flutter.app.FlutterApplication"
         android:label="google_maps_flutter_example"
         android:icon="@mipmap/ic_launcher">
-        <meta-data
+      <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+      <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
         <meta-data
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index f42e59824063..1783bded7f6d 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -78,7 +78,9 @@ - (instancetype)initWithFrame:(CGRect)frame
     _mapView.delegate = weakSelf;
     _registrar = registrar;
     _cameraDidInitialSetup = NO;
-    _markersController = [[FLTMarkersController alloc] init:_channel mapView:_mapView];
+    _markersController = [[FLTMarkersController alloc] init:_channel
+                                                    mapView:_mapView
+                                                  registrar:registrar];
     id markersToAdd = args[@"markersToAdd"];
     if ([markersToAdd isKindOfClass:[NSArray class]]) {
       [_markersController addMarkers:markersToAdd];
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h
index ddc194f66c41..898eddeb0792 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h
@@ -33,7 +33,9 @@
 @end
 
 @interface FLTMarkersController : NSObject
-- (instancetype)init:(FlutterMethodChannel*)methodChannel mapView:(GMSMapView*)mapView;
+- (instancetype)init:(FlutterMethodChannel*)methodChannel
+             mapView:(GMSMapView*)mapView
+           registrar:(NSObject<FlutterPluginRegistrar>*)registrar;
 - (void)addMarkers:(NSArray*)markersToAdd;
 - (void)changeMarkers:(NSArray*)markersToChange;
 - (void)removeMarkerIds:(NSArray*)markerIdsToRemove;
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
index 404352f4cf73..42c23b36ff9a 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
@@ -174,12 +174,15 @@ @implementation FLTMarkersController {
   NSObject<FlutterPluginRegistrar>* _registrar;
   GMSMapView* _mapView;
 }
-- (instancetype)init:(FlutterMethodChannel*)methodChannel mapView:(GMSMapView*)mapView {
+- (instancetype)init:(FlutterMethodChannel*)methodChannel
+             mapView:(GMSMapView*)mapView
+           registrar:(NSObject<FlutterPluginRegistrar>*)registrar {
   self = [super init];
   if (self) {
     _methodChannel = methodChannel;
     _mapView = mapView;
     _markerIdToController = [NSMutableDictionary dictionaryWithCapacity:1];
+    _registrar = registrar;
   }
   return self;
 }
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index d34e161e42ed..4a9ae46cf59e 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.3.0+1
+version: 0.3.0+2
 
 dependencies:
   flutter:

From 29bc80df6451cef4577d204f16e90bf636d75926 Mon Sep 17 00:00:00 2001
From: Sam Toon <46489811+sam-toon@users.noreply.github.com>
Date: Thu, 28 Feb 2019 17:22:58 +0000
Subject: [PATCH 182/410] The FloatingActionButton requires an icon (#1293)

---
 packages/google_maps_flutter/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/google_maps_flutter/README.md b/packages/google_maps_flutter/README.md
index dc37bd8bca0a..b4a84650e64e 100644
--- a/packages/google_maps_flutter/README.md
+++ b/packages/google_maps_flutter/README.md
@@ -139,6 +139,7 @@ class MapSampleState extends State<MapSample> {
       floatingActionButton: FloatingActionButton.extended(
         onPressed: _goToTheLake,
         label: Text('To the lake!'),
+        icon: Icon(Icons.directions_boat),
       ),
     );
   }

From 9f3997bf3479a81a86bc2ea77431d89f3b3429c2 Mon Sep 17 00:00:00 2001
From: Andrei Diaconu <andreidiaconu@users.noreply.github.com>
Date: Thu, 28 Feb 2019 20:36:09 +0200
Subject: [PATCH 183/410] [image_picker] Fixed losing transparency of PNGs
 (#742)

When the user picks a png that has transparent pixels, these are then lost (made black). This was caused by always saving the image as JPEG when resizing.

Determine if a file needs to be saved as PNG by looking at the alpha channel.
---
 .../flutter/plugins/imagepicker/ImageResizer.java  |  4 +++-
 .../image_picker/ios/Classes/ImagePickerPlugin.m   | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImageResizer.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImageResizer.java
index 25feba7611d1..f9bd3adb2e36 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImageResizer.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImageResizer.java
@@ -85,7 +85,9 @@ private File resizedImage(String path, Double maxWidth, Double maxHeight) throws
 
     Bitmap scaledBmp = Bitmap.createScaledBitmap(bmp, width.intValue(), height.intValue(), false);
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    scaledBmp.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
+    boolean saveAsPNG = bmp.hasAlpha();
+    scaledBmp.compress(
+        saveAsPNG ? Bitmap.CompressFormat.PNG : Bitmap.CompressFormat.JPEG, 100, outputStream);
 
     String[] pathParts = path.split("/");
     String imageName = pathParts[pathParts.length - 1];
diff --git a/packages/image_picker/ios/Classes/ImagePickerPlugin.m b/packages/image_picker/ios/Classes/ImagePickerPlugin.m
index ea7ee2cf1ee0..0bff07aed34e 100644
--- a/packages/image_picker/ios/Classes/ImagePickerPlugin.m
+++ b/packages/image_picker/ios/Classes/ImagePickerPlugin.m
@@ -162,9 +162,12 @@ - (void)imagePickerController:(UIImagePickerController *)picker
       image = [self scaledImage:image maxWidth:maxWidth maxHeight:maxHeight];
     }
 
-    NSData *data = UIImageJPEGRepresentation(image, 1.0);
+    BOOL saveAsPNG = [self hasAlpha:image];
+    NSData *data =
+        saveAsPNG ? UIImagePNGRepresentation(image) : UIImageJPEGRepresentation(image, 1.0);
+    NSString *fileExtension = saveAsPNG ? @"image_picker_%@.png" : @"image_picker_%@.jpg";
     NSString *guid = [[NSProcessInfo processInfo] globallyUniqueString];
-    NSString *tmpFile = [NSString stringWithFormat:@"image_picker_%@.jpg", guid];
+    NSString *tmpFile = [NSString stringWithFormat:fileExtension, guid];
     NSString *tmpDirectory = NSTemporaryDirectory();
     NSString *tmpPath = [tmpDirectory stringByAppendingPathComponent:tmpFile];
 
@@ -254,4 +257,11 @@ - (UIImage *)scaledImage:(UIImage *)image
   return scaledImage;
 }
 
+// Returns true if the image has an alpha layer
+- (BOOL)hasAlpha:(UIImage *)image {
+  CGImageAlphaInfo alpha = CGImageGetAlphaInfo(image.CGImage);
+  return (alpha == kCGImageAlphaFirst || alpha == kCGImageAlphaLast ||
+          alpha == kCGImageAlphaPremultipliedFirst || alpha == kCGImageAlphaPremultipliedLast);
+}
+
 @end

From 7b7edd0186a7a008931a503e76fdbb32560a4d1e Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Thu, 28 Feb 2019 12:50:02 -0800
Subject: [PATCH 184/410] Update play-services-maps from 15.+ to 16.1.0 (#1297)

Addresses https://developers.google.com/maps/documentation/android-sdk/config#specify_requirement_for_apache_http_legacy_library
Also removed the need to legacy override in manifest
---
 packages/google_maps_flutter/CHANGELOG.md                     | 4 ++++
 packages/google_maps_flutter/android/build.gradle             | 2 +-
 .../example/android/app/src/main/AndroidManifest.xml          | 1 -
 packages/google_maps_flutter/pubspec.yaml                     | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index c2516daabf66..618af9bf5bc6 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.0+3
+
+* Update Android play-services-maps to 16.1.0
+
 ## 0.3.0+2
 
 * Address an issue on iOS where icons were not loading.
diff --git a/packages/google_maps_flutter/android/build.gradle b/packages/google_maps_flutter/android/build.gradle
index c5abb710ccea..217099b45356 100644
--- a/packages/google_maps_flutter/android/build.gradle
+++ b/packages/google_maps_flutter/android/build.gradle
@@ -46,6 +46,6 @@ android {
     }
 
     dependencies {
-        implementation 'com.google.android.gms:play-services-maps:15.+'
+        implementation 'com.google.android.gms:play-services-maps:16.1.0'
     }
 }
diff --git a/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
index 2a56a5f87f3d..9e8b95998598 100644
--- a/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,6 @@
         android:name="io.flutter.app.FlutterApplication"
         android:label="google_maps_flutter_example"
         android:icon="@mipmap/ic_launcher">
-      <uses-library android:name="org.apache.http.legacy" android:required="false"/>
       <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 4a9ae46cf59e..4aadb3f9c1a6 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.3.0+2
+version: 0.3.0+3
 
 dependencies:
   flutter:

From 3a7a54f7e128db96b6a1c3571c40bfca92bb62b0 Mon Sep 17 00:00:00 2001
From: cvolzke4 <45087979+cvolzke4@users.noreply.github.com>
Date: Fri, 1 Mar 2019 01:01:59 +0400
Subject: [PATCH 185/410] [camera] Add serial dispatch_queue for camera plugin
 to avoid blocking the UI (#1022)

---
 packages/camera/CHANGELOG.md               |  4 +++
 packages/camera/ios/Classes/CameraPlugin.m | 29 ++++++++++++++++++----
 packages/camera/pubspec.yaml               |  2 +-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index c29670baaae0..403793276c66 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.1
+
+* Camera methods are ran in a background thread on iOS.
+
 ## 0.4.0+3
 
 * Fixed a crash when the plugin is registered by a background FlutterView.
diff --git a/packages/camera/ios/Classes/CameraPlugin.m b/packages/camera/ios/Classes/CameraPlugin.m
index 81e0d18df845..1f21e3c77f06 100644
--- a/packages/camera/ios/Classes/CameraPlugin.m
+++ b/packages/camera/ios/Classes/CameraPlugin.m
@@ -143,6 +143,7 @@ @interface FLTCam : NSObject <FlutterTexture,
 @property(nonatomic) CMMotionManager *motionManager;
 - (instancetype)initWithCameraName:(NSString *)cameraName
                   resolutionPreset:(NSString *)resolutionPreset
+                     dispatchQueue:(dispatch_queue_t)dispatchQueue
                              error:(NSError **)error;
 
 - (void)start;
@@ -154,15 +155,19 @@ - (void)stopImageStream;
 - (void)captureToFile:(NSString *)filename result:(FlutterResult)result;
 @end
 
-@implementation FLTCam
+@implementation FLTCam {
+  dispatch_queue_t _dispatchQueue;
+}
 // Format used for video and image streaming.
 FourCharCode const videoFormat = kCVPixelFormatType_32BGRA;
 
 - (instancetype)initWithCameraName:(NSString *)cameraName
                   resolutionPreset:(NSString *)resolutionPreset
+                     dispatchQueue:(dispatch_queue_t)dispatchQueue
                              error:(NSError **)error {
   self = [super init];
   NSAssert(self, @"super init cannot be nil");
+  _dispatchQueue = dispatchQueue;
   _captureSession = [[AVCaptureSession alloc] init];
 
   _captureDevice = [AVCaptureDevice deviceWithUniqueID:cameraName];
@@ -567,9 +572,8 @@ - (BOOL)setupWriterForPath:(NSString *)path {
   _audioWriterInput.expectsMediaDataInRealTime = YES;
   [_videoWriter addInput:_videoWriterInput];
   [_videoWriter addInput:_audioWriterInput];
-  dispatch_queue_t queue = dispatch_queue_create("MyQueue", NULL);
-  [_captureVideoOutput setSampleBufferDelegate:self queue:queue];
-  [_audioOutput setSampleBufferDelegate:self queue:queue];
+  [_captureVideoOutput setSampleBufferDelegate:self queue:_dispatchQueue];
+  [_audioOutput setSampleBufferDelegate:self queue:_dispatchQueue];
 
   return YES;
 }
@@ -609,7 +613,9 @@ @interface CameraPlugin ()
 @property(readonly, nonatomic) FLTCam *camera;
 @end
 
-@implementation CameraPlugin
+@implementation CameraPlugin {
+  dispatch_queue_t _dispatchQueue;
+}
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   FlutterMethodChannel *channel =
       [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/camera"
@@ -629,6 +635,17 @@ - (instancetype)initWithRegistry:(NSObject<FlutterTextureRegistry> *)registry
 }
 
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
+  if (_dispatchQueue == nil) {
+    _dispatchQueue = dispatch_queue_create("io.flutter.camera.dispatchqueue", NULL);
+  }
+
+  // Invoke the plugin on another dispatch queue to avoid blocking the UI.
+  dispatch_async(_dispatchQueue, ^{
+    [self handleMethodCallAsync:call result:result];
+  });
+}
+
+- (void)handleMethodCallAsync:(FlutterMethodCall *)call result:(FlutterResult)result {
   if ([@"availableCameras" isEqualToString:call.method]) {
     AVCaptureDeviceDiscoverySession *discoverySession = [AVCaptureDeviceDiscoverySession
         discoverySessionWithDeviceTypes:@[ AVCaptureDeviceTypeBuiltInWideAngleCamera ]
@@ -662,6 +679,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     NSError *error;
     FLTCam *cam = [[FLTCam alloc] initWithCameraName:cameraName
                                     resolutionPreset:resolutionPreset
+                                       dispatchQueue:_dispatchQueue
                                                error:&error];
     if (error) {
       result(getFlutterError(error));
@@ -705,6 +723,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     } else if ([@"dispose" isEqualToString:call.method]) {
       [_registry unregisterTexture:textureId];
       [_camera close];
+      _dispatchQueue = nil;
       result(nil);
     } else if ([@"startVideoRecording" isEqualToString:call.method]) {
       [_camera startVideoRecordingAtPath:call.arguments[@"filePath"] result:result];
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index dcbff327f044..831ad8601128 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.4.0+3
+version: 0.4.1
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From 10e487b25135f258d28fe6137ae79a64a3417e21 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Thu, 28 Feb 2019 13:18:39 -0800
Subject: [PATCH 186/410] [image_picker] Update pub info for #742 (#1296)

---
 packages/image_picker/CHANGELOG.md | 6 +++++-
 packages/image_picker/pubspec.yaml | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index b7a9538fc714..e0956f2b7163 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,6 +1,10 @@
+## 0.5.0+4
+
+Preserve transparency when saving images.
+
 ## 0.5.0+3
 
-* Fixed am Android crash when Image Picker is registered without an activity.
+* Fixed an Android crash when Image Picker is registered without an activity.
 
 ## 0.5.0+2
 
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 226c9f1d5ae7..7a6ac9da6b21 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.0+3
+version: 0.5.0+4
 
 flutter:
   plugin:

From a533148d3d4cd9880d1dbd19d5d2b0780b02cfc1 Mon Sep 17 00:00:00 2001
From: Chris Yang <cyang8954@gmail.com>
Date: Thu, 28 Feb 2019 15:27:48 -0800
Subject: [PATCH 187/410] [in_app_purchase] payment queue dart ios (#1249)

Dart side for add payment in StoreKit.
Fixed some bug in the Objective-C code.
Removed add payment with only product identifier in Objective-C since it seems unnecessary.
Part of flutter/flutter#26328
---
 .../InAppPurchasePluginTest.m                 |  28 +--
 .../ios/in_app_purchase_pluginTests/Stubs.m   |   4 +
 .../ios/Classes/FIAPaymentQueueHandler.m      |   5 +-
 .../ios/Classes/InAppPurchasePlugin.m         | 131 ++++--------
 packages/in_app_purchase/lib/src/channel.dart |   3 +
 .../sk_payment_queue_wrapper.dart             | 199 +++++++++++++++++-
 .../sk_payment_queue_wrapper.g.dart           |  42 ++--
 .../sk_payment_queue_wrapper_test.dart        |  65 +++---
 8 files changed, 309 insertions(+), 168 deletions(-)

diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
index f49122a6bf9c..020973a7da4d 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
@@ -70,38 +70,15 @@ - (void)testGetProductResponse {
   XCTAssertTrue([resultArray.firstObject[@"productIdentifier"] isEqualToString:@"123"]);
 }
 
-- (void)testCreatePaymentWithProduct {
-  XCTestExpectation* expectation = [self expectationWithDescription:@"must return a payment"];
-  FlutterMethodCall* call = [FlutterMethodCall
-      methodCallWithMethodName:@"-[InAppPurchasePlugin startProductRequest:result:]"
-                     arguments:@[ @"123" ]];
-  FlutterMethodCall* createPaymentCall = [FlutterMethodCall
-      methodCallWithMethodName:@"-[InAppPurchasePlugin createPaymentWithProductID:result:]"
-                     arguments:@"123"];
-  __block NSDictionary* result;
-  __weak typeof(self) weakSelf = self;
-  [self.plugin handleMethodCall:call
-                         result:^(id queryResult) {
-                           [weakSelf.plugin handleMethodCall:createPaymentCall
-                                                      result:^(id _Nullable r) {
-                                                        result = r;
-                                                        [expectation fulfill];
-                                                      }];
-                         }];
-  [self waitForExpectations:@[ expectation ] timeout:5];
-  XCTAssertTrue([result[@"productIdentifier"] isEqualToString:@"123"]);
-}
-
 - (void)testAddPaymentFailure {
   XCTestExpectation* expectation =
       [self expectationWithDescription:@"result should return failed state"];
   FlutterMethodCall* call =
       [FlutterMethodCall methodCallWithMethodName:@"-[InAppPurchasePlugin addPayment:result:]"
                                         arguments:@{
-                                          @"productID" : @"123",
+                                          @"productIdentifier" : @"123",
                                           @"quantity" : @(1),
                                           @"simulatesAskToBuyInSandBox" : @YES,
-                                          @"usePaymentObject" : @YES
                                         }];
   SKPaymentQueueStub* queue = [SKPaymentQueueStub new];
   queue.testState = SKPaymentTransactionStateFailed;
@@ -135,10 +112,9 @@ - (void)testAddPaymentSuccessWithMockQueue {
   FlutterMethodCall* call =
       [FlutterMethodCall methodCallWithMethodName:@"-[InAppPurchasePlugin addPayment:result:]"
                                         arguments:@{
-                                          @"productID" : @"123",
+                                          @"productIdentifier" : @"123",
                                           @"quantity" : @(1),
                                           @"simulatesAskToBuyInSandBox" : @YES,
-                                          @"usePaymentObject" : @YES
                                         }];
   SKPaymentQueueStub* queue = [SKPaymentQueueStub new];
   queue.testState = SKPaymentTransactionStatePurchased;
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
index 9ed773449830..400b7020abdb 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
@@ -130,6 +130,10 @@ - (SKProductRequestStub *)getProductRequestWithIdentifiers:(NSSet *)identifiers
   return [[SKProductRequestStub alloc] initWithProductIdentifiers:identifiers];
 }
 
+- (SKProduct *)getProduct:(NSString *)productID {
+  return [SKProduct new];
+}
+
 @end
 
 @interface SKPaymentQueueStub ()
diff --git a/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m b/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m
index f9a550e1f121..ea76cd15a04f 100644
--- a/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m
+++ b/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m
@@ -39,6 +39,7 @@ - (instancetype)initWithQueue:(nonnull SKPaymentQueue *)queue
     self.shouldAddStorePayment = shouldAddStorePayment;
     self.updatedDownloads = updatedDownloads;
     self.transactionsSetter = [NSMutableDictionary new];
+    [queue addTransactionObserver:self];
   }
   return self;
 }
@@ -57,7 +58,9 @@ - (void)finishTransaction:(SKPaymentTransaction *)transaction {
 - (void)paymentQueue:(SKPaymentQueue *)queue
     updatedTransactions:(NSArray<SKPaymentTransaction *> *)transactions {
   for (SKPaymentTransaction *transaction in transactions) {
-    [self.transactionsSetter setObject:transaction forKey:transaction.transactionIdentifier];
+    if (transaction.transactionIdentifier) {
+      [self.transactionsSetter setObject:transaction forKey:transaction.transactionIdentifier];
+    }
   }
   // notify dart through callbacks.
   self.transactionsUpdated(transactions);
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
index df5bdf1dcaa6..bc0af2214152 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
@@ -17,9 +17,6 @@ @interface InAppPurchasePlugin ()
 // After querying the product, the available products will be saved in the map to be used
 // for purchase.
 @property(copy, nonatomic) NSMutableDictionary *productsCache;
-// Saved payment object used for resume payments;
-@property(copy, nonatomic) NSMutableDictionary *paymentsCache;
-;
 
 // Call back channel to dart used for when a listener function is triggered.
 @property(strong, nonatomic) FlutterMethodChannel *callbackChannel;
@@ -35,27 +32,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   FlutterMethodChannel *channel =
       [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/in_app_purchase"
                                   binaryMessenger:[registrar messenger]];
-  InAppPurchasePlugin *instance = [[InAppPurchasePlugin alloc] init];
+  InAppPurchasePlugin *instance = [[InAppPurchasePlugin alloc] initWithRegistrar:registrar];
   [registrar addMethodCallDelegate:instance channel:channel];
 }
 
-- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
-  if ([@"-[SKPaymentQueue canMakePayments:]" isEqualToString:call.method]) {
-    [self canMakePayments:result];
-  } else if ([@"-[InAppPurchasePlugin startProductRequest:result:]" isEqualToString:call.method]) {
-    [self handleProductRequestMethodCall:call result:result];
-  } else if ([@"-[InAppPurchasePlugin createPaymentWithProductID:result:]"
-                 isEqualToString:call.method]) {
-    [self createPaymentWithProductID:call result:result];
-  } else if ([@"-[InAppPurchasePlugin addPayment:result:]" isEqualToString:call.method]) {
-    [self addPayment:call result:result];
-  } else if ([@"-[InAppPurchasePlugin finishTransaction:result:]" isEqualToString:call.method]) {
-    [self finishTransaction:call result:result];
-  } else {
-    result(FlutterMethodNotImplemented);
-  }
-}
-
 - (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   self = [self init];
   self.registrar = registrar;
@@ -88,6 +68,20 @@ - (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar
   return self;
 }
 
+- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
+  if ([@"-[SKPaymentQueue canMakePayments:]" isEqualToString:call.method]) {
+    [self canMakePayments:result];
+  } else if ([@"-[InAppPurchasePlugin startProductRequest:result:]" isEqualToString:call.method]) {
+    [self handleProductRequestMethodCall:call result:result];
+  } else if ([@"-[InAppPurchasePlugin addPayment:result:]" isEqualToString:call.method]) {
+    [self addPayment:call result:result];
+  } else if ([@"-[InAppPurchasePlugin finishTransaction:result:]" isEqualToString:call.method]) {
+    [self finishTransaction:call result:result];
+  } else {
+    result(FlutterMethodNotImplemented);
+  }
+}
+
 - (void)canMakePayments:(FlutterResult)result {
   result([NSNumber numberWithBool:[SKPaymentQueue canMakePayments]]);
 }
@@ -131,83 +125,36 @@ - (void)handleProductRequestMethodCall:(FlutterMethodCall *)call result:(Flutter
   }];
 }
 
-- (void)createPaymentWithProductID:(FlutterMethodCall *)call result:(FlutterResult)result {
-  if (![call.arguments isKindOfClass:[NSString class]]) {
-    result([FlutterError
-        errorWithCode:@"storekit_invalid_argument"
-              message:@"Argument type of createPaymentWithProductID is not a string."
-              details:call.arguments]);
-    return;
-  }
-  NSString *productID = call.arguments;
-  SKProduct *product = [self.productsCache objectForKey:productID];
-  if (!product) {
-    result([FlutterError
-        errorWithCode:@"storekit_product_not_found"
-              message:@"Cannot find the product. To create a payment of a product, you must query "
-                      @"the product with SKProductRequestMaker.startProductRequest first."
-              details:call.arguments]);
-    return;
-  }
-  SKPayment *payment = [SKPayment paymentWithProduct:product];
-  [self.paymentsCache setObject:payment forKey:productID];
-  result([FIAObjectTranslator getMapFromSKPayment:payment]);
-}
-
 - (void)addPayment:(FlutterMethodCall *)call result:(FlutterResult)result {
   if (![call.arguments isKindOfClass:[NSDictionary class]]) {
     result([FlutterError errorWithCode:@"storekit_invalid_argument"
-                               message:@"Argument type of addPayment is not a map"
+                               message:@"Argument type of addPayment is not a Dictionary"
                                details:call.arguments]);
     return;
   }
   NSDictionary *paymentMap = (NSDictionary *)call.arguments;
-  NSString *productID = [paymentMap objectForKey:@"productID"];
-  SKPayment *payment = [self.paymentsCache objectForKey:productID];
-  // Use the payment object if we find a cached payment object associate with the productID. (Used
-  // for App Store payment flow
-  // https://developer.apple.com/documentation/storekit/skpaymenttransactionobserver/2877502-paymentqueue?language=objc)
-  if (payment) {
-    [self.paymentQueueHandler addPayment:payment];
-    result(nil);
-    return;
-  }
-  // The regular payment flow: when a product is already fetched, we create a payment object with
+  NSString *productID = [paymentMap objectForKey:@"productIdentifier"];
+  // When a product is already fetched, we create a payment object with
   // the product to process the payment.
-  SKProduct *product = [self.productsCache objectForKey:productID];
+  SKProduct *product = [self getProduct:productID];
   if (product) {
-    payment = [SKPayment paymentWithProduct:product];
-    [self.paymentQueueHandler addPayment:payment];
-    result(nil);
-    return;
-  }
-  // User can also use payment object with usePaymentObject = true and add
-  // simulatesAskToBuyInSandBox = true to test the payment flow.
-  if ([paymentMap[@"usePaymentObject"] boolValue] == YES) {
-    SKMutablePayment *mutablePayment = [[SKMutablePayment alloc] init];
-    mutablePayment.productIdentifier = productID;
+    SKMutablePayment *payment = [SKMutablePayment paymentWithProduct:product];
+    payment.applicationUsername = [paymentMap objectForKey:@"applicationUsername"];
     NSNumber *quantity = [paymentMap objectForKey:@"quantity"];
-    mutablePayment.quantity = quantity ? quantity.integerValue : 1;
-    NSString *applicationUsername = [paymentMap objectForKey:@"applicationUsername"];
-    mutablePayment.applicationUsername = applicationUsername;
+    payment.quantity = quantity ? quantity.integerValue : 1;
     if (@available(iOS 8.3, *)) {
-      mutablePayment.simulatesAskToBuyInSandbox =
+      payment.simulatesAskToBuyInSandbox =
           [[paymentMap objectForKey:@"simulatesAskToBuyInSandBox"] boolValue];
     }
-    [self.paymentQueueHandler addPayment:mutablePayment];
+    [self.paymentQueueHandler addPayment:payment];
     result(nil);
     return;
   }
   result([FlutterError
       errorWithCode:@"storekit_invalid_payment_object"
-            message:
-                @"You have requested a payment with an invalid payment object. A valid payment "
-                @"object should be one of the following: 1. Payment object that is automatically "
-                @"handled when the user starts an in-app purchase in the App Store and you "
-                @"returned true to the `shouldAddStorePayment` method or manually requested a "
-                @"payment with the productID that is provided in the `shouldAddStorePayment` "
-                @"method. 2. A payment requested for a product that has been fetched. 3. A custom "
-                @"payment object. This is not an error for a payment failure."
+            message:@"You have requested a payment for an invalid product. Either the "
+                    @"`productIdentifier` of the payment is not valid or the product has not been "
+                    @"fetched before adding the payment to the payment queue."
             details:call.arguments]);
 }
 
@@ -222,9 +169,15 @@ - (void)finishTransaction:(FlutterMethodCall *)call result:(FlutterResult)result
   SKPaymentTransaction *transaction =
       [self.paymentQueueHandler.transactions objectForKey:identifier];
   if (!transaction) {
-    result([FlutterError errorWithCode:@"storekit_platform_invalid_transaction"
-                               message:@"Invalid transaction ID is used."
-                               details:call.arguments]);
+    result([FlutterError
+        errorWithCode:@"storekit_platform_invalid_transaction"
+              message:[NSString
+                          stringWithFormat:@"The transaction with transactionIdentifer:%@ does not "
+                                           @"exist. Note that if the transactionState is "
+                                           @"purchasing, the transactionIdentifier will be "
+                                           @"nil(null).",
+                                           transaction.transactionIdentifier]
+              details:call.arguments]);
     return;
   }
   @try {
@@ -283,7 +236,6 @@ - (BOOL)shouldAddStorePayment:(SKPayment *)payment product:(SKProduct *)product
   // have a interception method that deciding if the payment should be processed (implemented by the
   // programmer).
   [self.productsCache setObject:product forKey:product.productIdentifier];
-  [self.paymentsCache setObject:payment forKey:payment.productIdentifier];
   [self.callbackChannel invokeMethod:@"shouldAddStorePayment"
                            arguments:@{
                              @"payment" : [FIAObjectTranslator getMapFromSKPayment:payment],
@@ -298,6 +250,10 @@ - (SKProductsRequest *)getProductRequestWithIdentifiers:(NSSet *)identifiers {
   return [[SKProductsRequest alloc] initWithProductIdentifiers:identifiers];
 }
 
+- (SKProduct *)getProduct:(NSString *)productID {
+  return [self.productsCache objectForKey:productID];
+}
+
 #pragma mark - getter
 
 - (NSSet *)requestHandlers {
@@ -314,11 +270,4 @@ - (NSMutableDictionary *)productsCache {
   return _productsCache;
 }
 
-- (NSMutableDictionary *)paymentsCache {
-  if (!_paymentsCache) {
-    _paymentsCache = [NSMutableDictionary new];
-  }
-  return _paymentsCache;
-}
-
 @end
diff --git a/packages/in_app_purchase/lib/src/channel.dart b/packages/in_app_purchase/lib/src/channel.dart
index 7fc9e1a3dda5..b10507067ca5 100644
--- a/packages/in_app_purchase/lib/src/channel.dart
+++ b/packages/in_app_purchase/lib/src/channel.dart
@@ -6,3 +6,6 @@ import 'package:flutter/services.dart';
 
 const MethodChannel channel =
     MethodChannel('plugins.flutter.io/in_app_purchase');
+
+const MethodChannel callbackChannel =
+    MethodChannel('plugins.flutter.io/in_app_purchase_callback');
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
index 2712998667bb..288a05c0bae7 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
@@ -6,6 +6,8 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:in_app_purchase/src/channel.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:flutter/services.dart';
+import './sk_product_wrapper.dart';
 
 part 'sk_payment_queue_wrapper.g.dart';
 
@@ -14,9 +16,177 @@ part 'sk_payment_queue_wrapper.g.dart';
 /// The payment queue contains payment related operations. It communicates with App Store and presents
 /// a user interface for the user to process and authorize the payment.
 class SKPaymentQueueWrapper {
+  SKTransactionObserverWrapper _observer;
+
+  /// Returns the default payment queue.
+  ///
+  /// We do not support instantiating a custom payment queue, hence the singleton. However, you can
+  /// override the observer
+  factory SKPaymentQueueWrapper() {
+    return _singleton;
+  }
+
+  static final SKPaymentQueueWrapper _singleton = new SKPaymentQueueWrapper._();
+
+  SKPaymentQueueWrapper._() {
+    callbackChannel.setMethodCallHandler(_handleObserverCallbacks);
+  }
+
   /// Calls [`-[SKPaymentQueue canMakePayments:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506139-canmakepayments?language=objc).
   static Future<bool> canMakePayments() async =>
       await channel.invokeMethod('-[SKPaymentQueue canMakePayments:]');
+
+  /// Sets a transaction observer to listen to all the transaction events of the payment queue.
+  ///
+  /// You have to have a transaction observer to be added to the payment queue to handle the
+  /// payment follow.
+  /// You must set the observer right when App launches to avoid missing callback when your user
+  /// started a purchase flow from the App Store.
+  /// This method calls StoreKit's [`-[SKPaymentQueue finishTransaction:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506042-addtransactionobserver?language=objc).
+  void setTransactionObserver(SKTransactionObserverWrapper observer) {
+    _observer = observer;
+  }
+
+  /// Adds a payment object to the payment queue.
+  ///
+  /// Prior to this call, you have to make sure at least one [SKTransactionObserverWrapper] is added to the payment queue
+  /// using [addTransactionObserver]. You also have to make sure the [SKProductWrapper] of the payment has been fetched using [SKRequestMaker.startProductRequest].
+  /// Each payment will generate a [SKPaymentTransactionWrapper]. After a payment is added to the payment queue, the [SKTransactionObserverWrapper] is responsible for handling
+  /// the transaction that is generated by the payment.
+  /// The [productIdentifier] must match one of the products that are returned in [SKRequestMaker.startProductRequest].
+  /// to test the payment in the [sandbox](https://developer.apple.com/apple-pay/sandbox-testing/).
+  /// This method calls StoreKit's [`-[SKPaymentQueue addPayment:]`] (https://developer.apple.com/documentation/storekit/skpaymentqueue/1506036-addpayment?preferredLanguage=occ).
+  Future<void> addPayment(SKPaymentWrapper payment) async {
+    assert(_observer != null,
+        '[in_app_purchase]: Trying to add a payment without an observer. Observer must be set using `setTransactionObserver` before adding a payment `setTransactionObserver`. It is mandatory to set the observer at the moment when app launches.');
+    Map requestMap = payment.toMap();
+    await channel.invokeMethod(
+      '-[InAppPurchasePlugin addPayment:result:]',
+      requestMap,
+    );
+  }
+
+  /// Finishes a transaction and removes it from the queue.
+  ///
+  /// This method should be called from an [SKTransactionObserverWrapper] callback when receiving notification from the payment queue. You should only
+  /// call this method after the transaction is successfully processed and the functionality purchased by the user is unlocked.
+  /// It will throw a Platform exception if the [SKPaymentTransactionWrapper.transactionState] is [SKPaymentTransactionStateWrapper.purchasing].
+  /// This method calls StoreKit's [`-[SKPaymentQueue finishTransaction:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506003-finishtransaction?language=objc).
+  Future<void> finishTransaction(
+      SKPaymentTransactionWrapper transaction) async {
+    await channel.invokeMethod(
+        '-[InAppPurchasePlugin finishTransaction:result:]',
+        transaction.transactionIdentifier);
+  }
+
+  // Triage a method channel call from the platform and triggers the correct observer method.
+  Future<dynamic> _handleObserverCallbacks(MethodCall call) {
+    assert(_observer != null,
+        '[in_app_purchase]: (Fatal)The observer has not been set but we received a purchase transaction notification. Please ensure the observer has been set using `setTransactionObserver`. Make sure the observer is added right at the App Launch.');
+    switch (call.method) {
+      case 'updatedTransactions':
+        {
+          final List<SKPaymentTransactionWrapper> transactions =
+              _getTransactionList(call.arguments);
+          return Future<void>(() {
+            _observer.updatedTransactions(transactions: transactions);
+          });
+        }
+      case 'removedTransactions':
+        {
+          final List<SKPaymentTransactionWrapper> transactions =
+              _getTransactionList(call.arguments);
+          return Future<void>(() {
+            _observer.removedTransactions(transactions: transactions);
+          });
+        }
+      case 'restoreCompletedTransactions':
+        {
+          final Error error = call.arguments;
+          return Future<void>(() {
+            _observer.restoreCompletedTransactions(error: error);
+          });
+        }
+      case 'paymentQueueRestoreCompletedTransactionsFinished':
+        {
+          return Future<void>(() {
+            _observer.paymentQueueRestoreCompletedTransactionsFinished();
+          });
+        }
+      case 'updatedDownloads':
+        {
+          final List<SKDownloadWrapper> downloads =
+              _getDownloadList(call.arguments);
+          return Future<void>(() {
+            _observer.updatedDownloads(downloads: downloads);
+          });
+        }
+      case 'shouldAddStorePayment':
+        {
+          SKPaymentWrapper payment =
+              SKPaymentWrapper.fromJson(call.arguments['payment']);
+          SKProductWrapper product =
+              SKProductWrapper.fromJson(call.arguments['product']);
+          return Future<void>(() {
+            if (_observer.shouldAddStorePayment(
+                    payment: payment, product: product) ==
+                true) {
+              SKPaymentQueueWrapper().addPayment(payment);
+            }
+          });
+        }
+      default:
+        break;
+    }
+    return null;
+  }
+
+  // Get transaction wrapper object list from arguments.
+  List<SKPaymentTransactionWrapper> _getTransactionList(dynamic arguments) {
+    final List<SKPaymentTransactionWrapper> transactions = arguments
+        .map<SKPaymentTransactionWrapper>(
+            (dynamic map) => SKPaymentTransactionWrapper.fromJson(map))
+        .toList();
+    return transactions;
+  }
+
+  // Get download wrapper object list from arguments.
+  List<SKDownloadWrapper> _getDownloadList(dynamic arguments) {
+    final List<SKDownloadWrapper> downloads = arguments
+        .map<SKDownloadWrapper>(
+            (dynamic map) => SKDownloadWrapper.fromJson(map))
+        .toList();
+    return downloads;
+  }
+}
+
+/// This class is Dart wrapper around [SKTransactionObserver](https://developer.apple.com/documentation/storekit/skpaymenttransactionobserver?language=objc).
+///
+/// Must be subclassed. Must be instantiated and added to the [SKPaymentQueueWrapper] via [SKPaymentQueueWrapper.setTransactionObserver] at the app launch.
+abstract class SKTransactionObserverWrapper {
+  /// Triggered when any transactions are updated.
+  void updatedTransactions({List<SKPaymentTransactionWrapper> transactions});
+
+  /// Triggered when any transactions are removed from the payment queue.
+  void removedTransactions({List<SKPaymentTransactionWrapper> transactions});
+
+  /// Triggered when there is an error while restoring transactions.
+  void restoreCompletedTransactions({Error error});
+
+  /// Triggered when payment queue has finished sending restored transactions.
+  void paymentQueueRestoreCompletedTransactionsFinished();
+
+  /// Triggered when any download objects are updated.
+  void updatedDownloads({List<SKDownloadWrapper> downloads});
+
+  /// Triggered when a user initiated an in-app purchase from App Store.
+  ///
+  /// Return `true` to continue the transaction in your app. If you have multiple [SKTransactionObserverWrapper]s, the transaction
+  /// will continue if one [SKTransactionObserverWrapper] has [shouldAddStorePayment] returning `true`.
+  /// Return `false` to defer or cancel the transaction. You can also continue the transaction later by calling
+  /// [addPayment] with the product you get from this method.
+  bool shouldAddStorePayment(
+      {SKPaymentWrapper payment, SKProductWrapper product});
 }
 
 /// Dart wrapper around StoreKit's
@@ -25,6 +195,9 @@ class SKPaymentQueueWrapper {
 /// Presents the state of a transaction. Used for handling a transaction based on different state.
 enum SKPaymentTransactionStateWrapper {
   /// Indicates the transaction is being processed in App Store.
+  ///
+  /// You should update your UI to indicate the process and waiting for the transaction to update to the next state.
+  /// Never complte a transaction that is in purchasing state.
   @JsonValue(0)
   purchasing,
 
@@ -42,6 +215,8 @@ enum SKPaymentTransactionStateWrapper {
   restored,
 
   /// The transaction is in the queue but pending external action. Wait for another callback to get the final state.
+  ///
+  /// You should update your UI to indicate the process and waiting for the transaction to update to the next state.
   @JsonValue(4)
   deferred,
 }
@@ -50,7 +225,7 @@ enum SKPaymentTransactionStateWrapper {
 ///
 /// Created when a payment is added to the [SKPaymentQueueWrapper]. Transactions are delivered to your app when a payment is finished processing.
 /// Completed transactions provide a receipt and a transaction identifier that the app can use to save a permanent record of the processed payment.
-@JsonSerializable()
+@JsonSerializable(nullable: true)
 class SKPaymentTransactionWrapper {
   SKPaymentTransactionWrapper({
     @required this.payment,
@@ -147,10 +322,10 @@ enum SKDownloadState {
 /// When the product is purchased, a List of [SKDownloadWrapper] object will be present in an [SKPaymentTransactionWrapper] object.
 /// To download the content, add the [SKDownloadWrapper] objects to the payment queue and wait for the content to be downloaded.
 /// You can also read the [contentURL] to get the URL of the downloaded content after the download completes.
-/// Note that all downloaded files must be processed before the completion of the [SKPaymentTransactionWrapper].
+/// Note that all downloaded files must be processed before the completion of the [SKPaymentTransactionWrapper]([SKPaymentQueueWrapper.finishTransaction] is called).
 /// After the transaction is complete, any [SKDownloadWrapper] object in the transaction will not be able to be added to the payment queue
 /// and the [contentURL ]of the [SKDownloadWrapper] object will be invalid.
-@JsonSerializable()
+@JsonSerializable(nullable: true)
 class SKDownloadWrapper {
   SKDownloadWrapper({
     @required this.contentIdentifier,
@@ -214,7 +389,7 @@ class SKDownloadWrapper {
 }
 
 /// Dart wrapper around StoreKit's [NSError](https://developer.apple.com/documentation/foundation/nserror?language=objc).
-@JsonSerializable()
+@JsonSerializable(nullable: true)
 class SKError {
   SKError(
       {@required this.code, @required this.domain, @required this.userInfo});
@@ -245,11 +420,11 @@ class SKError {
 /// Used as the parameter to initiate a payment.
 /// In general, a developer should not need to create the payment object explicitly; instead, use
 /// [SKPaymentQueueWrapper.addPayment] directly with a product identifier to initiate a payment.
-@JsonSerializable()
+@JsonSerializable(nullable: true)
 class SKPaymentWrapper {
   SKPaymentWrapper(
       {@required this.productIdentifier,
-      @required this.applicationUsername,
+      this.applicationUsername,
       this.requestData,
       this.quantity = 1,
       this.simulatesAskToBuyInSandbox = false});
@@ -265,12 +440,24 @@ class SKPaymentWrapper {
     return _$SKPaymentWrapperFromJson(map);
   }
 
+  /// Creates a Map object describes the payment object.
+  Map<String, dynamic> toMap() {
+    return {
+      'productIdentifier': productIdentifier,
+      'applicationUsername': applicationUsername,
+      'requestData': requestData,
+      'quantity': quantity,
+      'simulatesAskToBuyInSandbox': simulatesAskToBuyInSandbox
+    };
+  }
+
   /// The id for the product that the payment is for.
   final String productIdentifier;
 
   /// An opaque id for the user's account.
   ///
   /// Used to help the store detect irregular activity. See https://developer.apple.com/documentation/storekit/skpayment/1506116-applicationusername?language=objc for more details.
+  /// For example, you can use a one-way hash of the user’s account name on your server. Don’t use the Apple ID for your developer account, the user’s Apple ID, or the user’s unhashed account name on your server.
   final String applicationUsername;
 
   /// Reserved for future use.
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
index 67e81bd514fe..6853e54a6be1 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
@@ -8,17 +8,23 @@ part of 'sk_payment_queue_wrapper.dart';
 
 SKPaymentTransactionWrapper _$SKPaymentTransactionWrapperFromJson(Map json) {
   return SKPaymentTransactionWrapper(
-      payment: SKPaymentWrapper.fromJson(json['payment'] as Map),
-      transactionState: _$enumDecode(
+      payment: json['payment'] == null
+          ? null
+          : SKPaymentWrapper.fromJson(json['payment'] as Map),
+      transactionState: _$enumDecodeNullable(
           _$SKPaymentTransactionStateWrapperEnumMap, json['transactionState']),
-      originalTransaction: SKPaymentTransactionWrapper.fromJson(
-          json['originalTransaction'] as Map),
-      transactionTimeStamp: (json['transactionTimeStamp'] as num).toDouble(),
+      originalTransaction: json['originalTransaction'] == null
+          ? null
+          : SKPaymentTransactionWrapper.fromJson(
+              json['originalTransaction'] as Map),
+      transactionTimeStamp: (json['transactionTimeStamp'] as num)?.toDouble(),
       transactionIdentifier: json['transactionIdentifier'] as String,
       downloads: (json['downloads'] as List)
-          .map((e) => SKDownloadWrapper.fromJson(e as Map))
-          .toList(),
-      error: SKError.fromJson(json['error'] as Map));
+          ?.map((e) => e == null ? null : SKDownloadWrapper.fromJson(e as Map))
+          ?.toList(),
+      error: json['error'] == null
+          ? null
+          : SKError.fromJson(json['error'] as Map));
 }
 
 T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
@@ -34,6 +40,13 @@ T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
       .key;
 }
 
+T _$enumDecodeNullable<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    return null;
+  }
+  return _$enumDecode<T>(enumValues, source);
+}
+
 const _$SKPaymentTransactionStateWrapperEnumMap =
     <SKPaymentTransactionStateWrapper, dynamic>{
   SKPaymentTransactionStateWrapper.purchasing: 0,
@@ -46,15 +59,17 @@ const _$SKPaymentTransactionStateWrapperEnumMap =
 SKDownloadWrapper _$SKDownloadWrapperFromJson(Map json) {
   return SKDownloadWrapper(
       contentIdentifier: json['contentIdentifier'] as String,
-      state: _$enumDecode(_$SKDownloadStateEnumMap, json['state']),
+      state: _$enumDecodeNullable(_$SKDownloadStateEnumMap, json['state']),
       contentLength: json['contentLength'] as int,
       contentURL: json['contentURL'] as String,
       contentVersion: json['contentVersion'] as String,
       transactionID: json['transactionID'] as String,
-      progress: (json['progress'] as num).toDouble(),
-      timeRemaining: (json['timeRemaining'] as num).toDouble(),
+      progress: (json['progress'] as num)?.toDouble(),
+      timeRemaining: (json['timeRemaining'] as num)?.toDouble(),
       downloadTimeUnknown: json['downloadTimeUnknown'] as bool,
-      error: SKError.fromJson(json['error'] as Map));
+      error: json['error'] == null
+          ? null
+          : SKError.fromJson(json['error'] as Map));
 }
 
 const _$SKDownloadStateEnumMap = <SKDownloadState, dynamic>{
@@ -70,7 +85,8 @@ SKError _$SKErrorFromJson(Map json) {
   return SKError(
       code: json['code'] as int,
       domain: json['domain'] as String,
-      userInfo: Map<String, dynamic>.from(json['userInfo'] as Map));
+      userInfo:
+          (json['userInfo'] as Map)?.map((k, e) => MapEntry(k as String, e)));
 }
 
 SKPaymentWrapper _$SKPaymentWrapperFromJson(Map json) {
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
index 6f68ad067b09..fc342dbbc759 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
@@ -71,42 +71,45 @@ void main() {
   group('Wrapper fromJson tests', () {
     test('Should construct correct SKPaymentWrapper from json', () {
       SKPaymentWrapper payment =
-          SKPaymentWrapper.fromJson(buildPaymentMap(dummyPayment));
+          SKPaymentWrapper.fromJson(dummyPayment.toMap());
       testPayment(payment, dummyPayment);
     });
-  });
 
-  test('Should construct correct SKError from json', () {
-    SKError error = SKError.fromJson(buildErrorMap(dummyError));
-    testSKError(error, dummyError);
-  });
+    test('Should construct correct SKError from json', () {
+      SKError error = SKError.fromJson(buildErrorMap(dummyError));
+      testSKError(error, dummyError);
+    });
 
-  test('Should construct correct SKDownloadWrapper from json', () {
-    SKDownloadWrapper download =
-        SKDownloadWrapper.fromJson(buildDownloadMap(dummyDownload));
-    testDownload(download, dummyDownload);
-  });
+    test('Should construct correct SKDownloadWrapper from json', () {
+      SKDownloadWrapper download =
+          SKDownloadWrapper.fromJson(buildDownloadMap(dummyDownload));
+      testDownload(download, dummyDownload);
+    });
 
-  test('Should construct correct SKTransactionWrapper from json', () {
-    SKPaymentTransactionWrapper transaction =
-        SKPaymentTransactionWrapper.fromJson(
-            buildTransactionMap(dummyTransaction));
-    testTransaction(transaction, dummyTransaction);
-    if (transaction.originalTransaction != null) {
-      testTransaction(transaction.originalTransaction,
-          dummyTransaction.originalTransaction);
-    }
-  });
-}
+    test('Should construct correct SKTransactionWrapper from json', () {
+      SKPaymentTransactionWrapper transaction =
+          SKPaymentTransactionWrapper.fromJson(
+              buildTransactionMap(dummyTransaction));
+      testTransaction(transaction, dummyTransaction);
+      if (transaction.originalTransaction != null) {
+        testTransaction(transaction.originalTransaction,
+            dummyTransaction.originalTransaction);
+      }
+    });
 
-Map<String, dynamic> buildPaymentMap(SKPaymentWrapper paymentWrapper) {
-  return {
-    'productIdentifier': paymentWrapper.productIdentifier,
-    'applicationUsername': paymentWrapper.applicationUsername,
-    'requestData': paymentWrapper.requestData,
-    'quantity': paymentWrapper.quantity,
-    'simulatesAskToBuyInSandbox': paymentWrapper.simulatesAskToBuyInSandbox
-  };
+    test('Should generate correct map of the payment object', () {
+      Map map = dummyPayment.toMap();
+      expect(map['productIdentifier'], dummyPayment.productIdentifier);
+      expect(map['applicationUsername'], dummyPayment.applicationUsername);
+
+      expect(map['requestData'], dummyPayment.requestData);
+
+      expect(map['quantity'], dummyPayment.quantity);
+
+      expect(map['simulatesAskToBuyInSandbox'],
+          dummyPayment.simulatesAskToBuyInSandbox);
+    });
+  });
 }
 
 Map<String, dynamic> buildErrorMap(SKError error) {
@@ -140,7 +143,7 @@ Map<String, dynamic> buildTransactionMap(
   Map map = <String, dynamic>{
     'transactionState': SKPaymentTransactionStateWrapper.values
         .indexOf(SKPaymentTransactionStateWrapper.purchased),
-    'payment': buildPaymentMap(transaction.payment),
+    'payment': transaction.payment.toMap(),
     'originalTransaction': buildTransactionMap(transaction.originalTransaction),
     'transactionTimeStamp': transaction.transactionTimeStamp,
     'transactionIdentifier': transaction.transactionIdentifier,

From ea7d4f8efe94b769c4fd31b032389344ce76ba92 Mon Sep 17 00:00:00 2001
From: Michael Diarmid <mike.diarmid@gmail.com>
Date: Thu, 28 Feb 2019 23:49:03 +0000
Subject: [PATCH 188/410] [firebase_performance] Fix incorrect setting of Trace
 & HttpMetric attributes (#1277)

---
 AUTHORS                                                       | 2 ++
 .../ios/Classes/FirebasePerformancePlugin.m                   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index adf87de0d69a..ecc2c3e512b1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,3 +23,5 @@ Diego Velásquez <diego.velasquez.lopez@gmail.com>
 Hajime Nakamura <nkmrhj@gmail.com>
 Tuyển Vũ Xuân <netsoft1985@gmail.com>
 Sarthak Verma <sarthak@artiosys.com>
+Mike Diarmid <mike@invertase.io>
+Invertase <oss@invertase.io>
diff --git a/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m b/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
index 40b4a5064ada..b8a912377b9f 100644
--- a/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
+++ b/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
@@ -77,7 +77,7 @@ - (void)handleTraceStop:(FlutterMethodCall *)call result:(FlutterResult)result {
 
   NSDictionary *attributes = call.arguments[@"attributes"];
   [attributes enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
-    [trace setValue:key forAttribute:value];
+    [trace setValue:value forAttribute:key];
   }];
 
   [trace stop];
@@ -149,7 +149,7 @@ - (void)handleHttpMetricStop:(FlutterMethodCall *)call result:(FlutterResult)res
 
   NSDictionary *attributes = call.arguments[@"attributes"];
   [attributes enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
-    [metric setValue:key forAttribute:value];
+    [metric setValue:value forAttribute:key];
   }];
 
   [metric stop];

From 87b66c298961dfaf5379cb74598da755aa761307 Mon Sep 17 00:00:00 2001
From: Michael Diarmid <mike.diarmid@gmail.com>
Date: Fri, 1 Mar 2019 00:25:02 +0000
Subject: [PATCH 189/410] [firebase_performance] remove deprecated trace
 counter API usage (#1278)

---
 packages/firebase_performance/CHANGELOG.md                   | 5 +++++
 .../ios/Classes/FirebasePerformancePlugin.m                  | 2 +-
 packages/firebase_performance/pubspec.yaml                   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_performance/CHANGELOG.md b/packages/firebase_performance/CHANGELOG.md
index 6cf07b6797c0..b676576bd2c0 100644
--- a/packages/firebase_performance/CHANGELOG.md
+++ b/packages/firebase_performance/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.0+4
+
+* Remove deprecated methods for iOS.
+* Fix bug where `Trace` attributes were not set correctly.
+
 ## 0.1.0+3
 
 * Log messages about automatic configuration of the default app are now less confusing.
diff --git a/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m b/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
index b8a912377b9f..94877384ca75 100644
--- a/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
+++ b/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
@@ -72,7 +72,7 @@ - (void)handleTraceStop:(FlutterMethodCall *)call result:(FlutterResult)result {
 
   NSDictionary *counters = call.arguments[@"counters"];
   [counters enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSNumber *value, BOOL *stop) {
-    [trace incrementCounterNamed:key by:[value integerValue]];
+    [trace setIntValue:[value longLongValue] forMetric:key];
   }];
 
   NSDictionary *attributes = call.arguments[@"attributes"];
diff --git a/packages/firebase_performance/pubspec.yaml b/packages/firebase_performance/pubspec.yaml
index 6300f4943126..5c7d34b07e7d 100644
--- a/packages/firebase_performance/pubspec.yaml
+++ b/packages/firebase_performance/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Google Performance Monitoring for Firebase, an a
   iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_performance
-version: 0.1.0+3
+version: 0.1.0+4
 
 dependencies:
   flutter:

From 279ab6d334a706195e70f20efd78c8ed65de7e3e Mon Sep 17 00:00:00 2001
From: Rishab Nayak <rishab@bu.edu>
Date: Thu, 28 Feb 2019 19:50:03 -0500
Subject: [PATCH 190/410] Update README.md (#1270)

---
 packages/firebase_ml_vision/example/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/firebase_ml_vision/example/README.md b/packages/firebase_ml_vision/example/README.md
index 6e2f75d9f527..51e02d473c69 100644
--- a/packages/firebase_ml_vision/example/README.md
+++ b/packages/firebase_ml_vision/example/README.md
@@ -5,7 +5,7 @@ Demonstrates how to use the firebase_ml_vision plugin.
 ## Usage
 
 *Important* If using on-device detectors on `iOS`, see the plugin
-[README.md](https://github.com/flutter/plugins/blob/master/packages/camera/README.md) on including
+[README.md](https://github.com/flutter/plugins/blob/master/packages/firebase_ml_vision/README.md) on including
 ML Model pods into the example project.
 
 This example uses the *image_picker* plugin to get images from the device gallery. If using an iOS

From f2b1e696eb1391fa734090faaac66b46057a0d38 Mon Sep 17 00:00:00 2001
From: Giovanni Terlingen <me@giovanniterlingen.com>
Date: Fri, 1 Mar 2019 02:41:49 +0100
Subject: [PATCH 191/410] [firebase_ml_vision] Fix crash when scanning URL
 QR-code on iOS (#1223)

---
 packages/firebase_ml_vision/CHANGELOG.md                  | 5 +++++
 packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m | 4 ++--
 packages/firebase_ml_vision/pubspec.yaml                  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 9fa5dec20a90..5fd15a48e2bb 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.6.0+2
+
+* Update README.md
+* Fix crash when receiving barcode urls on iOS.
+
 ## 0.6.0+1
 
 * Log messages about automatic configuration of the default app are now less confusing.
diff --git a/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m b/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m
index fbe9713d56e6..ddd3f9f80f1a 100644
--- a/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m
+++ b/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m
@@ -94,8 +94,8 @@ + (void)handleDetection:(FIRVisionImage *)image
 
 NSDictionary *visionBarcodeURLToDictionary(FIRVisionBarcodeURLBookmark *url) {
   return @{
-    @"title" : url.title,
-    @"url" : url.url,
+    @"title" : url.title ? url.title : [NSNull null],
+    @"url" : url.url ? url.url : [NSNull null],
   };
 }
 
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index 5b6b47c99ef1..30f399fc3520 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_ml_vision
 description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.6.0+1
+version: 0.6.0+2
 
 dependencies:
   flutter:

From 3475f1b735c66b62d52cf2fb55af68401c3f0803 Mon Sep 17 00:00:00 2001
From: Chris Yang <cyang8954@gmail.com>
Date: Fri, 1 Mar 2019 17:01:10 -0800
Subject: [PATCH 192/410] [in_app_purchase]restore purchases (#1299)

The iOS implementation for restoring purchases. flutter/flutter#26326
---
 .../InAppPurchasePluginTest.m                 | 29 +++++++++++++++++++
 .../ios/in_app_purchase_pluginTests/Stubs.m   |  4 +++
 .../ios/Classes/FIAPaymentQueueHandler.h      |  5 ++--
 .../ios/Classes/FIAPaymentQueueHandler.m      |  8 +++++
 .../ios/Classes/InAppPurchasePlugin.m         | 13 +++++++++
 .../sk_payment_queue_wrapper.dart             | 21 ++++++++++++--
 6 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
index 020973a7da4d..fcfc3133291f 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
@@ -99,6 +99,7 @@ - (void)testAddPaymentFailure {
       }
       updatedDownloads:nil];
   [queue addTransactionObserver:self.plugin.paymentQueueHandler];
+
   [self.plugin handleMethodCall:call
                          result:^(id r){
                          }];
@@ -142,4 +143,32 @@ - (void)testAddPaymentSuccessWithMockQueue {
   XCTAssertEqual(transactionForUpdateBlock.transactionState, SKPaymentTransactionStatePurchased);
 }
 
+- (void)testRestoreTransactions {
+  XCTestExpectation* expectation =
+      [self expectationWithDescription:@"result successfully restore transactions"];
+  FlutterMethodCall* call = [FlutterMethodCall
+      methodCallWithMethodName:@"-[InAppPurchasePlugin restoreTransactions:result:]"
+                     arguments:nil];
+  SKPaymentQueueStub* queue = [SKPaymentQueueStub new];
+  queue.testState = SKPaymentTransactionStatePurchased;
+  __block BOOL callbackInvoked = NO;
+  self.plugin.paymentQueueHandler = [[FIAPaymentQueueHandler alloc] initWithQueue:queue
+      transactionsUpdated:^(NSArray<SKPaymentTransaction*>* _Nonnull transactions) {
+      }
+      transactionRemoved:nil
+      restoreTransactionFailed:nil
+      restoreCompletedTransactionsFinished:^() {
+        callbackInvoked = YES;
+        [expectation fulfill];
+      }
+      shouldAddStorePayment:nil
+      updatedDownloads:nil];
+  [queue addTransactionObserver:self.plugin.paymentQueueHandler];
+  [self.plugin handleMethodCall:call
+                         result:^(id r){
+                         }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertTrue(callbackInvoked);
+}
+
 @end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
index 400b7020abdb..02d9ea6c8385 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
@@ -154,6 +154,10 @@ - (void)addPayment:(SKPayment *)payment {
   [self.observer paymentQueue:self updatedTransactions:@[ transaction ]];
 }
 
+- (void)restoreCompletedTransactions {
+  [self.observer paymentQueueRestoreCompletedTransactionsFinished:self];
+}
+
 @end
 
 @implementation SKPaymentTransactionStub
diff --git a/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.h b/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.h
index 692514ab5278..8ebb087f06be 100644
--- a/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.h
+++ b/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.h
@@ -26,9 +26,10 @@ typedef void (^UpdatedDownloads)(NSArray<SKDownload *> *downloads);
         (nullable RestoreCompletedTransactionsFinished)restoreCompletedTransactionsFinished
                    shouldAddStorePayment:(nullable ShouldAddStorePayment)shouldAddStorePayment
                         updatedDownloads:(nullable UpdatedDownloads)updatedDownloads;
-- (void)addPayment:(SKPayment *)payment;
+- (void)addPayment:(nonnull SKPayment *)payment;
 // Can throw exceptions if the transaction type is purchasing, should always used in a @try block.
-- (void)finishTransaction:(SKPaymentTransaction *)transaction;
+- (void)finishTransaction:(nonnull SKPaymentTransaction *)transaction;
+- (void)restoreTransactions:(nullable NSString *)applicationName;
 
 @end
 
diff --git a/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m b/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m
index ea76cd15a04f..c785178cd387 100644
--- a/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m
+++ b/packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m
@@ -52,6 +52,14 @@ - (void)finishTransaction:(SKPaymentTransaction *)transaction {
   [self.queue finishTransaction:transaction];
 }
 
+- (void)restoreTransactions:(nullable NSString *)applicationName {
+  if (applicationName) {
+    [self.queue restoreCompletedTransactionsWithApplicationUsername:applicationName];
+  } else {
+    [self.queue restoreCompletedTransactions];
+  }
+}
+
 #pragma mark - observing
 // Sent when the transaction array has changed (additions or state changes).  Client should check
 // state of transactions and finish as appropriate.
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
index bc0af2214152..c139679932bf 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
@@ -77,6 +77,8 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [self addPayment:call result:result];
   } else if ([@"-[InAppPurchasePlugin finishTransaction:result:]" isEqualToString:call.method]) {
     [self finishTransaction:call result:result];
+  } else if ([@"-[InAppPurchasePlugin restoreTransactions:result:]" isEqualToString:call.method]) {
+    [self restoreTransactions:call result:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -193,6 +195,17 @@ - (void)finishTransaction:(FlutterMethodCall *)call result:(FlutterResult)result
   result(nil);
 }
 
+- (void)restoreTransactions:(FlutterMethodCall *)call result:(FlutterResult)result {
+  if (call.arguments && ![call.arguments isKindOfClass:[NSString class]]) {
+    result([FlutterError
+        errorWithCode:@"storekit_invalid_argument"
+              message:@"Argument is not nil and the type of finishTransaction is not a string."
+              details:call.arguments]);
+    return;
+  }
+  [self.paymentQueueHandler restoreTransactions:call.arguments];
+}
+
 #pragma mark - delegates
 
 - (void)handleTransactionsUpdated:(NSArray<SKPaymentTransaction *> *)transactions {
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
index 288a05c0bae7..53a9d0e40eae 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
@@ -79,6 +79,22 @@ class SKPaymentQueueWrapper {
         transaction.transactionIdentifier);
   }
 
+  /// Restore transactions to maintain access to content that customers have already purchased.
+  ///
+  /// For example, when a user upgrades to a new phone, they want to keep the content they purchased in the old phone.
+  /// This call will invoke the [SKTransactionObserverWrapper.restoreCompletedTransactions] or [SKTransactionObserverWrapper.paymentQueueRestoreCompletedTransactionsFinished] as well as [SKTransactionObserverWrapper.updatedTransaction]
+  /// in the [SKTransactionObserverWrapper]. If you keep the download content in your own server, in the observer methods, you can simply finish the transaction by calling [finishTransaction] and
+  /// download the content from your own server.
+  /// If you keep the download content on Apple's server, you can access the download content in the transaction object that you get from [SKTransactionObserverWrapper.updatedTransaction] when the [SKPaymentTransactionWrapper.transactionState] is [SKPaymentTransactionStateWrapper.restored].
+  /// The `applicationUserName` is the [SKPaymentWrapper.applicationUsername] you used to create payments. If you did not use a `applicationUserName` when creating payments, then you can ignore this parameter.
+  /// This method either triggers [`-[SKPayment restoreCompletedTransactions]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506123-restorecompletedtransactions?language=objc) or [`-[SKPayment restoreCompletedTransactionsWithApplicationUsername:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1505992-restorecompletedtransactionswith?language=objc)
+  /// depends on weather the `applicationUserName` is passed.
+  Future<void> restoreTransactions({String applicationUserName}) async {
+    await channel.invokeMethod(
+        '-[InAppPurchasePlugin restoreTransactions:result:]',
+        applicationUserName);
+  }
+
   // Triage a method channel call from the platform and triggers the correct observer method.
   Future<dynamic> _handleObserverCallbacks(MethodCall call) {
     assert(_observer != null,
@@ -183,8 +199,9 @@ abstract class SKTransactionObserverWrapper {
   ///
   /// Return `true` to continue the transaction in your app. If you have multiple [SKTransactionObserverWrapper]s, the transaction
   /// will continue if one [SKTransactionObserverWrapper] has [shouldAddStorePayment] returning `true`.
-  /// Return `false` to defer or cancel the transaction. You can also continue the transaction later by calling
-  /// [addPayment] with the product you get from this method.
+  /// Return `false` to defer or cancel the transaction. For example, you may need to defer a transaction if the user is in the middle of onboarding.
+  /// You can also continue the transaction later by calling
+  /// [addPayment] with the [SKPaymentWrapper] object you get from this method.
   bool shouldAddStorePayment(
       {SKPaymentWrapper payment, SKProductWrapper product});
 }

From c1ff36ac214fd74082aaaecefe6b021a86343ead Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Mon, 4 Mar 2019 13:18:06 -0800
Subject: [PATCH 193/410] Add my name to firebase_performance and
 firebase_dynamic_links owners (#1300)

---
 CODEOWNERS | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 403e3a5a077d..156213bbf897 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -4,20 +4,22 @@
 # These names are just suggestions. It is fine to have your changes
 # reviewed by someone else.
 
+packages/android_alarm_manager/* @bkonyi
+packages/camera/* @bparrishMines @mklim
 packages/cloud_firestore/* @collinjackson @kroikie
+packages/connectivity/* @cyanglaz
+packages/firebase_admob/* @amirh
+packages/firebase_analytics/* @collinjackson @kroikie
 packages/firebase_auth/* @collinjackson @kroikie
+packages/firebase_database/* @collinjackson @kroikie
+packages/firebase_dynamic_links/* @bparrishMines
 packages/firebase_messaging/* @collinjackson @kroikie
-packages/camera/* @bparrishMines @mklim
-packages/firebase_admob/* @amirh
 packages/firebase_ml_vision/* @bparrishMines
-packages/image_picker/* @cyanglaz
-packages/android_alarm_manager/* @bkonyi
+packages/firebase_performance/* @bparrishMines
+packages/firebase_storage/* @collinjackson @kroikie
 packages/google_maps_flutter/* @amirh
 packages/google_sign_in/* @cyanglaz @mehmetf
+packages/image_picker/* @cyanglaz
 packages/in_app_purchase/* @mklim
-packages/firebase_database/* @collinjackson @kroikie
-packages/firebase_storage/* @collinjackson @kroikie
 packages/package_info/* @cyanglaz
-packages/firebase_analytics/* @collinjackson @kroikie
-packages/connectivity/* @cyanglaz
-packages/webview_flutter/* @amirh
\ No newline at end of file
+packages/webview_flutter/* @amirh

From 5cf0df0db16b30004aacea5261986798de09d505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Varga?= <warnyul@gmail.com>
Date: Mon, 4 Mar 2019 23:41:48 +0100
Subject: [PATCH 194/410] Fix typo in RewardedVideoAdd sample (#927)

---
 packages/firebase_admob/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/firebase_admob/README.md b/packages/firebase_admob/README.md
index 7e458218f3fc..fb6966e9b592 100644
--- a/packages/firebase_admob/README.md
+++ b/packages/firebase_admob/README.md
@@ -143,7 +143,7 @@ When the AdMob SDK decides it's time to grant an in-app reward, it does so via
 the `RewardedVideoAdEvent.rewarded` event:
 ```dart
 RewardedVideoAd.instance.listener =
-    (RewardedVideoAdEvent event, [String rewardType, int rewardAmount]) {
+    (RewardedVideoAdEvent event, {String rewardType, int rewardAmount}) {
   if (event == RewardedVideoAdEvent.rewarded) {
     setState(() {
       // Here, apps should update state to reflect the reward.

From fa6b6ebe78161ad504550b9fb029129b97253463 Mon Sep 17 00:00:00 2001
From: Karthik Ponnam <ponnamkarthik3@gmail.com>
Date: Tue, 5 Mar 2019 04:12:36 +0530
Subject: [PATCH 195/410] [firebase_dynamic_links] fix dynamic link crash when
 creating shortlink if warnings are null (#1142)

* fix dynamic link crash when creating shortlink if warnings are null

* fix dynamic link crash when creating shortlink if warnings are null

* fix dynamic link crash when creating shortlink if warnings are null

* ios crash if warnings are null

* ios crash if warnings are null

* Formatting
---
 .../firebasedynamiclinks/FirebaseDynamicLinksPlugin.java   | 7 +++++--
 .../ios/Classes/FirebaseDynamicLinksPlugin.m               | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java b/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
index 480e132de7d8..6116abd401e6 100644
--- a/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
+++ b/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
@@ -96,9 +96,12 @@ public void onComplete(@NonNull Task<ShortDynamicLink> task) {
           url.put("url", task.getResult().getShortLink().toString());
 
           List<String> warnings = new ArrayList<>();
-          for (ShortDynamicLink.Warning warning : task.getResult().getWarnings()) {
-            warnings.add(warning.getMessage());
+          if (task.getResult().getWarnings() != null) {
+            for (ShortDynamicLink.Warning warning : task.getResult().getWarnings()) {
+              warnings.add(warning.getMessage());
+            }
           }
+
           url.put("warnings", warnings);
 
           result.success(url);
diff --git a/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m b/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
index 1f019127ffab..a1f09beb0881 100644
--- a/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
+++ b/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
@@ -109,6 +109,9 @@ - (FIRDynamicLinkShortenerCompletion)createShortLinkCompletion:(FlutterResult)re
     if (error) {
       result(getFlutterError(error));
     } else {
+      if (warnings == nil) {
+        warnings = [NSMutableArray array];
+      }
       result(@{@"url" : [shortURL absoluteString], @"warnings" : warnings});
     }
   };

From 1d8e6c08b9a8c32bb388ca5cd71e5691855d8792 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Mon, 4 Mar 2019 14:43:06 -0800
Subject: [PATCH 196/410] [firebase_dynamic_links] Version bump for
 firebase_dynamic_links PR #1142 (#1309)

---
 packages/firebase_dynamic_links/CHANGELOG.md | 4 ++++
 packages/firebase_dynamic_links/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_dynamic_links/CHANGELOG.md b/packages/firebase_dynamic_links/CHANGELOG.md
index 8b9a52c02253..5df11e804c8f 100644
--- a/packages/firebase_dynamic_links/CHANGELOG.md
+++ b/packages/firebase_dynamic_links/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0+4
+
+* Fix crash when receiving `ShortDynamicLink` warnings.
+
 ## 0.2.0+3
 
 * Log messages about automatic configuration of the default app are now less confusing.
diff --git a/packages/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/pubspec.yaml
index 89de7a16124f..8896dd18c419 100644
--- a/packages/firebase_dynamic_links/pubspec.yaml
+++ b/packages/firebase_dynamic_links/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_dynamic_links
 description: Flutter plugin for Google Dynamic Links for Firebase, an app solution for creating
   and handling links across multiple platforms.
-version: 0.2.0+3
+version: 0.2.0+4
 
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_dynamic_links

From f74c7c15bcf31b8b4527d00ac4e880b0a79abb4a Mon Sep 17 00:00:00 2001
From: Ben Hagen <ben@ottomatic.io>
Date: Tue, 5 Mar 2019 00:50:16 +0100
Subject: [PATCH 197/410] [video_player]Do not divide by zero (#793)

---
 packages/video_player/CHANGELOG.md                    | 8 ++++++++
 packages/video_player/ios/Classes/VideoPlayerPlugin.m | 5 ++++-
 packages/video_player/pubspec.yaml                    | 2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md
index 6280b9ce47ed..1d635f19d4a8 100644
--- a/packages/video_player/CHANGELOG.md
+++ b/packages/video_player/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.10.0+3
+
+* Fix divide by zero bug on iOS.
+
+## 0.10.0+2
+
+* Added supported format documentation in README.
+
 ## 0.10.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/video_player/ios/Classes/VideoPlayerPlugin.m b/packages/video_player/ios/Classes/VideoPlayerPlugin.m
index 2d8b6ee1b950..cbe109bc7c35 100644
--- a/packages/video_player/ios/Classes/VideoPlayerPlugin.m
+++ b/packages/video_player/ios/Classes/VideoPlayerPlugin.m
@@ -6,7 +6,10 @@
 #import <AVFoundation/AVFoundation.h>
 #import <GLKit/GLKit.h>
 
-int64_t FLTCMTimeToMillis(CMTime time) { return time.value * 1000 / time.timescale; }
+int64_t FLTCMTimeToMillis(CMTime time) {
+  if (time.timescale == 0) return 0;
+  return time.value * 1000 / time.timescale;
+}
 
 @interface FLTFrameUpdater : NSObject
 @property(nonatomic) int64_t textureId;
diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml
index 197430d53585..467b42287862 100644
--- a/packages/video_player/pubspec.yaml
+++ b/packages/video_player/pubspec.yaml
@@ -2,7 +2,7 @@ name: video_player
 description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
-version: 0.10.0+2
+version: 0.10.0+3
 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player
 
 flutter:

From f84066f586140820bb8f42b0b1b11ad5a7f55753 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Tue, 5 Mar 2019 11:32:42 -0800
Subject: [PATCH 198/410] [google_maps_flutter]ChangeNotifier is replaced with
 granular callbacks (#1302)

* ChangeNotifier is replaced with granular callbacks

This facilitates better interaction with the map
than adding a listener to the controller.

* Make docs better

* Remove camera update call backs for map and marker update

* Fix up some links and caps.

* Update changelog and pubspec.

* fix unused var
---
 packages/google_maps_flutter/CHANGELOG.md     |  5 +++
 .../example/lib/map_ui.dart                   | 30 ++++++-------
 .../lib/src/controller.dart                   | 42 ++++++-------------
 .../lib/src/google_map.dart                   | 39 ++++++++++++++++-
 packages/google_maps_flutter/pubspec.yaml     |  2 +-
 5 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 618af9bf5bc6..36915e553bd0 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.0
+
+* Change events are call backs on GoogleMap widget.
+* GoogleMapController no longer handles change events.
+
 ## 0.3.0+3
 
 * Update Android play-services-maps to 16.1.0
diff --git a/packages/google_maps_flutter/example/lib/map_ui.dart b/packages/google_maps_flutter/example/lib/map_ui.dart
index 993bddd99ae9..486d87b9073c 100644
--- a/packages/google_maps_flutter/example/lib/map_ui.dart
+++ b/packages/google_maps_flutter/example/lib/map_ui.dart
@@ -36,8 +36,8 @@ class MapUiBodyState extends State<MapUiBody> {
     zoom: 11.0,
   );
 
-  GoogleMapController mapController;
   CameraPosition _position = _kInitialPosition;
+  bool _isMapCreated = false;
   bool _isMoving = false;
   bool _compassEnabled = true;
   CameraTargetBounds _cameraTargetBounds = CameraTargetBounds.unbounded;
@@ -54,20 +54,8 @@ class MapUiBodyState extends State<MapUiBody> {
     super.initState();
   }
 
-  void _onMapChanged() {
-    setState(() {
-      _extractMapInfo();
-    });
-  }
-
-  void _extractMapInfo() {
-    _position = mapController.cameraPosition;
-    _isMoving = mapController.isCameraMoving;
-  }
-
   @override
   void dispose() {
-    mapController.removeListener(_onMapChanged);
     super.dispose();
   }
 
@@ -197,6 +185,7 @@ class MapUiBodyState extends State<MapUiBody> {
       tiltGesturesEnabled: _tiltGesturesEnabled,
       zoomGesturesEnabled: _zoomGesturesEnabled,
       myLocationEnabled: _myLocationEnabled,
+      onCameraMove: _updateCameraPosition,
     );
 
     final List<Widget> columnChildren = <Widget>[
@@ -212,7 +201,7 @@ class MapUiBodyState extends State<MapUiBody> {
       ),
     ];
 
-    if (mapController != null) {
+    if (_isMapCreated) {
       columnChildren.add(
         Expanded(
           child: ListView(
@@ -245,10 +234,15 @@ class MapUiBodyState extends State<MapUiBody> {
     );
   }
 
+  void _updateCameraPosition(CameraPosition position) {
+    setState(() {
+      _position = position;
+    });
+  }
+
   void onMapCreated(GoogleMapController controller) {
-    mapController = controller;
-    mapController.addListener(_onMapChanged);
-    _extractMapInfo();
-    setState(() {});
+    setState(() {
+      _isMapCreated = true;
+    });
   }
 }
diff --git a/packages/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/lib/src/controller.dart
index ecfc4d830c62..3d5640083698 100644
--- a/packages/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/lib/src/controller.dart
@@ -5,22 +5,13 @@
 part of google_maps_flutter;
 
 /// Controller for a single GoogleMap instance running on the host platform.
-///
-/// Change listeners are notified upon changes to any of
-///
-/// * the [options] property
-/// * the [isCameraMoving] property
-/// * the [cameraPosition] property
-///
-/// Listeners are notified after changes have been applied on the platform side.
-class GoogleMapController extends ChangeNotifier {
+class GoogleMapController {
   GoogleMapController._(
     MethodChannel channel,
     CameraPosition initialCameraPosition,
     this._googleMapState,
   )   : assert(channel != null),
         _channel = channel {
-    _cameraPosition = initialCameraPosition;
     _channel.setMethodCallHandler(_handleMethodCall);
   }
 
@@ -45,30 +36,26 @@ class GoogleMapController extends ChangeNotifier {
 
   final MethodChannel _channel;
 
-  /// True if the map camera is currently moving.
-  bool get isCameraMoving => _isCameraMoving;
-  bool _isCameraMoving = false;
-
   final _GoogleMapState _googleMapState;
 
-  /// Returns the most recent camera position reported by the platform side.
-  /// Will be null, if [GoogleMap.trackCameraPosition] is false.
-  CameraPosition get cameraPosition => _cameraPosition;
-  CameraPosition _cameraPosition;
-
   Future<dynamic> _handleMethodCall(MethodCall call) async {
     switch (call.method) {
       case 'camera#onMoveStarted':
-        _isCameraMoving = true;
-        notifyListeners();
+        if (_googleMapState.widget.onCameraMoveStarted != null) {
+          _googleMapState.widget.onCameraMoveStarted();
+        }
         break;
       case 'camera#onMove':
-        _cameraPosition = CameraPosition.fromMap(call.arguments['position']);
-        notifyListeners();
+        if (_googleMapState.widget.onCameraMove != null) {
+          _googleMapState.widget.onCameraMove(
+            CameraPosition.fromMap(call.arguments['position']),
+          );
+        }
         break;
       case 'camera#onIdle':
-        _isCameraMoving = false;
-        notifyListeners();
+        if (_googleMapState.widget.onCameraIdle != null) {
+          _googleMapState.widget.onCameraIdle();
+        }
         break;
       case 'marker#onTap':
         _googleMapState.onMarkerTap(call.arguments['markerId']);
@@ -92,14 +79,12 @@ class GoogleMapController extends ChangeNotifier {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
-    final dynamic json = await _channel.invokeMethod(
+    await _channel.invokeMethod(
       'map#update',
       <String, dynamic>{
         'options': optionsUpdate,
       },
     );
-    _cameraPosition = CameraPosition.fromMap(json);
-    notifyListeners();
   }
 
   /// Updates marker configuration.
@@ -117,7 +102,6 @@ class GoogleMapController extends ChangeNotifier {
       'markers#update',
       markerUpdates._toMap(),
     );
-    notifyListeners();
   }
 
   /// Starts an animated change of the map camera position.
diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/lib/src/google_map.dart
index 365ac0c00148..fca62f1ca5b7 100644
--- a/packages/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/lib/src/google_map.dart
@@ -6,6 +6,15 @@ part of google_maps_flutter;
 
 typedef void MapCreatedCallback(GoogleMapController controller);
 
+/// Callback that receives updates to the camera position.
+///
+/// This callback is triggered when the platform Google Map
+/// registers a camera movement. This will be called with null if
+/// [GoogleMap.trackCameraPosition] is false.
+///
+/// This is used in [GoogleMap.onCameraMove] and [GoogleMap.onMapOptionsUpdate].
+typedef void CameraPositionCallback(CameraPosition position);
+
 class GoogleMap extends StatefulWidget {
   const GoogleMap({
     @required this.initialCameraPosition,
@@ -22,6 +31,9 @@ class GoogleMap extends StatefulWidget {
     this.trackCameraPosition = false,
     this.myLocationEnabled = false,
     this.markers,
+    this.onCameraMoveStarted,
+    this.onCameraMove,
+    this.onCameraIdle,
   }) : assert(initialCameraPosition != null);
 
   final MapCreatedCallback onMapCreated;
@@ -58,9 +70,34 @@ class GoogleMap extends StatefulWidget {
   /// True if the map view should relay camera move events to Flutter.
   final bool trackCameraPosition;
 
-  // Markers to be placed on the map.
+  /// Markers to be placed on the map.
   final Set<Marker> markers;
 
+  /// Called when the camera starts moving.
+  ///
+  /// This can be initiated by the following:
+  /// 1. Non-gesture animation initiated in response to user actions.
+  ///    For example: zoom buttons, my location button, or marker clicks.
+  /// 2. Programmatically initiated animation.
+  /// 3. Camera motion initiated in response to user gestures on the map.
+  ///    For example: pan, tilt, pinch to zoom, or rotate.
+  ///
+  /// Note: This is callback is called even if [trackCameraPosition] is false.
+  final VoidCallback onCameraMoveStarted;
+
+  /// Called repeatedly as the camera continues to move after an
+  /// onCameraMoveStarted call.
+  ///
+  /// This may be called as often as once every frame and should
+  /// not perform expensive operations.
+  ///
+  /// This is only called if [trackCameraPosition] is true.
+  final CameraPositionCallback onCameraMove;
+
+  /// Called when camera movement has ended, there are no pending
+  /// animations and the user has stopped interacting with the map.
+  final VoidCallback onCameraIdle;
+
   /// True if a "My Location" layer should be shown on the map.
   ///
   /// This layer includes a location indicator at the current device location,
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 4aadb3f9c1a6..81169e44ff68 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.3.0+3
+version: 0.4.0
 
 dependencies:
   flutter:

From 808a596755c16e8f37f9c65e85160b583ff1e24c Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Tue, 5 Mar 2019 16:12:48 -0800
Subject: [PATCH 199/410] trackCameraPosition is inferred from
 GoogleMap.onCameraMove (#1314)

* trackCameraPosition is inferred from GoogleMap.onCameraMove

* Update changelog

* update test

* format
---
 packages/google_maps_flutter/CHANGELOG.md         |  1 +
 .../google_maps_flutter/example/lib/map_ui.dart   |  1 -
 .../google_maps_flutter/lib/src/google_map.dart   | 15 +++------------
 .../google_maps_flutter/test/google_map_test.dart |  8 ++++----
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 36915e553bd0..f02bb0961266 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Change events are call backs on GoogleMap widget.
 * GoogleMapController no longer handles change events.
+* trackCameraPosition is inferred from GoogleMap.onCameraMove being set.
 
 ## 0.3.0+3
 
diff --git a/packages/google_maps_flutter/example/lib/map_ui.dart b/packages/google_maps_flutter/example/lib/map_ui.dart
index 486d87b9073c..d3661218578e 100644
--- a/packages/google_maps_flutter/example/lib/map_ui.dart
+++ b/packages/google_maps_flutter/example/lib/map_ui.dart
@@ -175,7 +175,6 @@ class MapUiBodyState extends State<MapUiBody> {
     final GoogleMap googleMap = GoogleMap(
       onMapCreated: onMapCreated,
       initialCameraPosition: _kInitialPosition,
-      trackCameraPosition: true,
       compassEnabled: _compassEnabled,
       cameraTargetBounds: _cameraTargetBounds,
       minMaxZoomPreference: _minMaxZoomPreference,
diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/lib/src/google_map.dart
index fca62f1ca5b7..9f609c131d13 100644
--- a/packages/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/lib/src/google_map.dart
@@ -9,10 +9,9 @@ typedef void MapCreatedCallback(GoogleMapController controller);
 /// Callback that receives updates to the camera position.
 ///
 /// This callback is triggered when the platform Google Map
-/// registers a camera movement. This will be called with null if
-/// [GoogleMap.trackCameraPosition] is false.
+/// registers a camera movement.
 ///
-/// This is used in [GoogleMap.onCameraMove] and [GoogleMap.onMapOptionsUpdate].
+/// This is used in [GoogleMap.onCameraMove].
 typedef void CameraPositionCallback(CameraPosition position);
 
 class GoogleMap extends StatefulWidget {
@@ -28,7 +27,6 @@ class GoogleMap extends StatefulWidget {
     this.scrollGesturesEnabled = true,
     this.zoomGesturesEnabled = true,
     this.tiltGesturesEnabled = true,
-    this.trackCameraPosition = false,
     this.myLocationEnabled = false,
     this.markers,
     this.onCameraMoveStarted,
@@ -67,9 +65,6 @@ class GoogleMap extends StatefulWidget {
   /// True if the map view should respond to tilt gestures.
   final bool tiltGesturesEnabled;
 
-  /// True if the map view should relay camera move events to Flutter.
-  final bool trackCameraPosition;
-
   /// Markers to be placed on the map.
   final Set<Marker> markers;
 
@@ -81,8 +76,6 @@ class GoogleMap extends StatefulWidget {
   /// 2. Programmatically initiated animation.
   /// 3. Camera motion initiated in response to user gestures on the map.
   ///    For example: pan, tilt, pinch to zoom, or rotate.
-  ///
-  /// Note: This is callback is called even if [trackCameraPosition] is false.
   final VoidCallback onCameraMoveStarted;
 
   /// Called repeatedly as the camera continues to move after an
@@ -90,8 +83,6 @@ class GoogleMap extends StatefulWidget {
   ///
   /// This may be called as often as once every frame and should
   /// not perform expensive operations.
-  ///
-  /// This is only called if [trackCameraPosition] is true.
   final CameraPositionCallback onCameraMove;
 
   /// Called when camera movement has ended, there are no pending
@@ -259,7 +250,7 @@ class _GoogleMapOptions {
       rotateGesturesEnabled: map.rotateGesturesEnabled,
       scrollGesturesEnabled: map.scrollGesturesEnabled,
       tiltGesturesEnabled: map.tiltGesturesEnabled,
-      trackCameraPosition: map.trackCameraPosition,
+      trackCameraPosition: map.onCameraMove != null,
       zoomGesturesEnabled: map.zoomGesturesEnabled,
       myLocationEnabled: map.myLocationEnabled,
     );
diff --git a/packages/google_maps_flutter/test/google_map_test.dart b/packages/google_maps_flutter/test/google_map_test.dart
index 50c36744f607..833ae0cece0f 100644
--- a/packages/google_maps_flutter/test/google_map_test.dart
+++ b/packages/google_maps_flutter/test/google_map_test.dart
@@ -303,7 +303,6 @@ void main() {
         textDirection: TextDirection.ltr,
         child: GoogleMap(
           initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
-          trackCameraPosition: false,
         ),
       ),
     );
@@ -314,11 +313,12 @@ void main() {
     expect(platformGoogleMap.trackCameraPosition, false);
 
     await tester.pumpWidget(
-      const Directionality(
+      Directionality(
         textDirection: TextDirection.ltr,
         child: GoogleMap(
-          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
-          trackCameraPosition: true,
+          initialCameraPosition:
+              const CameraPosition(target: LatLng(10.0, 15.0)),
+          onCameraMove: (CameraPosition position) {},
         ),
       ),
     );

From e87c493ac9c24a64e53f3f0e84f8c9af42740ee6 Mon Sep 17 00:00:00 2001
From: Elliot Hesp <elliot.hesp@gmail.com>
Date: Wed, 6 Mar 2019 13:48:43 +0000
Subject: [PATCH 200/410] [firebase_analytics] Add resetAnalyticsData method
 (#1311)

Add support for analytics.resetAnalyticsData
---
 AUTHORS                                                   | 1 +
 packages/firebase_analytics/CHANGELOG.md                  | 4 ++++
 .../firebaseanalytics/FirebaseAnalyticsPlugin.java        | 8 ++++++++
 .../ios/Classes/FirebaseAnalyticsPlugin.m                 | 3 +++
 packages/firebase_analytics/lib/firebase_analytics.dart   | 8 ++++++++
 packages/firebase_analytics/pubspec.yaml                  | 2 +-
 .../firebase_analytics/test/firebase_analytics_test.dart  | 5 +++++
 7 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index ecc2c3e512b1..7d26d11e1d4c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,3 +25,4 @@ Tuyển Vũ Xuân <netsoft1985@gmail.com>
 Sarthak Verma <sarthak@artiosys.com>
 Mike Diarmid <mike@invertase.io>
 Invertase <oss@invertase.io>
+Elliot Hesp <elliot@invertase.io>
diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index 4642488475d9..b13e21e93f5f 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.3
+
+* Add resetAnalyticsData method
+
 ## 2.0.2+1
 
 * Log messages about automatic configuration of the default app are now less confusing.
diff --git a/packages/firebase_analytics/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java b/packages/firebase_analytics/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java
index 8255b3fc5efa..7215afb1e73b 100755
--- a/packages/firebase_analytics/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java
+++ b/packages/firebase_analytics/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java
@@ -56,6 +56,9 @@ public void onMethodCall(MethodCall call, Result result) {
       case "setUserProperty":
         handleSetUserProperty(call, result);
         break;
+      case "resetAnalyticsData":
+        handleResetAnalyticsData(call, result);
+        break;
       default:
         result.notImplemented();
         break;
@@ -123,6 +126,11 @@ private void handleSetUserProperty(MethodCall call, Result result) {
     result.success(null);
   }
 
+  private void handleResetAnalyticsData(MethodCall call, Result result) {
+    firebaseAnalytics.resetAnalyticsData();
+    result.success(null);
+  }
+
   private static Bundle createBundleFromMap(Map<String, Object> map) {
     if (map == null) {
       return null;
diff --git a/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m b/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m
index 6ae3d92d3952..5567dbda64b4 100644
--- a/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m
+++ b/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m
@@ -59,6 +59,9 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     NSNumber *enabled = [NSNumber numberWithBool:call.arguments];
     [[FIRAnalyticsConfiguration sharedInstance] setAnalyticsCollectionEnabled:[enabled boolValue]];
     result(nil);
+  } else if ([@"resetAnalyticsData" isEqualToString:call.method]) {
+    [FIRAnalytics resetAnalyticsData];
+    result(nil);
   } else {
     result(FlutterMethodNotImplemented);
   }
diff --git a/packages/firebase_analytics/lib/firebase_analytics.dart b/packages/firebase_analytics/lib/firebase_analytics.dart
index de7a0d81e4a1..02e4dc5c4cda 100755
--- a/packages/firebase_analytics/lib/firebase_analytics.dart
+++ b/packages/firebase_analytics/lib/firebase_analytics.dart
@@ -160,6 +160,14 @@ class FirebaseAnalytics {
     });
   }
 
+  /// Clears all analytics data for this app from the device and resets the app instance id.
+  Future<void> resetAnalyticsData() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    await _channel.invokeMethod('resetAnalyticsData');
+  }
+
   /// Logs the standard `add_payment_info` event.
   ///
   /// This event signifies that a user has submitted their payment information
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index 6ca58cdcc1cd..852f88e02d87 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 2.0.2+1
+version: 2.0.3
 
 flutter:
   plugin:
diff --git a/packages/firebase_analytics/test/firebase_analytics_test.dart b/packages/firebase_analytics/test/firebase_analytics_test.dart
index 2c0339e34e51..13c731421662 100755
--- a/packages/firebase_analytics/test/firebase_analytics_test.dart
+++ b/packages/firebase_analytics/test/firebase_analytics_test.dart
@@ -114,6 +114,11 @@ void main() {
       expect(invokedMethod, 'setSessionTimeoutDuration');
       expect(arguments, 234);
     });
+
+    test('resetAnalyticsData', () async {
+      await analytics.resetAnalyticsData();
+      expect(invokedMethod, 'resetAnalyticsData');
+    });
   });
 
   group('$FirebaseAnalytics analytics events', () {

From 5567a9c8d4caf6e7b53d5e6b593d872681fa0586 Mon Sep 17 00:00:00 2001
From: Chris Yang <cyang8954@gmail.com>
Date: Wed, 6 Mar 2019 09:46:00 -0800
Subject: [PATCH 201/410] [in_app_purchase]retrieve receipt (#1303)

Retrieve receipt data. The data can be retrieve as a base 64 string or dictionary. User can use base 64 string to validate the purchase with App Store; use dictionary to validate purchase locally.
Part of flutter/flutter#26326
---
 .../InAppPurchasePluginTest.m                 | 34 +++++++++-
 .../ProductRequestHandlerTest.m               | 33 ++++++++++
 .../ios/in_app_purchase_pluginTests/Stubs.h   |  8 +++
 .../ios/in_app_purchase_pluginTests/Stubs.m   | 39 ++++++++++-
 .../ios/Classes/FIAPReceiptManager.h          | 17 +++++
 .../ios/Classes/FIAPReceiptManager.m          | 29 +++++++++
 .../ios/Classes/FIAPRequestHandler.h          |  2 +-
 .../ios/Classes/FIAPRequestHandler.m          | 11 +++-
 .../ios/Classes/InAppPurchasePlugin.h         |  3 +
 .../ios/Classes/InAppPurchasePlugin.m         | 64 ++++++++++++++++++-
 .../sk_receipt_manager.dart                   | 21 ++++++
 .../store_kit_wrappers/sk_request_maker.dart  | 16 +++++
 .../lib/store_kit_wrappers.dart               |  1 +
 .../sk_receipt_manager_test.dart              | 26 ++++++++
 14 files changed, 297 insertions(+), 7 deletions(-)
 create mode 100644 packages/in_app_purchase/ios/Classes/FIAPReceiptManager.h
 create mode 100644 packages/in_app_purchase/ios/Classes/FIAPReceiptManager.m
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_receipt_manager.dart
 create mode 100644 packages/in_app_purchase/test/store_kit_wrappers/sk_receipt_manager_test.dart

diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
index fcfc3133291f..db7c1a88a4c8 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/InAppPurchasePluginTest.m
@@ -16,7 +16,8 @@ @interface InAppPurchasePluginTest : XCTestCase
 @implementation InAppPurchasePluginTest
 
 - (void)setUp {
-  self.plugin = [[InAppPurchasePluginStub alloc] init];
+  self.plugin =
+      [[InAppPurchasePluginStub alloc] initWithReceiptManager:[FIAPReceiptManagerStub new]];
 }
 
 - (void)tearDown {
@@ -171,4 +172,35 @@ - (void)testRestoreTransactions {
   XCTAssertTrue(callbackInvoked);
 }
 
+- (void)testRetrieveReceiptData {
+  XCTestExpectation* expectation = [self expectationWithDescription:@"receipt data retrieved"];
+  FlutterMethodCall* call = [FlutterMethodCall
+      methodCallWithMethodName:@"-[InAppPurchasePlugin retrieveReceiptData:result:]"
+                     arguments:nil];
+  __block NSDictionary* result;
+  [self.plugin handleMethodCall:call
+                         result:^(id r) {
+                           result = r;
+                           [expectation fulfill];
+                         }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  NSLog(@"%@", result);
+  XCTAssertNotNil(result);
+}
+
+- (void)testRefreshReceiptRequest {
+  XCTestExpectation* expectation = [self expectationWithDescription:@"expect success"];
+  FlutterMethodCall* call =
+      [FlutterMethodCall methodCallWithMethodName:@"-[InAppPurchasePlugin refreshReceipt:result:]"
+                                        arguments:nil];
+  __block BOOL result = NO;
+  [self.plugin handleMethodCall:call
+                         result:^(id r) {
+                           result = YES;
+                           [expectation fulfill];
+                         }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertTrue(result);
+}
+
 @end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/ProductRequestHandlerTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/ProductRequestHandlerTest.m
index a0eb4704200b..09228a3cd4e3 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/ProductRequestHandlerTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/ProductRequestHandlerTest.m
@@ -52,4 +52,37 @@ - (void)testRequestHandlerWithProductRequestFailure {
   XCTAssertNil(response);
 }
 
+- (void)testRequestHandlerWithRefreshReceiptSuccess {
+  SKReceiptRefreshRequestStub *request =
+      [[SKReceiptRefreshRequestStub alloc] initWithReceiptProperties:nil];
+  FIAPRequestHandler *handler = [[FIAPRequestHandler alloc] initWithRequest:request];
+  XCTestExpectation *expectation = [self expectationWithDescription:@"expect no error"];
+  __block NSError *e;
+  [handler
+      startProductRequestWithCompletionHandler:^(SKProductsResponse *_Nullable r, NSError *error) {
+        e = error;
+        [expectation fulfill];
+      }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertNil(e);
+}
+
+- (void)testRequestHandlerWithRefreshReceiptFailure {
+  SKReceiptRefreshRequestStub *request = [[SKReceiptRefreshRequestStub alloc]
+      initWithFailureError:[NSError errorWithDomain:@"test" code:123 userInfo:@{}]];
+  FIAPRequestHandler *handler = [[FIAPRequestHandler alloc] initWithRequest:request];
+  XCTestExpectation *expectation = [self expectationWithDescription:@"expect error"];
+  __block NSError *error;
+  __block SKProductsResponse *response;
+  [handler startProductRequestWithCompletionHandler:^(SKProductsResponse *_Nullable r, NSError *e) {
+    error = e;
+    response = r;
+    [expectation fulfill];
+  }];
+  [self waitForExpectations:@[ expectation ] timeout:5];
+  XCTAssertNotNil(error);
+  XCTAssertEqual(error.domain, @"test");
+  XCTAssertNil(response);
+}
+
 @end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
index 9ea6e6a54868..fe943a40a156 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
@@ -4,6 +4,7 @@
 
 #import <Foundation/Foundation.h>
 #import <StoreKit/StoreKit.h>
+#import "FIAPReceiptManager.h"
 #import "FIAPRequestHandler.h"
 #import "InAppPurchasePlugin.h"
 
@@ -53,4 +54,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithMap:(NSDictionary *)map;
 @end
 
+@interface FIAPReceiptManagerStub : FIAPReceiptManager
+@end
+
+@interface SKReceiptRefreshRequestStub : SKReceiptRefreshRequest
+- (instancetype)initWithFailureError:(NSError *)error;
+@end
+
 NS_ASSUME_NONNULL_END
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
index 02d9ea6c8385..338213bce212 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
@@ -98,7 +98,6 @@ - (void)start {
   } else {
     [self.delegate productsRequest:self didReceiveResponse:response];
   }
-  [self.delegate requestDidFinish:self];
 }
 
 @end
@@ -134,6 +133,10 @@ - (SKProduct *)getProduct:(NSString *)productID {
   return [SKProduct new];
 }
 
+- (SKReceiptRefreshRequestStub *)getRefreshReceiptRequest:(NSDictionary *)properties {
+  return [[SKReceiptRefreshRequestStub alloc] initWithReceiptProperties:properties];
+}
+
 @end
 
 @interface SKPaymentQueueStub ()
@@ -235,3 +238,37 @@ - (instancetype)initWithMap:(NSDictionary *)map {
 }
 
 @end
+
+@implementation FIAPReceiptManagerStub : FIAPReceiptManager
+
+- (NSData *)getReceiptData:(NSURL *)url {
+  NSString *originalString = [NSString stringWithFormat:@"test"];
+  return [[NSData alloc] initWithBase64EncodedString:originalString options:kNilOptions];
+}
+
+@end
+
+@implementation SKReceiptRefreshRequestStub {
+  NSError *_error;
+}
+
+- (instancetype)initWithReceiptProperties:(NSDictionary<NSString *, id> *)properties {
+  self = [super initWithReceiptProperties:properties];
+  return self;
+}
+
+- (instancetype)initWithFailureError:(NSError *)error {
+  self = [super init];
+  _error = error;
+  return self;
+}
+
+- (void)start {
+  if (_error) {
+    [self.delegate request:self didFailWithError:_error];
+  } else {
+    [self.delegate requestDidFinish:self];
+  }
+}
+
+@end
diff --git a/packages/in_app_purchase/ios/Classes/FIAPReceiptManager.h b/packages/in_app_purchase/ios/Classes/FIAPReceiptManager.h
new file mode 100644
index 000000000000..2e7d4e55212e
--- /dev/null
+++ b/packages/in_app_purchase/ios/Classes/FIAPReceiptManager.h
@@ -0,0 +1,17 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class FlutterError;
+
+@interface FIAPReceiptManager : NSObject
+
+- (NSString *)retrieveReceiptWithError:(FlutterError **)error;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/packages/in_app_purchase/ios/Classes/FIAPReceiptManager.m b/packages/in_app_purchase/ios/Classes/FIAPReceiptManager.m
new file mode 100644
index 000000000000..20043e2a3237
--- /dev/null
+++ b/packages/in_app_purchase/ios/Classes/FIAPReceiptManager.m
@@ -0,0 +1,29 @@
+//
+//  FIAPReceiptManager.m
+//  in_app_purchase
+//
+//  Created by Chris Yang on 3/2/19.
+//
+
+#import "FIAPReceiptManager.h"
+#import <Flutter/Flutter.h>
+
+@implementation FIAPReceiptManager
+
+- (NSString *)retrieveReceiptWithError:(FlutterError **)error {
+  NSURL *receiptURL = [[NSBundle mainBundle] appStoreReceiptURL];
+  NSData *receipt = [self getReceiptData:receiptURL];
+  if (!receipt) {
+    *error = [FlutterError errorWithCode:@"storekit_no_receipt"
+                                 message:@"Cannot find receipt for the current main bundle."
+                                 details:nil];
+    return nil;
+  }
+  return [receipt base64EncodedStringWithOptions:kNilOptions];
+}
+
+- (NSData *)getReceiptData:(NSURL *)url {
+  return [NSData dataWithContentsOfURL:url];
+}
+
+@end
diff --git a/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.h b/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.h
index a4f7cb484b5c..892f5f013cc9 100644
--- a/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.h
+++ b/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.h
@@ -12,7 +12,7 @@ typedef void (^ProductRequestCompletion)(SKProductsResponse *_Nullable response,
 
 @interface FIAPRequestHandler : NSObject
 
-- (instancetype)initWithRequest:(SKProductsRequest *)request;
+- (instancetype)initWithRequest:(SKRequest *)request;
 - (void)startProductRequestWithCompletionHandler:(ProductRequestCompletion)completion;
 
 @end
diff --git a/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.m b/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.m
index e3d97e0e4338..5dc2cea2e9db 100644
--- a/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.m
+++ b/packages/in_app_purchase/ios/Classes/FIAPRequestHandler.m
@@ -10,13 +10,13 @@
 @interface FIAPRequestHandler () <SKProductsRequestDelegate>
 
 @property(copy, nonatomic) ProductRequestCompletion completion;
-@property(strong, nonatomic) SKProductsRequest *request;
+@property(strong, nonatomic) SKRequest *request;
 
 @end
 
 @implementation FIAPRequestHandler
 
-- (instancetype)initWithRequest:(SKProductsRequest *)request {
+- (instancetype)initWithRequest:(SKRequest *)request {
   self = [super init];
   if (self) {
     self.request = request;
@@ -34,11 +34,16 @@ - (void)productsRequest:(SKProductsRequest *)request
      didReceiveResponse:(SKProductsResponse *)response {
   if (self.completion) {
     self.completion(response, nil);
+    // set the completion to nil here so self.completion won't be triggered again in
+    // requestDidFinish for SKProductRequest.
+    self.completion = nil;
   }
 }
 
-// Reserved for other SKRequests.
 - (void)requestDidFinish:(SKRequest *)request {
+  if (self.completion) {
+    self.completion(nil, nil);
+  }
 }
 
 - (void)request:(SKRequest *)request didFailWithError:(NSError *)error {
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
index f7abae534fca..67a381d31283 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.h
@@ -4,9 +4,12 @@
 
 #import <Flutter/Flutter.h>
 @class FIAPaymentQueueHandler;
+@class FIAPReceiptManager;
 
 @interface InAppPurchasePlugin : NSObject <FlutterPlugin>
 
 @property(strong, nonatomic) FIAPaymentQueueHandler *paymentQueueHandler;
 
+- (instancetype)initWithReceiptManager:(FIAPReceiptManager *)receiptManager;
+
 @end
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
index c139679932bf..5464eba1aa0b 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
@@ -5,6 +5,7 @@
 #import "InAppPurchasePlugin.h"
 #import <StoreKit/StoreKit.h>
 #import "FIAObjectTranslator.h"
+#import "FIAPReceiptManager.h"
 #import "FIAPRequestHandler.h"
 #import "FIAPaymentQueueHandler.h"
 
@@ -24,6 +25,8 @@ @interface InAppPurchasePlugin ()
 @property(strong, nonatomic) NSObject<FlutterBinaryMessenger> *messenger;
 @property(strong, nonatomic) NSObject<FlutterPluginRegistrar> *registrar;
 
+@property(strong, nonatomic) FIAPReceiptManager *receiptManager;
+
 @end
 
 @implementation InAppPurchasePlugin
@@ -36,11 +39,18 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   [registrar addMethodCallDelegate:instance channel:channel];
 }
 
-- (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
+- (instancetype)initWithReceiptManager:(FIAPReceiptManager *)receiptManager {
   self = [self init];
+  self.receiptManager = receiptManager;
+  return self;
+}
+
+- (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
+  self = [self initWithReceiptManager:[FIAPReceiptManager new]];
   self.registrar = registrar;
   self.registry = [registrar textures];
   self.messenger = [registrar messenger];
+
   __weak typeof(self) weakSelf = self;
   self.paymentQueueHandler =
       [[FIAPaymentQueueHandler alloc] initWithQueue:[SKPaymentQueue defaultQueue]
@@ -79,6 +89,10 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [self finishTransaction:call result:result];
   } else if ([@"-[InAppPurchasePlugin restoreTransactions:result:]" isEqualToString:call.method]) {
     [self restoreTransactions:call result:result];
+  } else if ([@"-[InAppPurchasePlugin retrieveReceiptData:result:]" isEqualToString:call.method]) {
+    [self retrieveReceiptData:call result:result];
+  } else if ([@"-[InAppPurchasePlugin refreshReceipt:result:]" isEqualToString:call.method]) {
+    [self refreshReceipt:call result:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -206,6 +220,50 @@ - (void)restoreTransactions:(FlutterMethodCall *)call result:(FlutterResult)resu
   [self.paymentQueueHandler restoreTransactions:call.arguments];
 }
 
+- (void)retrieveReceiptData:(FlutterMethodCall *)call result:(FlutterResult)result {
+  FlutterError *error = nil;
+  NSString *receiptData = [self.receiptManager retrieveReceiptWithError:&error];
+  if (error) {
+    result(error);
+    return;
+  }
+  result(receiptData);
+}
+
+- (void)refreshReceipt:(FlutterMethodCall *)call result:(FlutterResult)result {
+  NSDictionary *arguments = call.arguments;
+  SKReceiptRefreshRequest *request;
+  if (arguments) {
+    if (![arguments isKindOfClass:[NSDictionary class]]) {
+      result([FlutterError errorWithCode:@"storekit_invalid_argument"
+                                 message:@"Argument type of startRequest is not array"
+                                 details:call.arguments]);
+      return;
+    }
+    NSMutableDictionary *properties = [NSMutableDictionary new];
+    properties[SKReceiptPropertyIsExpired] = arguments[@"isExpired"];
+    properties[SKReceiptPropertyIsRevoked] = arguments[@"isRevoked"];
+    properties[SKReceiptPropertyIsVolumePurchase] = arguments[@"isVolumePurchase"];
+    request = [self getRefreshReceiptRequest:properties];
+  } else {
+    request = [self getRefreshReceiptRequest:nil];
+  }
+  FIAPRequestHandler *handler = [[FIAPRequestHandler alloc] initWithRequest:request];
+  [self.requestHandlers addObject:handler];
+  __weak typeof(self) weakSelf = self;
+  [handler startProductRequestWithCompletionHandler:^(SKProductsResponse *_Nullable response,
+                                                      NSError *_Nullable error) {
+    if (error) {
+      result([FlutterError errorWithCode:@"storekit_refreshreceiptrequest_platform_error"
+                                 message:error.description
+                                 details:error.userInfo]);
+      return;
+    }
+    result(nil);
+    [weakSelf.requestHandlers removeObject:handler];
+  }];
+}
+
 #pragma mark - delegates
 
 - (void)handleTransactionsUpdated:(NSArray<SKPaymentTransaction *> *)transactions {
@@ -267,6 +325,10 @@ - (SKProduct *)getProduct:(NSString *)productID {
   return [self.productsCache objectForKey:productID];
 }
 
+- (SKReceiptRefreshRequest *)getRefreshReceiptRequest:(NSDictionary *)properties {
+  return [[SKReceiptRefreshRequest alloc] initWithReceiptProperties:properties];
+}
+
 #pragma mark - getter
 
 - (NSSet *)requestHandlers {
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_receipt_manager.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_receipt_manager.dart
new file mode 100644
index 000000000000..eed09f1835ef
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_receipt_manager.dart
@@ -0,0 +1,21 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'package:in_app_purchase/src/channel.dart';
+
+///This class contains static methods to manage StoreKit receipts.
+class SKReceiptManager {
+  /// Retrieve the receipt data from your application's main bundle.
+  ///
+  /// The receipt data will be based64 encoded. The structure of the payload is defined using ASN.1.
+  /// You can use the receipt data retrieved by this method to validate users' purchases.
+  /// There are 2 ways to do so. Either validate locally or validate with App Store.
+  /// For more details on how to validate the receipt data, you can refer to Apple's document about [`About Receipt Validation`](https://developer.apple.com/library/archive/releasenotes/General/ValidateAppStoreReceipt/Introduction.html#//apple_ref/doc/uid/TP40010573-CH105-SW1).
+  /// If the receipt is invalid or missing, you can use [SKRequestMaker.startRefreshReceiptRequest] to request a new receipt.
+  Future<String> retrieveReceiptData() {
+    return channel
+        .invokeMethod('-[InAppPurchasePlugin retrieveReceiptData:result:]');
+  }
+}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart
index 295e7277315a..353d34e5f9be 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart
@@ -36,4 +36,20 @@ class SKRequestMaker {
     }
     return SkProductResponseWrapper.fromJson(productResponseMap);
   }
+
+  /// Uses [SKReceiptRefreshRequest](https://developer.apple.com/documentation/storekit/skreceiptrefreshrequest?language=objc) to request a new receipt.
+  ///
+  /// If the receipt is invalid or missing, you can use this API to request a new receipt.
+  /// The [receiptProperties] is optional and it exists only for [sandbox testing](https://developer.apple.com/apple-pay/sandbox-testing/). In the production app, call this API without pass in the [receiptProperties] parameter.
+  /// To test in the sandbox, you can request a receipt with any combination of properties to test the state transitions related to [`Volume Purchase Plan`](https://www.apple.com/business/site/docs/VPP_Business_Guide.pdf) receipts.
+  /// The valid keys in the receiptProperties are below (All of them are of type bool):
+  /// * isExpired: whether the receipt is expired.
+  /// * isRevoked: whether the receipt has been revoked.
+  /// * isVolumePurchase: whether the receipt is a Volume Purchase Plan receipt.
+  Future<void> startRefreshReceiptRequest({Map receiptProperties}) {
+    return channel.invokeMethod(
+      '-[InAppPurchasePlugin refreshReceipt:result:]',
+      receiptProperties,
+    );
+  }
 }
diff --git a/packages/in_app_purchase/lib/store_kit_wrappers.dart b/packages/in_app_purchase/lib/store_kit_wrappers.dart
index 49d1b0d163c0..c2a770e6ac8e 100644
--- a/packages/in_app_purchase/lib/store_kit_wrappers.dart
+++ b/packages/in_app_purchase/lib/store_kit_wrappers.dart
@@ -5,3 +5,4 @@
 export 'src/store_kit_wrappers/sk_payment_queue_wrapper.dart';
 export 'src/store_kit_wrappers/sk_product_wrapper.dart';
 export 'src/store_kit_wrappers/sk_request_maker.dart';
+export 'src/store_kit_wrappers//sk_receipt_manager.dart';
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_receipt_manager_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_receipt_manager_test.dart
new file mode 100644
index 000000000000..b35fd903b8ec
--- /dev/null
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_receipt_manager_test.dart
@@ -0,0 +1,26 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/test.dart';
+import 'package:in_app_purchase/src/store_kit_wrappers/sk_receipt_manager.dart';
+import 'package:in_app_purchase/src/channel.dart';
+
+import '../stub_in_app_purchase_platform.dart';
+
+void main() {
+  final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
+
+  setUpAll(() =>
+      channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
+
+  group('retrieveReceiptData', () {
+    test('Should get result', () async {
+      stubPlatform.addResponse(
+          name: '-[InAppPurchasePlugin retrieveReceiptData:result:]',
+          value: 'dummy data');
+      final String result = await SKReceiptManager().retrieveReceiptData();
+      expect(result, 'dummy data');
+    });
+  });
+}

From f8078a5ed134a175ad8422c79e05d6d310df4138 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 6 Mar 2019 11:49:29 -0800
Subject: [PATCH 202/410] [cloud_functions] Specify version for CocoaPod and
 handle null regions gracefully (#1316)

* Fix for cloud_functions on iOS region is null

* Fix build errors due to ambiguous version

* Reformat

* Update example app firebase_core dependency
---
 packages/cloud_functions/CHANGELOG.md         |  6 ++
 packages/cloud_functions/example/pubspec.yaml |  2 +-
 .../ios/Classes/CloudFunctionsPlugin.m        | 62 +++++++++----------
 .../ios/cloud_functions.podspec               |  2 +-
 packages/cloud_functions/pubspec.yaml         |  2 +-
 5 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/packages/cloud_functions/CHANGELOG.md b/packages/cloud_functions/CHANGELOG.md
index 47cd49f8c1b1..24f1d31384ac 100644
--- a/packages/cloud_functions/CHANGELOG.md
+++ b/packages/cloud_functions/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.1.2
+
+* Specifying a version for Cloud Functions CocoaPod dependency to prevent build errors on iOS.
+* Fix on iOS when using a null region.
+* Upgrade the firebase_core dependency of the example app.
+
 ## 0.1.1+1
 
 * Log messages about automatic configuration of the default app are now less confusing.
diff --git a/packages/cloud_functions/example/pubspec.yaml b/packages/cloud_functions/example/pubspec.yaml
index 8510d72e0704..673eb83efc24 100644
--- a/packages/cloud_functions/example/pubspec.yaml
+++ b/packages/cloud_functions/example/pubspec.yaml
@@ -9,7 +9,7 @@ dependencies:
   cupertino_icons: ^0.1.2
   cloud_functions:
     path: ..
-  firebase_core: 0.3.0
+  firebase_core: ^0.3.1
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m b/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m
index 0ac54ac92459..192826cddcc5 100644
--- a/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m
+++ b/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m
@@ -41,42 +41,42 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     NSString *region = call.arguments[@"region"];
     FIRApp *app = [FIRApp appNamed:appName];
     FIRFunctions *functions;
-    if (region != nil) {
+    if (region != nil && region != (id)[NSNull null]) {
       functions = [FIRFunctions functionsForApp:app region:region];
     } else {
       functions = [FIRFunctions functionsForApp:app];
     }
-    [functions callFunction:functionName
-                 withObject:parameters
-                 completion:^(FIRHTTPSCallableResult *callableResult, NSError *error) {
-                   if (error) {
-                     FlutterError *flutterError;
-                     if (error.domain == FIRFunctionsErrorDomain) {
-                       NSDictionary *details = [NSMutableDictionary dictionary];
-                       [details setValue:[self mapFunctionsErrorCodes:error.code] forKey:@"code"];
-                       if (error.localizedDescription != nil) {
-                         [details setValue:error.localizedDescription forKey:@"message"];
-                       }
-                       if (error.userInfo[FIRFunctionsErrorDetailsKey] != nil) {
-                         [details setValue:error.userInfo[FIRFunctionsErrorDetailsKey]
-                                    forKey:@"details"];
-                       }
+    FIRHTTPSCallable *function = [functions HTTPSCallableWithName:functionName];
+    [function callWithObject:parameters
+                  completion:^(FIRHTTPSCallableResult *callableResult, NSError *error) {
+                    if (error) {
+                      FlutterError *flutterError;
+                      if (error.domain == FIRFunctionsErrorDomain) {
+                        NSDictionary *details = [NSMutableDictionary dictionary];
+                        [details setValue:[self mapFunctionsErrorCodes:error.code] forKey:@"code"];
+                        if (error.localizedDescription != nil) {
+                          [details setValue:error.localizedDescription forKey:@"message"];
+                        }
+                        if (error.userInfo[FIRFunctionsErrorDetailsKey] != nil) {
+                          [details setValue:error.userInfo[FIRFunctionsErrorDetailsKey]
+                                     forKey:@"details"];
+                        }
 
-                       flutterError =
-                           [FlutterError errorWithCode:@"functionsError"
-                                               message:@"Firebase function failed with exception."
-                                               details:details];
-                     } else {
-                       flutterError = [FlutterError
-                           errorWithCode:[NSString stringWithFormat:@"%ld", error.code]
-                                 message:error.localizedDescription
-                                 details:nil];
-                     }
-                     result(flutterError);
-                   } else {
-                     result(callableResult.data);
-                   }
-                 }];
+                        flutterError =
+                            [FlutterError errorWithCode:@"functionsError"
+                                                message:@"Firebase function failed with exception."
+                                                details:details];
+                      } else {
+                        flutterError = [FlutterError
+                            errorWithCode:[NSString stringWithFormat:@"%ld", error.code]
+                                  message:error.localizedDescription
+                                  details:nil];
+                      }
+                      result(flutterError);
+                    } else {
+                      result(callableResult.data);
+                    }
+                  }];
   } else {
     result(FlutterMethodNotImplemented);
   }
diff --git a/packages/cloud_functions/ios/cloud_functions.podspec b/packages/cloud_functions/ios/cloud_functions.podspec
index 6c1998dd7e1a..cd8a7727235e 100644
--- a/packages/cloud_functions/ios/cloud_functions.podspec
+++ b/packages/cloud_functions/ios/cloud_functions.podspec
@@ -17,7 +17,7 @@ A new flutter plugin project.
   s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
   s.dependency 'Firebase/Core'
-  s.dependency 'Firebase/Functions'
+  s.dependency 'Firebase/Functions', '~> 5.18'
   s.static_framework = true
 end
 
diff --git a/packages/cloud_functions/pubspec.yaml b/packages/cloud_functions/pubspec.yaml
index 4efaa4fbc660..7803052c8f40 100644
--- a/packages/cloud_functions/pubspec.yaml
+++ b/packages/cloud_functions/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cloud_functions
 description: Flutter plugin for Cloud Functions.
-version: 0.1.1+1
+version: 0.1.2
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_functions
 

From 87e2bdce70cda9e55f2176b9da0b73812864d550 Mon Sep 17 00:00:00 2001
From: Ali EP <p30arena@gmail.com>
Date: Wed, 6 Mar 2019 23:47:07 +0330
Subject: [PATCH 203/410] [camera] Fixes #28350 (#1261)

---
 packages/camera/CHANGELOG.md                       |  4 ++++
 .../io/flutter/plugins/camera/CameraPlugin.java    |  3 +++
 packages/camera/ios/Classes/CameraPlugin.m         |  1 +
 packages/camera/lib/camera.dart                    | 14 ++++++++++++--
 packages/camera/pubspec.yaml                       |  2 +-
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 403793276c66..5d349bd8998b 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.2
+
+* Add sensor orientation value to `CameraDescription`.
+
 ## 0.4.1
 
 * Camera methods are ran in a background thread on iOS.
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index 8cdc95e19790..7ab3c44f962a 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -164,6 +164,9 @@ public void onMethodCall(MethodCall call, final Result result) {
                 cameraManager.getCameraCharacteristics(cameraName);
             details.put("name", cameraName);
             @SuppressWarnings("ConstantConditions")
+            int sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
+            details.put("sensorOrientation", sensorOrientation);
+
             int lensFacing = characteristics.get(CameraCharacteristics.LENS_FACING);
             switch (lensFacing) {
               case CameraMetadata.LENS_FACING_FRONT:
diff --git a/packages/camera/ios/Classes/CameraPlugin.m b/packages/camera/ios/Classes/CameraPlugin.m
index 1f21e3c77f06..643f361689b2 100644
--- a/packages/camera/ios/Classes/CameraPlugin.m
+++ b/packages/camera/ios/Classes/CameraPlugin.m
@@ -670,6 +670,7 @@ - (void)handleMethodCallAsync:(FlutterMethodCall *)call result:(FlutterResult)re
       [reply addObject:@{
         @"name" : [device uniqueID],
         @"lensFacing" : lensFacing,
+        @"sensorOrientation" : @90,
       }];
     }
     result(reply);
diff --git a/packages/camera/lib/camera.dart b/packages/camera/lib/camera.dart
index cf636a199b1f..090e7767c95c 100644
--- a/packages/camera/lib/camera.dart
+++ b/packages/camera/lib/camera.dart
@@ -58,6 +58,7 @@ Future<List<CameraDescription>> availableCameras() async {
       return CameraDescription(
         name: camera['name'],
         lensDirection: _parseCameraLensDirection(camera['lensFacing']),
+        sensorOrientation: camera['sensorOrientation'],
       );
     }).toList();
   } on PlatformException catch (e) {
@@ -66,11 +67,20 @@ Future<List<CameraDescription>> availableCameras() async {
 }
 
 class CameraDescription {
-  CameraDescription({this.name, this.lensDirection});
+  CameraDescription({this.name, this.lensDirection, this.sensorOrientation});
 
   final String name;
   final CameraLensDirection lensDirection;
 
+  /// Clockwise angle through which the output image needs to be rotated to be upright on the device screen in its native orientation.
+  ///
+  /// **Range of valid values:**
+  /// 0, 90, 180, 270
+  ///
+  /// On Android, also defines the direction of rolling shutter readout, which
+  /// is from top to bottom in the sensor's coordinate system.
+  final int sensorOrientation;
+
   @override
   bool operator ==(Object o) {
     return o is CameraDescription &&
@@ -85,7 +95,7 @@ class CameraDescription {
 
   @override
   String toString() {
-    return '$runtimeType($name, $lensDirection)';
+    return '$runtimeType($name, $lensDirection, $sensorOrientation)';
   }
 }
 
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 831ad8601128..0abbf6a003aa 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.4.1
+version: 0.4.2
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From 5bea35b1c8afab37a49ac2dd7068114bf6fbbe94 Mon Sep 17 00:00:00 2001
From: Tarek BAZINE <et_bazine@esi.dz>
Date: Thu, 7 Mar 2019 18:02:17 +0100
Subject: [PATCH 204/410] [connectivity] Update README.md (#1201)

Fixed sample code in README.md.
---
 packages/connectivity/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/connectivity/README.md b/packages/connectivity/README.md
index de1cbea25a97..bae967dc42fb 100644
--- a/packages/connectivity/README.md
+++ b/packages/connectivity/README.md
@@ -30,14 +30,20 @@ exposed by connectivity plugin:
 ```dart
 import 'package:connectivity/connectivity.dart';
 
+@override
 initState() {
+  super.initState();
+  
   subscription = Connectivity().onConnectivityChanged.listen((ConnectivityResult result) {
     // Got a new connectivity status!
   })
 }
 
 // Be sure to cancel subscription after you are done
+@override
 dispose() {
+  super.dispose();
+  
   subscription.cancel();
 }
 ```

From 6d7b4592e5f37a6be2425a5e97391835c08db035 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Thu, 7 Mar 2019 10:57:36 -0800
Subject: [PATCH 205/410] [in_app_purchase] Adds Dart BillingClient APIs for
 loading purchases (#1286)

1. Wires the Purchase data class and serializes in to Dart.
2. BillingClient now required a callback for responding to Purchase
   updates to be passed in at construction time.
3. Exposes `BillingClient#queryPurchases` and
   `BillingClient#queryPurchaseHistory`.

For now GooglePlayConnection passes in a lambda that does nothing to
`BillingClient`. This will need to be fixed when all the collections are
updated.
---
 .../plugins/inapppurchase/Translator.java     |   1 +
 .../plugins/inapppurchase/TranslatorTest.java |   1 +
 .../lib/billing_client_wrappers.dart          |   1 +
 .../billing_client_wrapper.dart               |  73 +++++++++-
 .../purchase_wrapper.dart                     | 132 ++++++++++++++++++
 .../purchase_wrapper.g.dart                   |  28 ++++
 .../google_play_connection.dart               |   5 +-
 .../billing_client_wrapper_test.dart          | 105 +++++++++++++-
 .../purchase_wrapper_test.dart                |  67 +++++++++
 .../sku_details_wrapper_test.dart             |  14 +-
 .../google_play_connection_test.dart          |  12 +-
 11 files changed, 416 insertions(+), 23 deletions(-)
 create mode 100644 packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
 create mode 100644 packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart
 create mode 100644 packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart

diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
index faa55cb8ec5b..4502b7d43612 100644
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
@@ -56,6 +56,7 @@ static HashMap<String, Object> fromPurchase(Purchase purchase) {
     info.put("signature", purchase.getSignature());
     info.put("sku", purchase.getSku());
     info.put("isAutoRenewing", purchase.isAutoRenewing());
+    info.put("originalJson", purchase.getOriginalJson());
     return info;
   }
 
diff --git a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java
index 007ba8d5f600..639af24a9732 100644
--- a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java
+++ b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java
@@ -140,6 +140,7 @@ private void assertSerialized(Purchase expected, Map<String, Object> serialized)
     assertEquals(expected.getPurchaseTime(), serialized.get("purchaseTime"));
     assertEquals(expected.getPurchaseToken(), serialized.get("purchaseToken"));
     assertEquals(expected.getSignature(), serialized.get("signature"));
+    assertEquals(expected.getOriginalJson(), serialized.get("originalJson"));
     assertEquals(expected.getSku(), serialized.get("sku"));
   }
 }
diff --git a/packages/in_app_purchase/lib/billing_client_wrappers.dart b/packages/in_app_purchase/lib/billing_client_wrappers.dart
index e65225983642..127c980c15e6 100644
--- a/packages/in_app_purchase/lib/billing_client_wrappers.dart
+++ b/packages/in_app_purchase/lib/billing_client_wrappers.dart
@@ -3,4 +3,5 @@
 // found in the LICENSE file.
 
 export 'src/billing_client_wrappers/billing_client_wrapper.dart';
+export 'src/billing_client_wrappers/purchase_wrapper.dart';
 export 'src/billing_client_wrappers/sku_details_wrapper.dart';
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
index 99cf5fd00118..da1915f8e6c6 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
@@ -7,12 +7,33 @@ import 'package:flutter/services.dart';
 import 'package:flutter/foundation.dart';
 import 'package:json_annotation/json_annotation.dart';
 import '../channel.dart';
+import 'purchase_wrapper.dart';
 import 'sku_details_wrapper.dart';
 import 'enum_converters.dart';
 
+const String _kOnPurchasesUpdated =
+    'PurchasesUpdatedListener#onPurchasesUpdated(int, List<Purchase>)';
 const String _kOnBillingServiceDisconnected =
     'BillingClientStateListener#onBillingServiceDisconnected()';
 
+/// Callback triggered by Play in response to purchase activity.
+///
+/// This callback is triggered in response to all purchase activity while an
+/// instance of `BillingClient` is active. This includes purchases initiated by
+/// the app ([BillingClient.launchBillingFlow]) as well as purchases made in
+/// Play itself while this app is open.
+///
+/// This does not provide any hooks for purchases made in the past. See
+/// [BillingClient.queryPurchases] and [BillingClient.queryPurchaseHistory].
+///
+/// All purchase information should also be verified manually, with your server
+/// if at all possible. See ["Verify a
+/// purchase"](https://developer.android.com/google/play/billing/billing_library_overview#Verify).
+///
+/// Wraps a
+/// [`PurchasesUpdatedListener`](https://developer.android.com/reference/com/android/billingclient/api/PurchasesUpdatedListener.html).
+typedef void PurchasesUpdatedListener(PurchasesResultWrapper purchasesResult);
+
 /// This class can be used directly instead of [InAppPurchaseConnection] to call
 /// Play-specific billing APIs.
 ///
@@ -26,8 +47,10 @@ const String _kOnBillingServiceDisconnected =
 /// some minor changes to account for language differences. Callbacks have been
 /// converted to futures where appropriate.
 class BillingClient {
-  BillingClient() {
+  BillingClient(PurchasesUpdatedListener onPurchasesUpdated) {
+    assert(onPurchasesUpdated != null);
     channel.setMethodCallHandler(_callHandler);
+    _callbacks[_kOnPurchasesUpdated] = [onPurchasesUpdated];
   }
 
   // Occasionally methods in the native layer require a Dart callback to be
@@ -111,8 +134,8 @@ class BillingClient {
   /// to complete the transaction there.
   ///
   /// This method returns a [BillingResponse] representing the initial attempt
-  /// to show the Google Play purchase screen.
-  /// TODO(mklim, flutter/flutter#26326): Expose onPurchasesUpdated() result.
+  /// to show the Google Play billing flow. Actual purchase updates are
+  /// delivered via the [PurchasesUpdatedListener].
   ///
   /// This method calls through to
   /// [`BillingClient#launchBillingFlow`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient#launchbillingflow).
@@ -134,8 +157,52 @@ class BillingClient {
         arguments));
   }
 
+  /// Fetches recent purchases for the given [SkuType].
+  ///
+  /// This only fetches whatever purchase history Play happens to have cached
+  /// in memory.
+  ///
+  /// All purchase information should also be verified manually, with your server
+  /// if at all possible. See ["Verify a
+  /// purchase"](https://developer.android.com/google/play/billing/billing_library_overview#Verify).
+  ///
+  /// This wraps [`BillingClient#queryPurchases(String
+  /// skutype)`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient#querypurchases).
+  Future<PurchasesResultWrapper> queryPurchases(SkuType skuType) async {
+    assert(skuType != null);
+    return PurchasesResultWrapper.fromJson(await channel.invokeMapMethod(
+        'BillingClient#queryPurchases(String)',
+        <String, dynamic>{'skuType': SkuTypeConverter().toJson(skuType)}));
+  }
+
+  /// Fetches purchase history for the given [SkuType].
+  ///
+  /// This makes a network request via Play and returns the most recent purchase
+  /// for each [SkuDetailsWrapper] of the given [SkuType].
+  ///
+  /// All purchase information should also be verified manually, with your
+  /// server if at all possible. See ["Verify a
+  /// purchase"](https://developer.android.com/google/play/billing/billing_library_overview#Verify).
+  ///
+  /// This wraps [`BillingClient#queryPurchaseHistoryAsync(String skuType,
+  /// PurchaseHistoryResponseListener
+  /// listener)`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient#querypurchasehistoryasync).
+  Future<PurchasesResultWrapper> queryPurchaseHistory(SkuType skuType) async {
+    assert(skuType != null);
+    return PurchasesResultWrapper.fromJson(await channel.invokeMapMethod(
+        'BillingClient#queryPurchaseHistoryAsync(String, PurchaseHistoryResponseListener)',
+        <String, dynamic>{'skuType': SkuTypeConverter().toJson(skuType)}));
+  }
+
   Future<void> _callHandler(MethodCall call) async {
     switch (call.method) {
+      case _kOnPurchasesUpdated:
+        // The purchases updated listener is a singleton.
+        assert(_callbacks[_kOnPurchasesUpdated].length == 1);
+        final PurchasesUpdatedListener listener =
+            _callbacks[_kOnPurchasesUpdated].first;
+        listener(PurchasesResultWrapper.fromJson(call.arguments));
+        break;
       case _kOnBillingServiceDisconnected:
         final int handle = call.arguments['handle'];
         await _callbacks[_kOnBillingServiceDisconnected][handle]();
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
new file mode 100644
index 000000000000..5a584e570bf5
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
@@ -0,0 +1,132 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+import 'dart:ui' show hashValues;
+import 'package:flutter/foundation.dart';
+import 'package:json_annotation/json_annotation.dart';
+import 'enum_converters.dart';
+import 'billing_client_wrapper.dart';
+
+// WARNING: Changes to `@JsonSerializable` classes need to be reflected in the
+// below generated file. Run `flutter packages pub run build_runner watch` to
+// rebuild and watch for further changes.
+part 'purchase_wrapper.g.dart';
+
+/// Data structure reprenting a succesful purchase.
+///
+/// All purchase information should also be verified manually, with your
+/// server if at all possible. See ["Verify a
+/// purchase"](https://developer.android.com/google/play/billing/billing_library_overview#Verify).
+///
+/// This wraps [`com.android.billlingclient.api.Purchase`](https://developer.android.com/reference/com/android/billingclient/api/Purchase)
+@JsonSerializable()
+class PurchaseWrapper {
+  @visibleForTesting
+  PurchaseWrapper({
+    @required this.orderId,
+    @required this.packageName,
+    @required this.purchaseTime,
+    @required this.purchaseToken,
+    @required this.signature,
+    @required this.sku,
+    @required this.isAutoRenewing,
+    @required this.originalJson,
+  });
+
+  factory PurchaseWrapper.fromJson(Map map) => _$PurchaseWrapperFromJson(map);
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final PurchaseWrapper typedOther = other;
+    return typedOther.orderId == orderId &&
+        typedOther.packageName == packageName &&
+        typedOther.purchaseTime == purchaseTime &&
+        typedOther.purchaseToken == purchaseToken &&
+        typedOther.signature == signature &&
+        typedOther.sku == sku &&
+        typedOther.isAutoRenewing == isAutoRenewing &&
+        typedOther.originalJson == originalJson;
+  }
+
+  @override
+  int get hashCode => hashValues(orderId, packageName, purchaseTime,
+      purchaseToken, signature, sku, isAutoRenewing, originalJson);
+
+  /// The unique ID for this purchase. Corresponds to the Google Payments order
+  /// ID.
+  final String orderId;
+
+  /// The package name the purchase was made from.
+  final String packageName;
+
+  /// When the purchase was made, as an epoch timestamp.
+  final int purchaseTime;
+
+  /// A unique ID for a given [SkuDetailsWrapper], user, and purchase.
+  final String purchaseToken;
+
+  /// Signature of purchase data, signed with the developer's private key. Uses
+  /// RSASSA-PKCS1-v1_5.
+  final String signature;
+
+  /// The product ID of this purchase.
+  final String sku;
+
+  /// True for subscriptions that renew automatically. Does not apply to
+  /// [SkuType.inapp] products.
+  ///
+  /// For [SkuType.subs] this means that the subscription is canceled when it is
+  /// false.
+  final bool isAutoRenewing;
+
+  /// Details about this purchase, in JSON.
+  ///
+  /// This can be used verify a purchase. See ["Verify a purchase on a
+  /// device"](https://developer.android.com/google/play/billing/billing_library_overview#Verify-purchase-device).
+  /// Note though that verifying a purchase locally is inherently insecure (see
+  /// the article for more details).
+  final String originalJson;
+}
+
+/// A data struct representing the result of a transaction.
+///
+/// Contains a potentially empty list of [PurchaseWrapper]s and a
+/// [BillingResponse] to signify the overall state of the transaction.
+///
+/// Wraps [`com.android.billingclient.api.Purchase.PurchasesResult`](https://developer.android.com/reference/com/android/billingclient/api/Purchase.PurchasesResult).
+@JsonSerializable()
+@BillingResponseConverter()
+class PurchasesResultWrapper {
+  PurchasesResultWrapper(
+      {@required BillingResponse this.responseCode,
+      @required List<PurchaseWrapper> this.purchasesList});
+
+  factory PurchasesResultWrapper.fromJson(Map map) =>
+      _$PurchasesResultWrapperFromJson(map);
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final PurchasesResultWrapper typedOther = other;
+    return typedOther.responseCode == responseCode &&
+        typedOther.purchasesList == purchasesList;
+  }
+
+  @override
+  int get hashCode => hashValues(responseCode, purchasesList);
+
+  /// The status of the operation.
+  ///
+  /// This can represent either the status of the "query purchase history" half
+  /// of the operation and the "user made purchases" transaction itself.
+  final BillingResponse responseCode;
+
+  /// The list of succesful purchases made in this transaction.
+  ///
+  /// May be empty, especially if [responseCode] is not [BillingResponse.ok].
+  final List<PurchaseWrapper> purchasesList;
+}
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart
new file mode 100644
index 000000000000..1681a1f773bc
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart
@@ -0,0 +1,28 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'purchase_wrapper.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+PurchaseWrapper _$PurchaseWrapperFromJson(Map json) {
+  return PurchaseWrapper(
+      orderId: json['orderId'] as String,
+      packageName: json['packageName'] as String,
+      purchaseTime: json['purchaseTime'] as int,
+      purchaseToken: json['purchaseToken'] as String,
+      signature: json['signature'] as String,
+      sku: json['sku'] as String,
+      isAutoRenewing: json['isAutoRenewing'] as bool,
+      originalJson: json['originalJson'] as String);
+}
+
+PurchasesResultWrapper _$PurchasesResultWrapperFromJson(Map json) {
+  return PurchasesResultWrapper(
+      responseCode: const BillingResponseConverter()
+          .fromJson(json['responseCode'] as int),
+      purchasesList: (json['purchasesList'] as List)
+          .map((e) => PurchaseWrapper.fromJson(e as Map))
+          .toList());
+}
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
index c57e1cf80994..5751166c4f53 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
@@ -16,7 +16,10 @@ import 'product_details.dart';
 class GooglePlayConnection
     with WidgetsBindingObserver
     implements InAppPurchaseConnection {
-  GooglePlayConnection._() : _billingClient = BillingClient() {
+  GooglePlayConnection._()
+      : _billingClient = BillingClient((PurchasesResultWrapper _) {
+          // TODO(mklim): wire this in to the generic interface
+        }) {
     _readyFuture = _connect();
     WidgetsBinding.instance.addObserver(this);
   }
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
index 28b4b156738b..36d8058a3bfd 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:test/test.dart';
+import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter/services.dart';
 
 import 'package:in_app_purchase/billing_client_wrappers.dart';
@@ -10,15 +10,17 @@ import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart
 import 'package:in_app_purchase/src/channel.dart';
 import '../stub_in_app_purchase_platform.dart';
 import 'sku_details_wrapper_test.dart';
+import 'purchase_wrapper_test.dart';
 
 void main() {
   final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
   BillingClient billingClient;
+
   setUpAll(() =>
       channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
 
   setUp(() {
-    billingClient = BillingClient();
+    billingClient = BillingClient((PurchasesResultWrapper _) {});
     stubPlatform.reset();
   });
 
@@ -88,7 +90,7 @@ void main() {
       final BillingResponse responseCode = BillingResponse.ok;
       stubPlatform.addResponse(name: queryMethodName, value: <String, dynamic>{
         'responseCode': BillingResponseConverter().toJson(responseCode),
-        'skuDetailsList': <Map<String, dynamic>>[buildSkuMap(dummyWrapper)]
+        'skuDetailsList': <Map<String, dynamic>>[buildSkuMap(dummySkuDetails)]
       });
 
       final SkuDetailsResponseWrapper response = await billingClient
@@ -96,7 +98,7 @@ void main() {
               skuType: SkuType.inapp, skusList: <String>['invalid']);
 
       expect(response.responseCode, equals(responseCode));
-      expect(response.skuDetailsList, contains(dummyWrapper));
+      expect(response.skuDetailsList, contains(dummySkuDetails));
     });
   });
 
@@ -109,7 +111,7 @@ void main() {
       stubPlatform.addResponse(
           name: launchMethodName,
           value: BillingResponseConverter().toJson(sentCode));
-      final SkuDetailsWrapper skuDetails = dummyWrapper;
+      final SkuDetailsWrapper skuDetails = dummySkuDetails;
       final String accountId = "hashedAccountId";
 
       final BillingResponse receivedCode = await billingClient
@@ -127,7 +129,7 @@ void main() {
       stubPlatform.addResponse(
           name: launchMethodName,
           value: BillingResponseConverter().toJson(sentCode));
-      final SkuDetailsWrapper skuDetails = dummyWrapper;
+      final SkuDetailsWrapper skuDetails = dummySkuDetails;
 
       final BillingResponse receivedCode =
           await billingClient.launchBillingFlow(skuDetails: skuDetails);
@@ -139,4 +141,95 @@ void main() {
       expect(arguments['accountId'], isNull);
     });
   });
+
+  group('queryPurchases', () {
+    const String queryPurchasesMethodName =
+        'BillingClient#queryPurchases(String)';
+
+    test('serializes and deserializes data', () async {
+      final BillingResponse expectedCode = BillingResponse.ok;
+      final List<PurchaseWrapper> expectedList = <PurchaseWrapper>[
+        dummyPurchase
+      ];
+      stubPlatform
+          .addResponse(name: queryPurchasesMethodName, value: <String, dynamic>{
+        'responseCode': BillingResponseConverter().toJson(expectedCode),
+        'purchasesList': expectedList
+            .map((PurchaseWrapper purchase) => buildPurchaseMap(purchase))
+            .toList(),
+      });
+
+      final PurchasesResultWrapper response =
+          await billingClient.queryPurchases(SkuType.inapp);
+
+      expect(response.responseCode, equals(expectedCode));
+      expect(response.purchasesList, equals(expectedList));
+    });
+
+    test('checks for null params', () async {
+      expect(() => billingClient.queryPurchases(null), throwsAssertionError);
+    });
+
+    test('handles empty purchases', () async {
+      final BillingResponse expectedCode = BillingResponse.userCanceled;
+      stubPlatform
+          .addResponse(name: queryPurchasesMethodName, value: <String, dynamic>{
+        'responseCode': BillingResponseConverter().toJson(expectedCode),
+        'purchasesList': [],
+      });
+
+      final PurchasesResultWrapper response =
+          await billingClient.queryPurchases(SkuType.inapp);
+
+      expect(response.responseCode, equals(expectedCode));
+      expect(response.purchasesList, isEmpty);
+    });
+  });
+
+  group('queryPurchaseHistory', () {
+    const String queryPurchaseHistoryMethodName =
+        'BillingClient#queryPurchaseHistoryAsync(String, PurchaseHistoryResponseListener)';
+
+    test('serializes and deserializes data', () async {
+      final BillingResponse expectedCode = BillingResponse.ok;
+      final List<PurchaseWrapper> expectedList = <PurchaseWrapper>[
+        dummyPurchase
+      ];
+      stubPlatform.addResponse(
+          name: queryPurchaseHistoryMethodName,
+          value: <String, dynamic>{
+            'responseCode': BillingResponseConverter().toJson(expectedCode),
+            'purchasesList': expectedList
+                .map((PurchaseWrapper purchase) => buildPurchaseMap(purchase))
+                .toList(),
+          });
+
+      final PurchasesResultWrapper response =
+          await billingClient.queryPurchaseHistory(SkuType.inapp);
+
+      expect(response.responseCode, equals(expectedCode));
+      expect(response.purchasesList, equals(expectedList));
+    });
+
+    test('checks for null params', () async {
+      expect(
+          () => billingClient.queryPurchaseHistory(null), throwsAssertionError);
+    });
+
+    test('handles empty purchases', () async {
+      final BillingResponse expectedCode = BillingResponse.userCanceled;
+      stubPlatform.addResponse(
+          name: queryPurchaseHistoryMethodName,
+          value: <String, dynamic>{
+            'responseCode': BillingResponseConverter().toJson(expectedCode),
+            'purchasesList': [],
+          });
+
+      final PurchasesResultWrapper response =
+          await billingClient.queryPurchaseHistory(SkuType.inapp);
+
+      expect(response.responseCode, equals(expectedCode));
+      expect(response.purchasesList, isEmpty);
+    });
+  });
 }
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
new file mode 100644
index 000000000000..a8eee48ec330
--- /dev/null
+++ b/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
@@ -0,0 +1,67 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+import 'package:test/test.dart';
+import 'package:in_app_purchase/billing_client_wrappers.dart';
+import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
+
+final PurchaseWrapper dummyPurchase = PurchaseWrapper(
+  orderId: 'orderId',
+  packageName: 'packageName',
+  purchaseTime: 0,
+  signature: 'signature',
+  sku: 'sku',
+  purchaseToken: 'purchaseToken',
+  isAutoRenewing: false,
+  originalJson: '',
+);
+
+void main() {
+  group('PurchaseWrapper', () {
+    test('converts from map', () {
+      final PurchaseWrapper expected = dummyPurchase;
+      final PurchaseWrapper parsed =
+          PurchaseWrapper.fromJson(buildPurchaseMap(expected));
+
+      expect(parsed, equals(expected));
+    });
+  });
+
+  group('PurchasesResultWrapper', () {
+    test('parsed from map', () {
+      final BillingResponse responseCode = BillingResponse.ok;
+      final List<PurchaseWrapper> purchases = <PurchaseWrapper>[
+        dummyPurchase,
+        dummyPurchase
+      ];
+      final PurchasesResultWrapper expected = PurchasesResultWrapper(
+          responseCode: responseCode, purchasesList: purchases);
+
+      final PurchasesResultWrapper parsed =
+          PurchasesResultWrapper.fromJson(<String, dynamic>{
+        'responseCode': BillingResponseConverter().toJson(responseCode),
+        'purchasesList': <Map<String, dynamic>>[
+          buildPurchaseMap(dummyPurchase),
+          buildPurchaseMap(dummyPurchase)
+        ]
+      });
+
+      expect(parsed.responseCode, equals(expected.responseCode));
+      expect(parsed.purchasesList, containsAll(expected.purchasesList));
+    });
+  });
+}
+
+Map<String, dynamic> buildPurchaseMap(PurchaseWrapper original) {
+  return <String, dynamic>{
+    'orderId': original.orderId,
+    'packageName': original.packageName,
+    'purchaseTime': original.purchaseTime,
+    'signature': original.signature,
+    'sku': original.sku,
+    'purchaseToken': original.purchaseToken,
+    'isAutoRenewing': original.isAutoRenewing,
+    'originalJson': original.originalJson,
+  };
+}
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
index 186cee8895ba..61b1d53fa881 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
@@ -7,7 +7,7 @@ import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
 
-final SkuDetailsWrapper dummyWrapper = SkuDetailsWrapper(
+final SkuDetailsWrapper dummySkuDetails = SkuDetailsWrapper(
   description: 'description',
   freeTrialPeriod: 'freeTrialPeriod',
   introductoryPrice: 'introductoryPrice',
@@ -27,7 +27,7 @@ final SkuDetailsWrapper dummyWrapper = SkuDetailsWrapper(
 void main() {
   group('SkuDetailsWrapper', () {
     test('converts from map', () {
-      final SkuDetailsWrapper expected = dummyWrapper;
+      final SkuDetailsWrapper expected = dummySkuDetails;
       final SkuDetailsWrapper parsed =
           SkuDetailsWrapper.fromJson(buildSkuMap(expected));
 
@@ -39,8 +39,8 @@ void main() {
     test('parsed from map', () {
       final BillingResponse responseCode = BillingResponse.ok;
       final List<SkuDetailsWrapper> skusDetails = <SkuDetailsWrapper>[
-        dummyWrapper,
-        dummyWrapper
+        dummySkuDetails,
+        dummySkuDetails
       ];
       final SkuDetailsResponseWrapper expected = SkuDetailsResponseWrapper(
           responseCode: responseCode, skuDetailsList: skusDetails);
@@ -49,8 +49,8 @@ void main() {
           SkuDetailsResponseWrapper.fromJson(<String, dynamic>{
         'responseCode': BillingResponseConverter().toJson(responseCode),
         'skuDetailsList': <Map<String, dynamic>>[
-          buildSkuMap(dummyWrapper),
-          buildSkuMap(dummyWrapper)
+          buildSkuMap(dummySkuDetails),
+          buildSkuMap(dummySkuDetails)
         ]
       });
 
@@ -60,7 +60,7 @@ void main() {
 
     test('toProductDetails() should return correct Product object', () {
       final SkuDetailsWrapper wrapper =
-          SkuDetailsWrapper.fromJson(buildSkuMap(dummyWrapper));
+          SkuDetailsWrapper.fromJson(buildSkuMap(dummySkuDetails));
       final ProductDetails product = wrapper.toProductDetails();
       expect(product.title, wrapper.title);
       expect(product.description, wrapper.description);
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index a9a6ec7703ad..627074df562d 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -87,23 +87,23 @@ void main() {
       final BillingResponse responseCode = BillingResponse.ok;
       stubPlatform.addResponse(name: queryMethodName, value: <String, dynamic>{
         'responseCode': BillingResponseConverter().toJson(responseCode),
-        'skuDetailsList': <Map<String, dynamic>>[buildSkuMap(dummyWrapper)]
+        'skuDetailsList': <Map<String, dynamic>>[buildSkuMap(dummySkuDetails)]
       });
       // Since queryProductDetails makes 2 platform method calls (one for each SkuType), the result will contain 2 dummyWrapper instead
       // of 1.
       final ProductDetailsResponse response =
           await connection.queryProductDetails(<String>['valid'].toSet());
-      expect(response.productDetails.first.title, dummyWrapper.title);
-      expect(
-          response.productDetails.first.description, dummyWrapper.description);
-      expect(response.productDetails.first.price, dummyWrapper.price);
+      expect(response.productDetails.first.title, dummySkuDetails.title);
+      expect(response.productDetails.first.description,
+          dummySkuDetails.description);
+      expect(response.productDetails.first.price, dummySkuDetails.price);
     });
 
     test('should get the correct notFoundIDs', () async {
       final BillingResponse responseCode = BillingResponse.ok;
       stubPlatform.addResponse(name: queryMethodName, value: <String, dynamic>{
         'responseCode': BillingResponseConverter().toJson(responseCode),
-        'skuDetailsList': <Map<String, dynamic>>[buildSkuMap(dummyWrapper)]
+        'skuDetailsList': <Map<String, dynamic>>[buildSkuMap(dummySkuDetails)]
       });
       // Since queryProductDetails makes 2 platform method calls (one for each SkuType), the result will contain 2 dummyWrapper instead
       // of 1.

From aee12523e64e510e81dec1750e3970a8e4ac25e6 Mon Sep 17 00:00:00 2001
From: Chris Yang <cyang8954@gmail.com>
Date: Thu, 7 Mar 2019 17:53:59 -0800
Subject: [PATCH 206/410] [in_app_purchase] refactoring and tests (#1322)

Updated retrieveReceiptData to be a static method.
Added missing SK prefix for certain store kit wrapper classes.
Added an iOS Platform stub to unit test all the method channel apis.
Removed tests that were duplicates after introducing the iOS Platform stub.
Refactored test code to be more compact.
---
 .../sk_payment_queue_wrapper.dart             |  75 ++++++-
 .../sk_product_wrapper.dart                   | 100 ++++++++-
 .../sk_product_wrapper.g.dart                 |  26 +--
 .../sk_receipt_manager.dart                   |   2 +-
 .../store_kit_wrappers/sk_request_maker.dart  |   4 +-
 .../app_store_connection_test.dart            |  44 +---
 .../sk_methodchannel_apis_test.dart           | 186 ++++++++++++++++
 .../sk_payment_queue_wrapper_test.dart        | 209 ------------------
 .../store_kit_wrappers/sk_product_test.dart   | 161 +++++---------
 .../sk_receipt_manager_test.dart              |  26 ---
 .../store_kit_wrappers/sk_request_test.dart   |  87 --------
 .../sk_test_stub_objects.dart                 | 179 +++++++++++++++
 12 files changed, 607 insertions(+), 492 deletions(-)
 create mode 100644 packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart
 delete mode 100644 packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
 delete mode 100644 packages/in_app_purchase/test/store_kit_wrappers/sk_receipt_manager_test.dart
 delete mode 100644 packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
 create mode 100644 packages/in_app_purchase/test/store_kit_wrappers/sk_test_stub_objects.dart

diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
index 53a9d0e40eae..d9a1e45f8987 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:in_app_purchase/src/channel.dart';
 import 'package:json_annotation/json_annotation.dart';
@@ -214,7 +215,7 @@ enum SKPaymentTransactionStateWrapper {
   /// Indicates the transaction is being processed in App Store.
   ///
   /// You should update your UI to indicate the process and waiting for the transaction to update to the next state.
-  /// Never complte a transaction that is in purchasing state.
+  /// Never complete a transaction that is in purchasing state.
   @JsonValue(0)
   purchasing,
 
@@ -302,6 +303,24 @@ class SKPaymentTransactionWrapper {
 
   /// The error object, only available if the [transactionState] is [SKPaymentTransactionStateWrapper.failed].
   final SKError error;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    final SKPaymentTransactionWrapper typedOther = other;
+    return typedOther.payment == payment &&
+        typedOther.transactionState == transactionState &&
+        typedOther.originalTransaction == originalTransaction &&
+        typedOther.transactionTimeStamp == transactionTimeStamp &&
+        typedOther.transactionIdentifier == transactionIdentifier &&
+        DeepCollectionEquality().equals(typedOther.downloads, downloads) &&
+        typedOther.error == error;
+  }
 }
 
 /// Dart wrapper around StoreKit's [SKDownloadState](https://developer.apple.com/documentation/storekit/skdownloadstate?language=objc).
@@ -403,6 +422,27 @@ class SKDownloadWrapper {
 
   /// The error that prevented the downloading; only available if the [transactionState] is [SKPaymentTransactionStateWrapper.failed].
   final SKError error;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    final SKDownloadWrapper typedOther = other;
+    return typedOther.contentIdentifier == contentIdentifier &&
+        typedOther.state == state &&
+        typedOther.contentLength == contentLength &&
+        typedOther.contentURL == contentURL &&
+        typedOther.contentVersion == contentVersion &&
+        typedOther.transactionID == transactionID &&
+        typedOther.progress == progress &&
+        typedOther.timeRemaining == timeRemaining &&
+        typedOther.downloadTimeUnknown == downloadTimeUnknown &&
+        typedOther.error == error;
+  }
 }
 
 /// Dart wrapper around StoreKit's [NSError](https://developer.apple.com/documentation/foundation/nserror?language=objc).
@@ -430,6 +470,21 @@ class SKError {
 
   /// A map that contains more detailed information about the error. Any key of the map must be one of the [NSErrorUserInfoKey](https://developer.apple.com/documentation/foundation/nserroruserinfokey?language=objc).
   final Map<String, dynamic> userInfo;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    final SKError typedOther = other;
+    return typedOther.code == code &&
+        typedOther.domain == domain &&
+        DeepCollectionEquality.unordered()
+            .equals(typedOther.userInfo, userInfo);
+  }
 }
 
 /// Dart wrapper around StoreKit's [SKPayment](https://developer.apple.com/documentation/storekit/skpayment?language=objc).
@@ -474,7 +529,7 @@ class SKPaymentWrapper {
   /// An opaque id for the user's account.
   ///
   /// Used to help the store detect irregular activity. See https://developer.apple.com/documentation/storekit/skpayment/1506116-applicationusername?language=objc for more details.
-  /// For example, you can use a one-way hash of the user’s account name on your server. Don’t use the Apple ID for your developer account, the user’s Apple ID, or the user’s unhashed account name on your server.
+  /// For example, you can use a one-way hash of the user’s account name on your server. Don’t use the Apple ID for your developer account, the user’s Apple ID, or the user’s not hashed account name on your server.
   final String applicationUsername;
 
   /// Reserved for future use.
@@ -493,4 +548,20 @@ class SKPaymentWrapper {
   ///
   /// For how to test in App Store sand box, see https://developer.apple.com/in-app-purchase/.
   final bool simulatesAskToBuyInSandbox;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    final SKPaymentWrapper typedOther = other;
+    return typedOther.productIdentifier == productIdentifier &&
+        typedOther.applicationUsername == applicationUsername &&
+        typedOther.quantity == quantity &&
+        typedOther.simulatesAskToBuyInSandbox == simulatesAskToBuyInSandbox &&
+        typedOther.requestData == requestData;
+  }
 }
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
index ddc35bb99c56..633f6b4ba1b9 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart';
+import 'package:collection/collection.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
 
@@ -41,14 +42,28 @@ class SkProductResponseWrapper {
   /// found here https://developer.apple.com/documentation/storekit/skproductsresponse/1505985-invalidproductidentifiers?language=objc.
   /// Will be empty if all the product identifiers are valid.
   final List<String> invalidProductIdentifiers;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    final SkProductResponseWrapper typedOther = other;
+    return DeepCollectionEquality().equals(typedOther.products, products) &&
+        DeepCollectionEquality().equals(
+            typedOther.invalidProductIdentifiers, invalidProductIdentifiers);
+  }
 }
 
 /// Dart wrapper around StoreKit's [SKProductPeriodUnit](https://developer.apple.com/documentation/storekit/skproductperiodunit?language=objc).
 ///
-/// Used as a property in the [SKProductSubscriptionPeriodWrapper]. Minium is a day and maxium is a year.
+/// Used as a property in the [SKProductSubscriptionPeriodWrapper]. Minimum is a day and maximum is a year.
 // The values of the enum options are matching the [SKProductPeriodUnit]'s values. Should there be an update or addition
 // in the [SKProductPeriodUnit], this need to be updated to match.
-enum SubscriptionPeriodUnit {
+enum SKSubscriptionPeriodUnit {
   @JsonValue(0)
   day,
   @JsonValue(1)
@@ -83,7 +98,19 @@ class SKProductSubscriptionPeriodWrapper {
   final int numberOfUnits;
 
   /// The time unit used to specify the length of this period.
-  final SubscriptionPeriodUnit unit;
+  final SKSubscriptionPeriodUnit unit;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    final SKProductSubscriptionPeriodWrapper typedOther = other;
+    return typedOther.numberOfUnits == numberOfUnits && typedOther.unit == unit;
+  }
 }
 
 /// Dart wrapper around StoreKit's [SKProductDiscountPaymentMode](https://developer.apple.com/documentation/storekit/skproductdiscountpaymentmode?language=objc).
@@ -91,7 +118,7 @@ class SKProductSubscriptionPeriodWrapper {
 /// This is used as a property in the [SKProductDiscountWrapper].
 // The values of the enum options are matching the [SKProductDiscountPaymentMode]'s values. Should there be an update or addition
 // in the [SKProductDiscountPaymentMode], this need to be updated to match.
-enum ProductDiscountPaymentMode {
+enum SKProductDiscountPaymentMode {
   /// Allows user to pay the discounted price at each payment period.
   @JsonValue(0)
   payAsYouGo,
@@ -130,7 +157,7 @@ class SKProductDiscountWrapper {
   final String price;
 
   /// Includes locale information about the price, e.g. `$` as the currency symbol for US locale.
-  final PriceLocaleWrapper priceLocale;
+  final SKPriceLocaleWrapper priceLocale;
 
   /// The object represent the discount period length.
   ///
@@ -138,13 +165,29 @@ class SKProductDiscountWrapper {
   final int numberOfPeriods;
 
   /// The object indicates how the discount price is charged.
-  final ProductDiscountPaymentMode paymentMode;
+  final SKProductDiscountPaymentMode paymentMode;
 
   /// The object represents the duration of single subscription period for the discount.
   ///
   /// The [subscriptionPeriod] of the discount is independent of the product's [subscriptionPeriod],
   /// and their units and duration do not have to be matched.
   final SKProductSubscriptionPeriodWrapper subscriptionPeriod;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    final SKProductDiscountWrapper typedOther = other;
+    return typedOther.price == price &&
+        typedOther.priceLocale == priceLocale &&
+        typedOther.numberOfPeriods == numberOfPeriods &&
+        typedOther.paymentMode == paymentMode &&
+        typedOther.subscriptionPeriod == subscriptionPeriod;
+  }
 }
 
 /// Dart wrapper around StoreKit's [SKProduct](https://developer.apple.com/documentation/storekit/skproduct?language=objc).
@@ -190,7 +233,7 @@ class SKProductWrapper {
   final String localizedDescription;
 
   /// Includes locale information about the price, e.g. `$` as the currency symbol for US locale.
-  final PriceLocaleWrapper priceLocale;
+  final SKPriceLocaleWrapper priceLocale;
 
   /// The version of the downloadable content.
   ///
@@ -226,12 +269,35 @@ class SKProductWrapper {
   /// The object represents the duration of single subscription period.
   ///
   /// This is only available if you set up the introductory price in the App Store Connect, otherwise it will be null.
-  /// Programmar is also responsible to determine if the user is eligible to receive it. See https://developer.apple.com/documentation/storekit/in-app_purchase/offering_introductory_pricing_in_your_app?language=objc
+  /// Programmer is also responsible to determine if the user is eligible to receive it. See https://developer.apple.com/documentation/storekit/in-app_purchase/offering_introductory_pricing_in_your_app?language=objc
   /// for more details.
   /// The [subscriptionPeriod] of the discount is independent of the product's [subscriptionPeriod],
   /// and their units and duration do not have to be matched.
   final SKProductDiscountWrapper introductoryPrice;
 
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    final SKProductWrapper typedOther = other;
+    return typedOther.productIdentifier == productIdentifier &&
+        typedOther.localizedTitle == localizedTitle &&
+        typedOther.localizedDescription == localizedDescription &&
+        typedOther.priceLocale == priceLocale &&
+        typedOther.downloadContentVersion == downloadContentVersion &&
+        typedOther.subscriptionGroupIdentifier == subscriptionGroupIdentifier &&
+        typedOther.price == price &&
+        typedOther.downloadable == downloadable &&
+        DeepCollectionEquality.unordered().equals(
+            typedOther.downloadContentLengths, downloadContentLengths) &&
+        typedOther.subscriptionPeriod == subscriptionPeriod &&
+        typedOther.introductoryPrice == introductoryPrice;
+  }
+
   /// Method to convert to the wrapper to the consolidated [ProductDetails] class.
   ProductDetails toProductDetails() {
     return ProductDetails(
@@ -250,18 +316,30 @@ class SKProductWrapper {
 //                 Matching android to only get the currencySymbol for now.
 //                 https://github.com/flutter/flutter/issues/26610
 @JsonSerializable()
-class PriceLocaleWrapper {
-  PriceLocaleWrapper({@required this.currencySymbol});
+class SKPriceLocaleWrapper {
+  SKPriceLocaleWrapper({@required this.currencySymbol});
 
   /// Constructing an instance from a map from the Objective-C layer.
   ///
   /// This method should only be used with `map` values returned by [SKProductWrapper.fromJson] and [SKProductDiscountWrapper.fromJson].
   /// The `map` parameter must not be null.
-  factory PriceLocaleWrapper.fromJson(Map map) {
+  factory SKPriceLocaleWrapper.fromJson(Map map) {
     assert(map != null, 'Map must not be null.');
     return _$PriceLocaleWrapperFromJson(map);
   }
 
   ///The currency symbol for the locale, e.g. $ for US locale.
   final String currencySymbol;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    final SKPriceLocaleWrapper typedOther = other;
+    return typedOther.currencySymbol == currencySymbol;
+  }
 }
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
index d6392d8cd1a4..04895402730a 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
@@ -44,11 +44,11 @@ T _$enumDecodeNullable<T>(Map<T, dynamic> enumValues, dynamic source) {
   return _$enumDecode<T>(enumValues, source);
 }
 
-const _$SubscriptionPeriodUnitEnumMap = <SubscriptionPeriodUnit, dynamic>{
-  SubscriptionPeriodUnit.day: 0,
-  SubscriptionPeriodUnit.week: 1,
-  SubscriptionPeriodUnit.month: 2,
-  SubscriptionPeriodUnit.year: 3
+const _$SubscriptionPeriodUnitEnumMap = <SKSubscriptionPeriodUnit, dynamic>{
+  SKSubscriptionPeriodUnit.day: 0,
+  SKSubscriptionPeriodUnit.week: 1,
+  SKSubscriptionPeriodUnit.month: 2,
+  SKSubscriptionPeriodUnit.year: 3
 };
 
 SKProductDiscountWrapper _$SKProductDiscountWrapperFromJson(Map json) {
@@ -56,7 +56,7 @@ SKProductDiscountWrapper _$SKProductDiscountWrapperFromJson(Map json) {
       price: json['price'] as String,
       priceLocale: json['priceLocale'] == null
           ? null
-          : PriceLocaleWrapper.fromJson(json['priceLocale'] as Map),
+          : SKPriceLocaleWrapper.fromJson(json['priceLocale'] as Map),
       numberOfPeriods: json['numberOfPeriods'] as int,
       paymentMode: _$enumDecodeNullable(
           _$ProductDiscountPaymentModeEnumMap, json['paymentMode']),
@@ -67,10 +67,10 @@ SKProductDiscountWrapper _$SKProductDiscountWrapperFromJson(Map json) {
 }
 
 const _$ProductDiscountPaymentModeEnumMap =
-    <ProductDiscountPaymentMode, dynamic>{
-  ProductDiscountPaymentMode.payAsYouGo: 0,
-  ProductDiscountPaymentMode.payUpFront: 1,
-  ProductDiscountPaymentMode.freeTrail: 2
+    <SKProductDiscountPaymentMode, dynamic>{
+  SKProductDiscountPaymentMode.payAsYouGo: 0,
+  SKProductDiscountPaymentMode.payUpFront: 1,
+  SKProductDiscountPaymentMode.freeTrail: 2
 };
 
 SKProductWrapper _$SKProductWrapperFromJson(Map json) {
@@ -80,7 +80,7 @@ SKProductWrapper _$SKProductWrapperFromJson(Map json) {
       localizedDescription: json['localizedDescription'] as String,
       priceLocale: json['priceLocale'] == null
           ? null
-          : PriceLocaleWrapper.fromJson(json['priceLocale'] as Map),
+          : SKPriceLocaleWrapper.fromJson(json['priceLocale'] as Map),
       downloadContentVersion: json['downloadContentVersion'] as String,
       subscriptionGroupIdentifier:
           json['subscriptionGroupIdentifier'] as String,
@@ -99,6 +99,6 @@ SKProductWrapper _$SKProductWrapperFromJson(Map json) {
               json['introductoryPrice'] as Map));
 }
 
-PriceLocaleWrapper _$PriceLocaleWrapperFromJson(Map json) {
-  return PriceLocaleWrapper(currencySymbol: json['currencySymbol'] as String);
+SKPriceLocaleWrapper _$PriceLocaleWrapperFromJson(Map json) {
+  return SKPriceLocaleWrapper(currencySymbol: json['currencySymbol'] as String);
 }
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_receipt_manager.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_receipt_manager.dart
index eed09f1835ef..7608275d8a7f 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_receipt_manager.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_receipt_manager.dart
@@ -14,7 +14,7 @@ class SKReceiptManager {
   /// There are 2 ways to do so. Either validate locally or validate with App Store.
   /// For more details on how to validate the receipt data, you can refer to Apple's document about [`About Receipt Validation`](https://developer.apple.com/library/archive/releasenotes/General/ValidateAppStoreReceipt/Introduction.html#//apple_ref/doc/uid/TP40010573-CH105-SW1).
   /// If the receipt is invalid or missing, you can use [SKRequestMaker.startRefreshReceiptRequest] to request a new receipt.
-  Future<String> retrieveReceiptData() {
+  static Future<String> retrieveReceiptData() {
     return channel
         .invokeMethod('-[InAppPurchasePlugin retrieveReceiptData:result:]');
   }
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart
index 353d34e5f9be..43fee6411a01 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_request_maker.dart
@@ -15,8 +15,8 @@ import 'sk_product_wrapper.dart';
 class SKRequestMaker {
   /// Fetches product information for a list of given product identifiers.
   ///
-  /// The `productIdentifiers` should contain legit product identifiers that you declared for the products in the Itunes Connect. invalid identifiers
-  /// Will be stored and returned in [SkProductResponseWrapper.invalidProductIdentifiers]. Duplicate values in `productIdentifiers` will be omitted.
+  /// The `productIdentifiers` should contain legitimate product identifiers that you declared for the products in the iTunes Connect. Invalid identifiers
+  /// will be stored and returned in [SkProductResponseWrapper.invalidProductIdentifiers]. Duplicate values in `productIdentifiers` will be omitted.
   /// If `productIdentifiers` is null, an `storekit_invalid_argument` error will be returned. If `productIdentifiers` is empty, a [SkProductResponseWrapper]
   /// will still be returned with [SkProductResponseWrapper.products] being null.
   ///
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
index 3d2ec3f17376..aba9d89dcaa2 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
@@ -8,6 +8,7 @@ import 'package:in_app_purchase/src/channel.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/app_store_connection.dart';
 import '../stub_in_app_purchase_platform.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
+import '../store_kit_wrappers/sk_test_stub_objects.dart';
 
 void main() {
   final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
@@ -29,47 +30,14 @@ void main() {
     });
   });
 
-  final Map<String, dynamic> localeMap = <String, dynamic>{
-    'currencySymbol': '\$'
-  };
-  final Map<String, dynamic> subMap = <String, dynamic>{
-    'numberOfUnits': 1,
-    'unit': 2
-  };
-  final Map<String, dynamic> discountMap = <String, dynamic>{
-    'price': '1.0',
-    'priceLocale': localeMap,
-    'numberOfPeriods': 1,
-    'paymentMode': 2,
-    'subscriptionPeriod': subMap,
-  };
-  final Map<String, dynamic> productMap = <String, dynamic>{
-    'productIdentifier': 'id',
-    'localizedTitle': 'splash coin',
-    'localizedDescription': 'description',
-    'priceLocale': localeMap,
-    'downloadContentVersion': 'version',
-    'subscriptionGroupIdentifier': 'com.group',
-    'price': '1.0',
-    'downloadable': true,
-    'downloadContentLengths': <int>[1, 2],
-    'subscriptionPeriod': subMap,
-    'introductoryPrice': discountMap,
-  };
-
-  final Map<String, List<dynamic>> productResponseMap = <String, List<dynamic>>{
-    'products': <Map<String, dynamic>>[productMap],
-    'invalidProductIdentifiers': <String>['567'],
-  };
-
   group('query product list', () {
     test('should get product list', () async {
       stubPlatform.addResponse(
           name: '-[InAppPurchasePlugin startProductRequest:result:]',
-          value: productResponseMap);
+          value: buildProductResponseMap(dummyProductResponseWrapper));
       final AppStoreConnection connection = AppStoreConnection();
       final ProductDetailsResponse response =
-          await connection.queryProductDetails(<String>['123'].toSet());
+          await connection.queryProductDetails(<String>['id'].toSet());
       List<ProductDetails> products = response.productDetails;
       expect(
         products,
@@ -77,7 +45,7 @@ void main() {
       );
       expect(
         products.first.title,
-        'splash coin',
+        'title',
       );
       expect(
         products.first.title,
@@ -88,13 +56,13 @@ void main() {
     test('should get correct not found identifiers', () async {
       stubPlatform.addResponse(
           name: '-[InAppPurchasePlugin startProductRequest:result:]',
-          value: productResponseMap);
+          value: buildProductResponseMap(dummyProductResponseWrapper));
       final AppStoreConnection connection = AppStoreConnection();
       final ProductDetailsResponse response =
           await connection.queryProductDetails(<String>['123'].toSet());
       expect(
         response.notFoundIDs,
-        <String>['567'],
+        <String>['123'],
       );
     });
   });
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart
new file mode 100644
index 000000000000..75873dd8d438
--- /dev/null
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart
@@ -0,0 +1,186 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:in_app_purchase/src/channel.dart';
+import 'package:in_app_purchase/store_kit_wrappers.dart';
+import 'sk_test_stub_objects.dart';
+
+void main() {
+  final FakeIOSPlatform fakeIOSPlatform = FakeIOSPlatform();
+
+  setUpAll(() {
+    SystemChannels.platform
+        .setMockMethodCallHandler(fakeIOSPlatform.onMethodCall);
+  });
+
+  setUp(() {});
+
+  group('sk_request_maker', () {
+    test('get products method channel', () async {
+      SkProductResponseWrapper productResponseWrapper =
+          await SKRequestMaker().startProductRequest(['xxx']);
+      expect(
+        productResponseWrapper.products,
+        isNotEmpty,
+      );
+      expect(
+        productResponseWrapper.products.first.priceLocale.currencySymbol,
+        '\$',
+      );
+      expect(
+        productResponseWrapper.products.first.priceLocale.currencySymbol,
+        isNot('A'),
+      );
+      expect(
+        productResponseWrapper.invalidProductIdentifiers,
+        isNotEmpty,
+      );
+
+      expect(
+        fakeIOSPlatform.startProductRequestParam,
+        ['xxx'],
+      );
+    });
+
+    test('get products method channel should throw exception', () async {
+      fakeIOSPlatform.getProductRequestFailTest = true;
+      expect(
+        SKRequestMaker().startProductRequest(['xxx']),
+        throwsException,
+      );
+      fakeIOSPlatform.getProductRequestFailTest = false;
+    });
+
+    test('refreshed receipt', () async {
+      int receiptCountBefore = fakeIOSPlatform.refreshReceipt;
+      await SKRequestMaker()
+          .startRefreshReceiptRequest(receiptProperties: {"isExpired": true});
+      expect(fakeIOSPlatform.refreshReceipt, receiptCountBefore + 1);
+      expect(fakeIOSPlatform.refreshReceiptParam, {"isExpired": true});
+    });
+  });
+
+  group('sk_receipt_manager', () {
+    test('should get receipt (faking it by returning a `receipt data` string)',
+        () async {
+      String receiptData = await SKReceiptManager.retrieveReceiptData();
+      expect(receiptData, 'receipt data');
+    });
+  });
+
+  group('sk_payment_queue', () {
+    test('canMakePayment should return true', () async {
+      expect(await SKPaymentQueueWrapper.canMakePayments(), true);
+    });
+
+    test(
+        'throws if observer is not set for payment queue before adding payment',
+        () async {
+      expect(SKPaymentQueueWrapper().addPayment(dummyPayment),
+          throwsAssertionError);
+    });
+
+    test('should add payment to the payment queue', () async {
+      SKPaymentQueueWrapper queue = SKPaymentQueueWrapper();
+      TestPaymentTransactionObserver observer =
+          TestPaymentTransactionObserver();
+      queue.setTransactionObserver(observer);
+      await queue.addPayment(dummyPayment);
+      expect(fakeIOSPlatform.payments.first, equals(dummyPayment));
+    });
+
+    test('should finish transaction', () async {
+      SKPaymentQueueWrapper queue = SKPaymentQueueWrapper();
+      TestPaymentTransactionObserver observer =
+          TestPaymentTransactionObserver();
+      queue.setTransactionObserver(observer);
+      await queue.finishTransaction(dummyTransaction);
+      expect(fakeIOSPlatform.transactionsFinished.first,
+          equals(dummyTransaction.transactionIdentifier));
+    });
+
+    test('should restore transaction', () async {
+      SKPaymentQueueWrapper queue = SKPaymentQueueWrapper();
+      TestPaymentTransactionObserver observer =
+          TestPaymentTransactionObserver();
+      queue.setTransactionObserver(observer);
+      await queue.restoreTransactions(applicationUserName: 'aUserID');
+      expect(fakeIOSPlatform.applicationNameHasTransactionRestored, 'aUserID');
+    });
+  });
+}
+
+class FakeIOSPlatform {
+  FakeIOSPlatform() {
+    channel.setMockMethodCallHandler(onMethodCall);
+    getProductRequestFailTest = false;
+  }
+  // get product request
+  List startProductRequestParam;
+  bool getProductRequestFailTest;
+
+  // refresh receipt request
+  int refreshReceipt = 0;
+  Map refreshReceiptParam;
+
+  // payment queue
+  List<SKPaymentWrapper> payments = [];
+  List<String> transactionsFinished = [];
+  String applicationNameHasTransactionRestored;
+
+  Future<dynamic> onMethodCall(MethodCall call) {
+    switch (call.method) {
+      // request makers
+      case '-[InAppPurchasePlugin startProductRequest:result:]':
+        List<String> productIDS =
+            List.castFrom<dynamic, String>(call.arguments);
+        assert(productIDS is List<String>, 'invalid argument type');
+        startProductRequestParam = call.arguments;
+        if (getProductRequestFailTest) {
+          return Future<Map<String, dynamic>>.value(null);
+        }
+        return Future<Map<String, dynamic>>.value(
+            buildProductResponseMap(dummyProductResponseWrapper));
+      case '-[InAppPurchasePlugin refreshReceipt:result:]':
+        refreshReceipt++;
+        refreshReceiptParam = call.arguments;
+        return Future<void>.sync(() {});
+      // receipt manager
+      case '-[InAppPurchasePlugin retrieveReceiptData:result:]':
+        return Future<String>.value('receipt data');
+      // payment queue
+      case '-[SKPaymentQueue canMakePayments:]':
+        return Future<bool>.value(true);
+      case '-[InAppPurchasePlugin addPayment:result:]':
+        payments.add(SKPaymentWrapper.fromJson(call.arguments));
+        return Future<void>.sync(() {});
+      case '-[InAppPurchasePlugin finishTransaction:result:]':
+        transactionsFinished.add(call.arguments);
+        return Future<void>.sync(() {});
+      case '-[InAppPurchasePlugin restoreTransactions:result:]':
+        applicationNameHasTransactionRestored = call.arguments;
+        return Future<void>.sync(() {});
+    }
+    return Future<void>.sync(() {});
+  }
+}
+
+class TestPaymentTransactionObserver extends SKTransactionObserverWrapper {
+  void updatedTransactions({List<SKPaymentTransactionWrapper> transactions}) {}
+
+  void removedTransactions({List<SKPaymentTransactionWrapper> transactions}) {}
+
+  void restoreCompletedTransactions({Error error}) {}
+
+  void paymentQueueRestoreCompletedTransactionsFinished() {}
+
+  void updatedDownloads({List<SKDownloadWrapper> downloads}) {}
+
+  bool shouldAddStorePayment(
+      {SKPaymentWrapper payment, SKProductWrapper product}) {
+    return true;
+  }
+}
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
deleted file mode 100644
index fc342dbbc759..000000000000
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_payment_queue_wrapper_test.dart
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:test/test.dart';
-
-import 'package:in_app_purchase/store_kit_wrappers.dart';
-import 'package:in_app_purchase/src/channel.dart';
-import '../stub_in_app_purchase_platform.dart';
-
-void main() {
-  final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
-  final dummyPayment = SKPaymentWrapper(
-      productIdentifier: 'prod-id',
-      applicationUsername: 'app-user-name',
-      requestData: 'fake-data-utf8',
-      quantity: 2,
-      simulatesAskToBuyInSandbox: true);
-  final SKError dummyError =
-      SKError(code: 111, domain: 'dummy-domain', userInfo: {'key': 'value'});
-  final SKDownloadWrapper dummyDownload = SKDownloadWrapper(
-    contentIdentifier: 'id',
-    state: SKDownloadState.failed,
-    contentLength: 32,
-    contentURL: 'https://download.com',
-    contentVersion: '0.0.1',
-    transactionID: 'tranID',
-    progress: 0.6,
-    timeRemaining: 1231231,
-    downloadTimeUnknown: false,
-    error: dummyError,
-  );
-  final SKPaymentTransactionWrapper dummyOriginalTransaction =
-      SKPaymentTransactionWrapper(
-    transactionState: SKPaymentTransactionStateWrapper.purchased,
-    payment: dummyPayment,
-    originalTransaction: null,
-    transactionTimeStamp: 1231231231.00,
-    transactionIdentifier: '123123',
-    downloads: [dummyDownload],
-    error: dummyError,
-  );
-  final SKPaymentTransactionWrapper dummyTransaction =
-      SKPaymentTransactionWrapper(
-    transactionState: SKPaymentTransactionStateWrapper.purchased,
-    payment: dummyPayment,
-    originalTransaction: dummyOriginalTransaction,
-    transactionTimeStamp: 1231231231.00,
-    transactionIdentifier: '123123',
-    downloads: [dummyDownload],
-    error: dummyError,
-  );
-
-  setUpAll(() =>
-      channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
-
-  group('canMakePayments', () {
-    test('YES', () async {
-      stubPlatform.addResponse(
-          name: '-[SKPaymentQueue canMakePayments:]', value: true);
-      expect(await SKPaymentQueueWrapper.canMakePayments(), isTrue);
-    });
-
-    test('NO', () async {
-      stubPlatform.addResponse(
-          name: '-[SKPaymentQueue canMakePayments:]', value: false);
-      expect(await SKPaymentQueueWrapper.canMakePayments(), isFalse);
-    });
-  });
-
-  group('Wrapper fromJson tests', () {
-    test('Should construct correct SKPaymentWrapper from json', () {
-      SKPaymentWrapper payment =
-          SKPaymentWrapper.fromJson(dummyPayment.toMap());
-      testPayment(payment, dummyPayment);
-    });
-
-    test('Should construct correct SKError from json', () {
-      SKError error = SKError.fromJson(buildErrorMap(dummyError));
-      testSKError(error, dummyError);
-    });
-
-    test('Should construct correct SKDownloadWrapper from json', () {
-      SKDownloadWrapper download =
-          SKDownloadWrapper.fromJson(buildDownloadMap(dummyDownload));
-      testDownload(download, dummyDownload);
-    });
-
-    test('Should construct correct SKTransactionWrapper from json', () {
-      SKPaymentTransactionWrapper transaction =
-          SKPaymentTransactionWrapper.fromJson(
-              buildTransactionMap(dummyTransaction));
-      testTransaction(transaction, dummyTransaction);
-      if (transaction.originalTransaction != null) {
-        testTransaction(transaction.originalTransaction,
-            dummyTransaction.originalTransaction);
-      }
-    });
-
-    test('Should generate correct map of the payment object', () {
-      Map map = dummyPayment.toMap();
-      expect(map['productIdentifier'], dummyPayment.productIdentifier);
-      expect(map['applicationUsername'], dummyPayment.applicationUsername);
-
-      expect(map['requestData'], dummyPayment.requestData);
-
-      expect(map['quantity'], dummyPayment.quantity);
-
-      expect(map['simulatesAskToBuyInSandbox'],
-          dummyPayment.simulatesAskToBuyInSandbox);
-    });
-  });
-}
-
-Map<String, dynamic> buildErrorMap(SKError error) {
-  return {
-    'code': error.code,
-    'domain': error.domain,
-    'userInfo': error.userInfo,
-  };
-}
-
-Map<String, dynamic> buildDownloadMap(SKDownloadWrapper download) {
-  return {
-    'contentIdentifier': download.contentIdentifier,
-    'state': SKDownloadState.values.indexOf(download.state),
-    'contentLength': download.contentLength,
-    'contentURL': download.contentURL,
-    'contentVersion': download.contentVersion,
-    'transactionID': download.transactionID,
-    'progress': download.progress,
-    'timeRemaining': download.timeRemaining,
-    'downloadTimeUnknown': download.downloadTimeUnknown,
-    'error': buildErrorMap(download.error)
-  };
-}
-
-Map<String, dynamic> buildTransactionMap(
-    SKPaymentTransactionWrapper transaction) {
-  if (transaction == null) {
-    return null;
-  }
-  Map map = <String, dynamic>{
-    'transactionState': SKPaymentTransactionStateWrapper.values
-        .indexOf(SKPaymentTransactionStateWrapper.purchased),
-    'payment': transaction.payment.toMap(),
-    'originalTransaction': buildTransactionMap(transaction.originalTransaction),
-    'transactionTimeStamp': transaction.transactionTimeStamp,
-    'transactionIdentifier': transaction.transactionIdentifier,
-    'error': buildErrorMap(transaction.error),
-  };
-  List downloadList = transaction.downloads.map((SKDownloadWrapper download) {
-    return buildDownloadMap(download);
-  }).toList();
-  map['downloads'] = downloadList;
-  return map;
-}
-
-void testSKError(SKError error, SKError dummyError) {
-  expect(error.code, dummyError.code);
-  expect(error.domain, dummyError.domain);
-  expect(error.userInfo, dummyError.userInfo);
-}
-
-void testDownload(SKDownloadWrapper download, SKDownloadWrapper dummyDownload) {
-  expect(download.contentIdentifier, dummyDownload.contentIdentifier);
-  expect(download.state, dummyDownload.state);
-  expect(download.contentLength, dummyDownload.contentLength);
-  expect(download.contentURL, dummyDownload.contentURL);
-  expect(download.contentVersion, dummyDownload.contentVersion);
-  expect(download.transactionID, dummyDownload.transactionID);
-  expect(download.progress, dummyDownload.progress);
-  expect(download.timeRemaining, dummyDownload.timeRemaining);
-  expect(download.downloadTimeUnknown, dummyDownload.downloadTimeUnknown);
-  expect(download.error.code, dummyDownload.error.code);
-  expect(download.error.domain, dummyDownload.error.domain);
-  expect(download.error.userInfo, dummyDownload.error.userInfo);
-}
-
-void testPayment(SKPaymentWrapper payment, SKPaymentWrapper dummyPayment) {
-  expect(payment.productIdentifier, dummyPayment.productIdentifier);
-  expect(payment.applicationUsername, dummyPayment.applicationUsername);
-  expect(payment.requestData, dummyPayment.requestData);
-  expect(payment.quantity, dummyPayment.quantity);
-  expect(payment.simulatesAskToBuyInSandbox,
-      dummyPayment.simulatesAskToBuyInSandbox);
-}
-
-void testTransaction(SKPaymentTransactionWrapper transaction,
-    SKPaymentTransactionWrapper dummyTransaction) {
-  // payment
-  SKPaymentWrapper payment = transaction.payment;
-  SKPaymentWrapper dummyPayment = dummyTransaction.payment;
-  testPayment(payment, dummyPayment);
-  //download
-  SKDownloadWrapper download = transaction.downloads.first;
-  SKDownloadWrapper dummyDownload = dummyTransaction.downloads.first;
-  testDownload(download, dummyDownload);
-  //error
-  SKError error = transaction.error;
-  SKError dummyError = dummyTransaction.error;
-  testSKError(error, dummyError);
-
-  expect(transaction.transactionState, dummyTransaction.transactionState);
-  expect(
-      transaction.transactionTimeStamp, dummyTransaction.transactionTimeStamp);
-  expect(transaction.transactionIdentifier,
-      dummyTransaction.transactionIdentifier);
-}
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
index cc806d068b76..107826f3a044 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
@@ -5,54 +5,18 @@
 import 'package:test/test.dart';
 import 'package:in_app_purchase/src/store_kit_wrappers/sk_product_wrapper.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
+import 'package:in_app_purchase/store_kit_wrappers.dart';
+import 'sk_test_stub_objects.dart';
 
 void main() {
-  final Map<String, dynamic> localeMap = <String, dynamic>{
-    'currencySymbol': '\$'
-  };
-  final Map<String, dynamic> subMap = <String, dynamic>{
-    'numberOfUnits': 1,
-    'unit': 2
-  };
-  final Map<String, dynamic> discountMap = <String, dynamic>{
-    'price': '1.0',
-    'priceLocale': localeMap,
-    'numberOfPeriods': 1,
-    'paymentMode': 2,
-    'subscriptionPeriod': subMap,
-  };
-  final Map<String, dynamic> productMap = <String, dynamic>{
-    'productIdentifier': 'id',
-    'localizedTitle': 'title',
-    'localizedDescription': 'description',
-    'priceLocale': localeMap,
-    'downloadContentVersion': 'version',
-    'subscriptionGroupIdentifier': 'com.group',
-    'price': '1.0',
-    'downloadable': true,
-    'downloadContentLengths': <int>[1, 2],
-    'subscriptionPeriod': subMap,
-    'introductoryPrice': discountMap,
-  };
-
-  final Map<String, List<dynamic>> productResponseMap = <String, List<dynamic>>{
-    'products': <Map<String, dynamic>>[productMap],
-    'invalidProductIdentifiers': <String>['123'],
-  };
-
-  group('product request wrapper test', () {
-    void testMatchLocale(
-        PriceLocaleWrapper wrapper, Map<String, dynamic> localeMap) {
-      expect(wrapper.currencySymbol, localeMap['currencySymbol']);
-    }
-
+  group('product related object wrapper test', () {
     test(
         'SKProductSubscriptionPeriodWrapper should have property values consistent with map',
         () {
       final SKProductSubscriptionPeriodWrapper wrapper =
-          SKProductSubscriptionPeriodWrapper.fromJson(subMap);
-      expect(wrapper.numberOfUnits, subMap['numberOfUnits']);
-      expect(wrapper.unit, SubscriptionPeriodUnit.values[subMap['unit']]);
+          SKProductSubscriptionPeriodWrapper.fromJson(
+              buildSubscriptionPeriodMap(dummySubscription));
+      expect(wrapper, equals(dummySubscription));
     });
 
     test(
@@ -68,18 +32,8 @@ void main() {
         'SKProductDiscountWrapper should have property values consistent with map',
         () {
       final SKProductDiscountWrapper wrapper =
-          SKProductDiscountWrapper.fromJson(discountMap);
-      expect(wrapper.price, discountMap['price']);
-      testMatchLocale(wrapper.priceLocale, discountMap['priceLocale']);
-      expect(wrapper.numberOfPeriods, discountMap['numberOfPeriods']);
-      expect(wrapper.paymentMode,
-          ProductDiscountPaymentMode.values[discountMap['paymentMode']]);
-      expect(
-          wrapper.subscriptionPeriod.unit,
-          SubscriptionPeriodUnit
-              .values[discountMap['subscriptionPeriod']['unit']]);
-      expect(wrapper.subscriptionPeriod.numberOfUnits,
-          discountMap['subscriptionPeriod']['numberOfUnits']);
+          SKProductDiscountWrapper.fromJson(buildDiscountMap(dummyDiscount));
+      expect(wrapper, equals(dummyDiscount));
     });
 
     test(
@@ -94,49 +48,11 @@ void main() {
       expect(wrapper.subscriptionPeriod, null);
     });
 
-    void testMatchingProductMap(
-        SKProductWrapper wrapper, Map<String, dynamic> productMap) {
-      expect(wrapper.productIdentifier, productMap['productIdentifier']);
-      expect(wrapper.localizedTitle, productMap['localizedTitle']);
-      testMatchLocale(wrapper.priceLocale, productMap['priceLocale']);
-      expect(wrapper.localizedDescription, productMap['localizedDescription']);
-      expect(
-          wrapper.downloadContentVersion, productMap['downloadContentVersion']);
-      expect(wrapper.subscriptionGroupIdentifier,
-          productMap['subscriptionGroupIdentifier']);
-      expect(wrapper.price, productMap['price']);
-      expect(wrapper.downloadable, productMap['downloadable']);
-      expect(
-          wrapper.downloadContentLengths, productMap['downloadContentLengths']);
-      expect(wrapper.introductoryPrice.price,
-          productMap['introductoryPrice']['price']);
-      expect(wrapper.introductoryPrice.numberOfPeriods,
-          productMap['introductoryPrice']['numberOfPeriods']);
-      expect(
-          wrapper.introductoryPrice.paymentMode,
-          ProductDiscountPaymentMode
-              .values[productMap['introductoryPrice']['paymentMode']]);
-      expect(
-          wrapper.introductoryPrice.subscriptionPeriod.unit,
-          SubscriptionPeriodUnit.values[productMap['introductoryPrice']
-              ['subscriptionPeriod']['unit']]);
-      expect(
-          wrapper.introductoryPrice.subscriptionPeriod.numberOfUnits,
-          productMap['introductoryPrice']['subscriptionPeriod']
-              ['numberOfUnits']);
-      expect(
-          wrapper.subscriptionPeriod.unit,
-          SubscriptionPeriodUnit
-              .values[productMap['subscriptionPeriod']['unit']]);
-      expect(wrapper.subscriptionPeriod.numberOfUnits,
-          productMap['subscriptionPeriod']['numberOfUnits']);
-      expect(wrapper.price, discountMap['price']);
-    }
-
     test('SKProductWrapper should have property values consistent with map',
         () {
-      final SKProductWrapper wrapper = SKProductWrapper.fromJson(productMap);
-      testMatchingProductMap(wrapper, productMap);
+      final SKProductWrapper wrapper =
+          SKProductWrapper.fromJson(buildProductMap(dummyProductWrapper));
+      expect(wrapper, equals(dummyProductWrapper));
     });
 
     test('SKProductWrapper should have properties to be null if map is empty',
@@ -155,7 +71,8 @@ void main() {
     });
 
     test('toProductDetails() should return correct Product object', () {
-      final SKProductWrapper wrapper = SKProductWrapper.fromJson(productMap);
+      final SKProductWrapper wrapper =
+          SKProductWrapper.fromJson(buildProductMap(dummyProductWrapper));
       final ProductDetails product = wrapper.toProductDetails();
       expect(product.title, wrapper.localizedTitle);
       expect(product.description, wrapper.localizedDescription);
@@ -166,11 +83,9 @@ void main() {
 
     test('SKProductResponse wrapper should match', () {
       final SkProductResponseWrapper wrapper =
-          SkProductResponseWrapper.fromJson(productResponseMap);
-      testMatchingProductMap(
-          wrapper.products[0], productResponseMap['products'][0]);
-      expect(wrapper.invalidProductIdentifiers,
-          productResponseMap['invalidProductIdentifiers']);
+          SkProductResponseWrapper.fromJson(
+              buildProductResponseMap(dummyProductResponseWrapper));
+      expect(wrapper, equals(dummyProductResponseWrapper));
     });
     test('SKProductResponse wrapper should default to empty list', () {
       final Map<String, List<dynamic>> productResponseMapEmptyList =
@@ -185,8 +100,48 @@ void main() {
     });
 
     test('LocaleWrapper should have property values consistent with map', () {
-      final PriceLocaleWrapper wrapper = PriceLocaleWrapper.fromJson(localeMap);
-      testMatchLocale(wrapper, localeMap);
+      final SKPriceLocaleWrapper wrapper =
+          SKPriceLocaleWrapper.fromJson(buildLocaleMap(dummyLocale));
+      expect(wrapper, equals(dummyLocale));
+    });
+  });
+
+  group('Payment queue related object tests', () {
+    test('Should construct correct SKPaymentWrapper from json', () {
+      SKPaymentWrapper payment =
+          SKPaymentWrapper.fromJson(dummyPayment.toMap());
+      expect(payment, equals(dummyPayment));
+    });
+
+    test('Should construct correct SKError from json', () {
+      SKError error = SKError.fromJson(buildErrorMap(dummyError));
+      expect(error, equals(dummyError));
+    });
+
+    test('Should construct correct SKDownloadWrapper from json', () {
+      SKDownloadWrapper download =
+          SKDownloadWrapper.fromJson(buildDownloadMap(dummyDownload));
+      expect(download, equals(dummyDownload));
+    });
+
+    test('Should construct correct SKTransactionWrapper from json', () {
+      SKPaymentTransactionWrapper transaction =
+          SKPaymentTransactionWrapper.fromJson(
+              buildTransactionMap(dummyTransaction));
+      expect(transaction, equals(dummyTransaction));
+    });
+
+    test('Should generate correct map of the payment object', () {
+      Map map = dummyPayment.toMap();
+      expect(map['productIdentifier'], dummyPayment.productIdentifier);
+      expect(map['applicationUsername'], dummyPayment.applicationUsername);
+
+      expect(map['requestData'], dummyPayment.requestData);
+
+      expect(map['quantity'], dummyPayment.quantity);
+
+      expect(map['simulatesAskToBuyInSandbox'],
+          dummyPayment.simulatesAskToBuyInSandbox);
     });
   });
 }
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_receipt_manager_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_receipt_manager_test.dart
deleted file mode 100644
index b35fd903b8ec..000000000000
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_receipt_manager_test.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:test/test.dart';
-import 'package:in_app_purchase/src/store_kit_wrappers/sk_receipt_manager.dart';
-import 'package:in_app_purchase/src/channel.dart';
-
-import '../stub_in_app_purchase_platform.dart';
-
-void main() {
-  final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
-
-  setUpAll(() =>
-      channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
-
-  group('retrieveReceiptData', () {
-    test('Should get result', () async {
-      stubPlatform.addResponse(
-          name: '-[InAppPurchasePlugin retrieveReceiptData:result:]',
-          value: 'dummy data');
-      final String result = await SKReceiptManager().retrieveReceiptData();
-      expect(result, 'dummy data');
-    });
-  });
-}
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
deleted file mode 100644
index 7bb623860a12..000000000000
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_request_test.dart
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:test/test.dart';
-import 'package:in_app_purchase/src/store_kit_wrappers/sk_product_wrapper.dart';
-import 'package:in_app_purchase/src/channel.dart';
-import 'package:in_app_purchase/src/store_kit_wrappers/sk_request_maker.dart';
-import '../stub_in_app_purchase_platform.dart';
-
-void main() {
-  final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
-
-  final Map<String, dynamic> localeMap = <String, dynamic>{
-    'currencySymbol': '\$'
-  };
-  final Map<String, dynamic> subMap = <String, dynamic>{
-    'numberOfUnits': 1,
-    'unit': 2
-  };
-  final Map<String, dynamic> discountMap = <String, dynamic>{
-    'price': '1.0',
-    'priceLocale': localeMap,
-    'numberOfPeriods': 1,
-    'paymentMode': 2,
-    'subscriptionPeriod': subMap,
-  };
-  final Map<String, dynamic> productMap = <String, dynamic>{
-    'productIdentifier': 'id',
-    'localizedTitle': 'title',
-    'localizedDescription': 'description',
-    'priceLocale': localeMap,
-    'downloadContentVersion': 'version',
-    'subscriptionGroupIdentifier': 'com.group',
-    'price': '1.0',
-    'downloadable': true,
-    'downloadContentLengths': <int>[1, 2],
-    'subscriptionPeriod': subMap,
-    'introductoryPrice': discountMap,
-  };
-
-  final Map<String, List<dynamic>> productResponseMap = <String, List<dynamic>>{
-    'products': <Map<String, dynamic>>[productMap],
-    'invalidProductIdentifiers': <String>['123'],
-  };
-
-  setUpAll(() =>
-      channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
-
-  group('startProductRequest api', () {
-    test('platform call should get result', () async {
-      stubPlatform.addResponse(
-          name: '-[InAppPurchasePlugin startProductRequest:result:]',
-          value: productResponseMap);
-      final SKRequestMaker request = SKRequestMaker();
-      final SkProductResponseWrapper response =
-          await request.startProductRequest(<String>['123']);
-      expect(
-        response.products,
-        isNotEmpty,
-      );
-      expect(
-        response.products.first.priceLocale.currencySymbol,
-        '\$',
-      );
-      expect(
-        response.products.first.priceLocale.currencySymbol,
-        isNot('A'),
-      );
-      expect(
-        response.invalidProductIdentifiers,
-        isNotEmpty,
-      );
-    });
-
-    test('result is null should throw', () async {
-      stubPlatform.addResponse(
-          name: '-[InAppPurchasePlugin startProductRequest:result:]',
-          value: null);
-      final SKRequestMaker request = SKRequestMaker();
-      expect(
-        request.startProductRequest(<String>['123']),
-        throwsException,
-      );
-    });
-  });
-}
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_test_stub_objects.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_test_stub_objects.dart
new file mode 100644
index 000000000000..7fc8363d21ad
--- /dev/null
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_test_stub_objects.dart
@@ -0,0 +1,179 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:in_app_purchase/store_kit_wrappers.dart';
+
+final dummyPayment = SKPaymentWrapper(
+    productIdentifier: 'prod-id',
+    applicationUsername: 'app-user-name',
+    requestData: 'fake-data-utf8',
+    quantity: 2,
+    simulatesAskToBuyInSandbox: true);
+final SKError dummyError =
+    SKError(code: 111, domain: 'dummy-domain', userInfo: {'key': 'value'});
+final SKDownloadWrapper dummyDownload = SKDownloadWrapper(
+  contentIdentifier: 'id',
+  state: SKDownloadState.failed,
+  contentLength: 32,
+  contentURL: 'https://download.com',
+  contentVersion: '0.0.1',
+  transactionID: 'tranID',
+  progress: 0.6,
+  timeRemaining: 1231231,
+  downloadTimeUnknown: false,
+  error: dummyError,
+);
+final SKPaymentTransactionWrapper dummyOriginalTransaction =
+    SKPaymentTransactionWrapper(
+  transactionState: SKPaymentTransactionStateWrapper.purchased,
+  payment: dummyPayment,
+  originalTransaction: null,
+  transactionTimeStamp: 1231231231.00,
+  transactionIdentifier: '123123',
+  downloads: [dummyDownload],
+  error: dummyError,
+);
+final SKPaymentTransactionWrapper dummyTransaction =
+    SKPaymentTransactionWrapper(
+  transactionState: SKPaymentTransactionStateWrapper.purchased,
+  payment: dummyPayment,
+  originalTransaction: dummyOriginalTransaction,
+  transactionTimeStamp: 1231231231.00,
+  transactionIdentifier: '123123',
+  downloads: [dummyDownload],
+  error: dummyError,
+);
+
+final SKPriceLocaleWrapper dummyLocale =
+    SKPriceLocaleWrapper(currencySymbol: '\$');
+
+final SKProductSubscriptionPeriodWrapper dummySubscription =
+    SKProductSubscriptionPeriodWrapper(
+  numberOfUnits: 1,
+  unit: SKSubscriptionPeriodUnit.month,
+);
+
+final SKProductDiscountWrapper dummyDiscount = SKProductDiscountWrapper(
+  price: '1.0',
+  priceLocale: dummyLocale,
+  numberOfPeriods: 1,
+  paymentMode: SKProductDiscountPaymentMode.payUpFront,
+  subscriptionPeriod: dummySubscription,
+);
+
+final SKProductWrapper dummyProductWrapper = SKProductWrapper(
+  productIdentifier: 'id',
+  localizedTitle: 'title',
+  localizedDescription: 'description',
+  priceLocale: dummyLocale,
+  downloadContentVersion: 'version',
+  subscriptionGroupIdentifier: 'com.group',
+  price: '1.0',
+  downloadable: true,
+  downloadContentLengths: <int>[1, 2],
+  subscriptionPeriod: dummySubscription,
+  introductoryPrice: dummyDiscount,
+);
+
+final SkProductResponseWrapper dummyProductResponseWrapper =
+    SkProductResponseWrapper(
+  products: [dummyProductWrapper],
+  invalidProductIdentifiers: <String>['123'],
+);
+
+Map<String, dynamic> buildLocaleMap(SKPriceLocaleWrapper local) {
+  return {'currencySymbol': local.currencySymbol};
+}
+
+Map<String, dynamic> buildSubscriptionPeriodMap(
+    SKProductSubscriptionPeriodWrapper sub) {
+  return {
+    'numberOfUnits': sub.numberOfUnits,
+    'unit': SKSubscriptionPeriodUnit.values.indexOf(sub.unit),
+  };
+}
+
+Map<String, dynamic> buildDiscountMap(SKProductDiscountWrapper discount) {
+  return {
+    'price': discount.price,
+    'priceLocale': buildLocaleMap(discount.priceLocale),
+    'numberOfPeriods': discount.numberOfPeriods,
+    'paymentMode':
+        SKProductDiscountPaymentMode.values.indexOf(discount.paymentMode),
+    'subscriptionPeriod':
+        buildSubscriptionPeriodMap(discount.subscriptionPeriod),
+  };
+}
+
+Map<String, dynamic> buildProductMap(SKProductWrapper product) {
+  return {
+    'productIdentifier': product.productIdentifier,
+    'localizedTitle': product.localizedTitle,
+    'localizedDescription': product.localizedDescription,
+    'priceLocale': buildLocaleMap(product.priceLocale),
+    'downloadContentVersion': product.downloadContentVersion,
+    'subscriptionGroupIdentifier': product.subscriptionGroupIdentifier,
+    'price': product.price,
+    'downloadable': product.downloadable,
+    'downloadContentLengths': product.downloadContentLengths,
+    'subscriptionPeriod':
+        buildSubscriptionPeriodMap(product.subscriptionPeriod),
+    'introductoryPrice': buildDiscountMap(product.introductoryPrice),
+  };
+}
+
+Map<String, dynamic> buildProductResponseMap(
+    SkProductResponseWrapper response) {
+  List productsMap = response.products
+      .map((SKProductWrapper product) => buildProductMap(product))
+      .toList();
+  return {
+    'products': productsMap,
+    'invalidProductIdentifiers': response.invalidProductIdentifiers
+  };
+}
+
+Map<String, dynamic> buildErrorMap(SKError error) {
+  return {
+    'code': error.code,
+    'domain': error.domain,
+    'userInfo': error.userInfo,
+  };
+}
+
+Map<String, dynamic> buildDownloadMap(SKDownloadWrapper download) {
+  return {
+    'contentIdentifier': download.contentIdentifier,
+    'state': SKDownloadState.values.indexOf(download.state),
+    'contentLength': download.contentLength,
+    'contentURL': download.contentURL,
+    'contentVersion': download.contentVersion,
+    'transactionID': download.transactionID,
+    'progress': download.progress,
+    'timeRemaining': download.timeRemaining,
+    'downloadTimeUnknown': download.downloadTimeUnknown,
+    'error': buildErrorMap(download.error)
+  };
+}
+
+Map<String, dynamic> buildTransactionMap(
+    SKPaymentTransactionWrapper transaction) {
+  if (transaction == null) {
+    return null;
+  }
+  Map map = <String, dynamic>{
+    'transactionState': SKPaymentTransactionStateWrapper.values
+        .indexOf(SKPaymentTransactionStateWrapper.purchased),
+    'payment': transaction.payment.toMap(),
+    'originalTransaction': buildTransactionMap(transaction.originalTransaction),
+    'transactionTimeStamp': transaction.transactionTimeStamp,
+    'transactionIdentifier': transaction.transactionIdentifier,
+    'error': buildErrorMap(transaction.error),
+  };
+  List downloadList = transaction.downloads.map((SKDownloadWrapper download) {
+    return buildDownloadMap(download);
+  }).toList();
+  map['downloads'] = downloadList;
+  return map;
+}

From 16b8678b7f3d1da24f7cf8deed7d674f07c9b000 Mon Sep 17 00:00:00 2001
From: Michael Goderbauer <goderbauer@google.com>
Date: Thu, 7 Mar 2019 18:24:49 -0800
Subject: [PATCH 207/410] Exclude longPress from semantics (#1324)

* Exclude longPress from semantics

* pubspec changelog

* change version to 0.3.3+2
---
 packages/webview_flutter/CHANGELOG.md             | 4 ++++
 packages/webview_flutter/lib/webview_flutter.dart | 1 +
 packages/webview_flutter/pubspec.yaml             | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 74c8f4d340f4..889a6a144424 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.3+2
+
+* Exclude LongPress handler from semantics tree since it does nothing.
+
 ## 0.3.3+1
 
 * Fixed a memory leak on Android - the WebView was not properly disposed.
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index 648f75a33f84..4f0285273df7 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -153,6 +153,7 @@ class _WebViewState extends State<WebView> {
         // handles are not showing.
         // TODO(amirh): remove this when the issues above are fixed.
         onLongPress: () {},
+        excludeFromSemantics: true,
         child: AndroidView(
           viewType: 'plugins.flutter.io/webview',
           onPlatformViewCreated: _onPlatformViewCreated,
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index de8600f8419a..8307e1fc7206 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.3+1
+version: 0.3.3+2
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From e0a62346e2f791680cdbf2e31b13db6f6b7f8c57 Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Fri, 8 Mar 2019 11:34:28 -0800
Subject: [PATCH 208/410] [image_picker] remove unnecessary camera permmision
 (#1268)

fixed flutter/flutter#19806
---
 .../android/src/main/AndroidManifest.xml      |  1 -
 .../imagepicker/ImagePickerDelegate.java      | 24 ------
 .../imagepicker/ImagePickerDelegateTest.java  | 85 -------------------
 3 files changed, 110 deletions(-)

diff --git a/packages/image_picker/android/src/main/AndroidManifest.xml b/packages/image_picker/android/src/main/AndroidManifest.xml
index dba1508f1883..f0bc86fbf0ac 100755
--- a/packages/image_picker/android/src/main/AndroidManifest.xml
+++ b/packages/image_picker/android/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
   package="io.flutter.plugins.imagepicker">
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-   <uses-permission android:name="android.permission.CAMERA"/>
 
     <application>
         <provider
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
index 68a6aabc462a..a990c435106f 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
@@ -68,11 +68,9 @@ public class ImagePickerDelegate
   @VisibleForTesting static final int REQUEST_CODE_CHOOSE_IMAGE_FROM_GALLERY = 2342;
   @VisibleForTesting static final int REQUEST_CODE_TAKE_IMAGE_WITH_CAMERA = 2343;
   @VisibleForTesting static final int REQUEST_EXTERNAL_IMAGE_STORAGE_PERMISSION = 2344;
-  @VisibleForTesting static final int REQUEST_CAMERA_IMAGE_PERMISSION = 2345;
   @VisibleForTesting static final int REQUEST_CODE_CHOOSE_VIDEO_FROM_GALLERY = 2352;
   @VisibleForTesting static final int REQUEST_CODE_TAKE_VIDEO_WITH_CAMERA = 2353;
   @VisibleForTesting static final int REQUEST_EXTERNAL_VIDEO_STORAGE_PERMISSION = 2354;
-  @VisibleForTesting static final int REQUEST_CAMERA_VIDEO_PERMISSION = 2355;
 
   @VisibleForTesting final String fileProviderName;
 
@@ -212,12 +210,6 @@ public void takeVideoWithCamera(MethodCall methodCall, MethodChannel.Result resu
       return;
     }
 
-    if (!permissionManager.isPermissionGranted(Manifest.permission.CAMERA)) {
-      permissionManager.askForPermission(
-          Manifest.permission.CAMERA, REQUEST_CAMERA_VIDEO_PERMISSION);
-      return;
-    }
-
     launchTakeVideoWithCameraIntent();
   }
 
@@ -268,12 +260,6 @@ public void takeImageWithCamera(MethodCall methodCall, MethodChannel.Result resu
       return;
     }
 
-    if (!permissionManager.isPermissionGranted(Manifest.permission.CAMERA)) {
-      permissionManager.askForPermission(
-          Manifest.permission.CAMERA, REQUEST_CAMERA_IMAGE_PERMISSION);
-      return;
-    }
-
     launchTakeImageWithCameraIntent();
   }
 
@@ -347,16 +333,6 @@ public boolean onRequestPermissionsResult(
           launchPickVideoFromGalleryIntent();
         }
         break;
-      case REQUEST_CAMERA_IMAGE_PERMISSION:
-        if (permissionGranted) {
-          launchTakeImageWithCameraIntent();
-        }
-        break;
-      case REQUEST_CAMERA_VIDEO_PERMISSION:
-        if (permissionGranted) {
-          launchTakeVideoWithCameraIntent();
-        }
-        break;
       default:
         return false;
     }
diff --git a/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java b/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
index 5f560d480660..6a80841e5b78 100644
--- a/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
+++ b/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
@@ -128,46 +128,6 @@ public void takeImageWithCamera_WhenPendingResultExists_FinishesWithAlreadyActiv
     verifyNoMoreInteractions(mockResult);
   }
 
-  @Test
-  public void takeImageWithCamera_WhenHasNoCameraPermission_RequestsForPermission() {
-    when(mockPermissionManager.isPermissionGranted(Manifest.permission.CAMERA)).thenReturn(false);
-
-    ImagePickerDelegate delegate = createDelegate();
-    delegate.takeImageWithCamera(mockMethodCall, mockResult);
-
-    verify(mockPermissionManager)
-        .askForPermission(
-            Manifest.permission.CAMERA, ImagePickerDelegate.REQUEST_CAMERA_IMAGE_PERMISSION);
-  }
-
-  @Test
-  public void
-      takeImageWithCamera_WhenHasCameraPermission_AndAnActivityCanHandleCameraIntent_LaunchesTakeWithCameraIntent() {
-    when(mockPermissionManager.isPermissionGranted(Manifest.permission.CAMERA)).thenReturn(true);
-    when(mockIntentResolver.resolveActivity(any(Intent.class))).thenReturn(true);
-
-    ImagePickerDelegate delegate = createDelegate();
-    delegate.takeImageWithCamera(mockMethodCall, mockResult);
-
-    verify(mockActivity)
-        .startActivityForResult(
-            any(Intent.class), eq(ImagePickerDelegate.REQUEST_CODE_TAKE_IMAGE_WITH_CAMERA));
-  }
-
-  @Test
-  public void
-      takeImageWithCamera_WhenHasCameraPermission_AndNoActivityToHandleCameraIntent_FinishesWithNoCamerasAvailableError() {
-    when(mockPermissionManager.isPermissionGranted(Manifest.permission.CAMERA)).thenReturn(true);
-    when(mockIntentResolver.resolveActivity(any(Intent.class))).thenReturn(false);
-
-    ImagePickerDelegate delegate = createDelegate();
-    delegate.takeImageWithCamera(mockMethodCall, mockResult);
-
-    verify(mockResult)
-        .error("no_available_camera", "No cameras available for taking pictures.", null);
-    verifyNoMoreInteractions(mockResult);
-  }
-
   @Test
   public void
       onRequestPermissionsResult_WhenReadExternalStoragePermissionDenied_FinishesWithNull() {
@@ -212,51 +172,6 @@ public void takeImageWithCamera_WhenHasNoCameraPermission_RequestsForPermission(
             any(Intent.class), eq(ImagePickerDelegate.REQUEST_CODE_CHOOSE_VIDEO_FROM_GALLERY));
   }
 
-  @Test
-  public void onRequestPermissionsResult_WhenCameraPermissionDenied_FinishesWithNull() {
-    ImagePickerDelegate delegate = createDelegateWithPendingResultAndMethodCall();
-
-    delegate.onRequestPermissionsResult(
-        ImagePickerDelegate.REQUEST_CAMERA_IMAGE_PERMISSION,
-        new String[] {Manifest.permission.CAMERA},
-        new int[] {PackageManager.PERMISSION_DENIED});
-
-    verify(mockResult).success(null);
-    verifyNoMoreInteractions(mockResult);
-  }
-
-  @Test
-  public void
-      onRequestTakeVideoPermissionsResult_WhenCameraPermissionGranted_LaunchesTakeVideoWithCameraIntent() {
-    when(mockIntentResolver.resolveActivity(any(Intent.class))).thenReturn(true);
-
-    ImagePickerDelegate delegate = createDelegateWithPendingResultAndMethodCall();
-    delegate.onRequestPermissionsResult(
-        ImagePickerDelegate.REQUEST_CAMERA_VIDEO_PERMISSION,
-        new String[] {Manifest.permission.CAMERA},
-        new int[] {PackageManager.PERMISSION_GRANTED});
-
-    verify(mockActivity)
-        .startActivityForResult(
-            any(Intent.class), eq(ImagePickerDelegate.REQUEST_CODE_TAKE_VIDEO_WITH_CAMERA));
-  }
-
-  @Test
-  public void
-      onRequestTakeImagePermissionsResult_WhenCameraPermissionGranted_LaunchesTakeWithCameraIntent() {
-    when(mockIntentResolver.resolveActivity(any(Intent.class))).thenReturn(true);
-
-    ImagePickerDelegate delegate = createDelegateWithPendingResultAndMethodCall();
-    delegate.onRequestPermissionsResult(
-        ImagePickerDelegate.REQUEST_CAMERA_IMAGE_PERMISSION,
-        new String[] {Manifest.permission.CAMERA},
-        new int[] {PackageManager.PERMISSION_GRANTED});
-
-    verify(mockActivity)
-        .startActivityForResult(
-            any(Intent.class), eq(ImagePickerDelegate.REQUEST_CODE_TAKE_IMAGE_WITH_CAMERA));
-  }
-
   @Test
   public void onActivityResult_WhenPickFromGalleryCanceled_FinishesWithNull() {
     ImagePickerDelegate delegate = createDelegateWithPendingResultAndMethodCall();

From 4a541f5ef115c5f06ab00c70cf5d3da764fdc440 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Fri, 8 Mar 2019 12:34:38 -0800
Subject: [PATCH 209/410] [image_picker] Update versioning for #1268 (#1326)

---
 packages/image_picker/CHANGELOG.md | 4 ++++
 packages/image_picker/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index e0956f2b7163..27713d639848 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.0+5
+
+Remove unnecessary camera permmision.
+
 ## 0.5.0+4
 
 Preserve transparency when saving images.
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 7a6ac9da6b21..7a1a57fd233b 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.0+4
+version: 0.5.0+5
 
 flutter:
   plugin:

From 79512791b032acd8662ca1580a646e90b1b28f74 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Fri, 8 Mar 2019 15:38:27 -0800
Subject: [PATCH 210/410] Change build link in contributors site to cirrus
 (#1327)

We do not use travis-ci anymore
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bdc010cdcb56..919c80947617 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 Contributing to Flutter
 =======================
 
-[![Build Status](https://travis-ci.org/flutter/plugins.svg)](https://travis-ci.org/flutter/plugins)
+[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)
 
 _See also: [Flutter's code of conduct](https://flutter.io/design-principles/#code-of-conduct)_
 

From 45cc819bf753e61409d19354d5ff4d1fc31f91ce Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Fri, 8 Mar 2019 19:41:40 -0800
Subject: [PATCH 211/410] Allow specifying a navigation delegate (iOS
 implementation). (#1323)

This is the iOS implementation of the navigation delegate method channel.

The Dart and Android implementations are in #1236

Splitting off the iOS to keep a reasonable change size.
This PR will be merged first.

flutter/flutter#25329
---
 .../xcshareddata/IDEWorkspaceChecks.plist     |  8 +++
 .../xcshareddata/WorkspaceSettings.xcsettings |  8 +++
 .../ios/Classes/FLTWKNavigationDelegate.h     | 21 +++++++
 .../ios/Classes/FLTWKNavigationDelegate.m     | 59 +++++++++++++++++++
 .../ios/Classes/FlutterWebView.m              |  7 +++
 5 files changed, 103 insertions(+)
 create mode 100644 packages/webview_flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 packages/webview_flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 create mode 100644 packages/webview_flutter/ios/Classes/FLTWKNavigationDelegate.h
 create mode 100644 packages/webview_flutter/ios/Classes/FLTWKNavigationDelegate.m

diff --git a/packages/webview_flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/webview_flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000000..18d981003d68
--- /dev/null
+++ b/packages/webview_flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/packages/webview_flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/webview_flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000000..949b67898200
--- /dev/null
+++ b/packages/webview_flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+</dict>
+</plist>
diff --git a/packages/webview_flutter/ios/Classes/FLTWKNavigationDelegate.h b/packages/webview_flutter/ios/Classes/FLTWKNavigationDelegate.h
new file mode 100644
index 000000000000..1625c4999bd2
--- /dev/null
+++ b/packages/webview_flutter/ios/Classes/FLTWKNavigationDelegate.h
@@ -0,0 +1,21 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <Flutter/Flutter.h>
+#import <WebKit/WebKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FLTWKNavigationDelegate : NSObject <WKNavigationDelegate>
+
+- (instancetype)initWithChannel:(FlutterMethodChannel*)channel;
+
+/**
+ * Whether to delegate navigation decisions over the method channel.
+ */
+@property(nonatomic, assign) BOOL hasDartNavigationDelegate;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/packages/webview_flutter/ios/Classes/FLTWKNavigationDelegate.m b/packages/webview_flutter/ios/Classes/FLTWKNavigationDelegate.m
new file mode 100644
index 000000000000..3638ddcda117
--- /dev/null
+++ b/packages/webview_flutter/ios/Classes/FLTWKNavigationDelegate.m
@@ -0,0 +1,59 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "FLTWKNavigationDelegate.h"
+
+@implementation FLTWKNavigationDelegate {
+  FlutterMethodChannel* _methodChannel;
+}
+
+- (instancetype)initWithChannel:(FlutterMethodChannel*)channel {
+  self = [super init];
+  if (self) {
+    _methodChannel = channel;
+  }
+  return self;
+}
+
+- (void)webView:(WKWebView*)webView
+    decidePolicyForNavigationAction:(WKNavigationAction*)navigationAction
+                    decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
+  if (!self.hasDartNavigationDelegate) {
+    decisionHandler(WKNavigationActionPolicyAllow);
+    return;
+  }
+  NSDictionary* arguments = @{
+    @"url" : navigationAction.request.URL.absoluteString,
+    @"isForMainFrame" : @(navigationAction.targetFrame.isMainFrame)
+  };
+  [_methodChannel invokeMethod:@"navigationRequest"
+                     arguments:arguments
+                        result:^(id _Nullable result) {
+                          if ([result isKindOfClass:[FlutterError class]]) {
+                            NSLog(@"navigationRequest has unexpectedly completed with an error, "
+                                  @"allowing navigation.");
+                            decisionHandler(WKNavigationActionPolicyAllow);
+                            return;
+                          }
+                          if (result == FlutterMethodNotImplemented) {
+                            NSLog(@"navigationRequest was unexepectedly not implemented: %@, "
+                                  @"allowing navigation.",
+                                  result);
+                            decisionHandler(WKNavigationActionPolicyAllow);
+                            return;
+                          }
+                          if (![result isKindOfClass:[NSNumber class]]) {
+                            NSLog(@"navigationRequest unexpectedly returned a non boolean value: "
+                                  @"%@, allowing navigation.",
+                                  result);
+                            decisionHandler(WKNavigationActionPolicyAllow);
+                            return;
+                          }
+                          NSNumber* typedResult = result;
+                          decisionHandler([typedResult boolValue] ? WKNavigationActionPolicyAllow
+                                                                  : WKNavigationActionPolicyCancel);
+                        }];
+}
+
+@end
diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m
index 87d4d25bd9dc..ea3b192f47ff 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.m
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #import "FlutterWebView.h"
+#import "FLTWKNavigationDelegate.h"
 #import "JavaScriptChannelHandler.h"
 
 @implementation FLTWebViewFactory {
@@ -40,6 +41,7 @@ @implementation FLTWebViewController {
   NSString* _currentUrl;
   // The set of registered JavaScript channel names.
   NSMutableSet* _javaScriptChannelNames;
+  FLTWKNavigationDelegate* _navigationDelegate;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -64,6 +66,8 @@ - (instancetype)initWithFrame:(CGRect)frame
     configuration.userContentController = userContentController;
 
     _webView = [[WKWebView alloc] initWithFrame:frame configuration:configuration];
+    _navigationDelegate = [[FLTWKNavigationDelegate alloc] initWithChannel:_channel];
+    _webView.navigationDelegate = _navigationDelegate;
     __weak __typeof__(self) weakSelf = self;
     [_channel setMethodCallHandler:^(FlutterMethodCall* call, FlutterResult result) {
       [weakSelf onMethodCall:call result:result];
@@ -229,6 +233,9 @@ - (void)applySettings:(NSDictionary<NSString*, id>*)settings {
     if ([key isEqualToString:@"jsMode"]) {
       NSNumber* mode = settings[key];
       [self updateJsMode:mode];
+    } else if ([key isEqualToString:@"hasNavigationDelegate"]) {
+      NSNumber* hasDartNavigationDelegate = settings[key];
+      _navigationDelegate.hasDartNavigationDelegate = [hasDartNavigationDelegate boolValue];
     } else {
       NSLog(@"webview_flutter: unknown setting key: %@", key);
     }

From 9017d6e7f867af278edd7e8e584d52524f37443f Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Fri, 8 Mar 2019 20:06:06 -0800
Subject: [PATCH 212/410] [webview_flutter]Allow specifying a navigation
 delegate(Android and Dart). (#1236)

This allows the app to prevent specific navigations(e.g prevent
navigating to specific URLs).

flutter/flutter#25329

iOS implementation in #1323
---
 packages/webview_flutter/CHANGELOG.md         |   4 +
 packages/webview_flutter/android/build.gradle |   4 +
 .../webviewflutter/FlutterWebView.java        |  10 ++
 .../webviewflutter/FlutterWebViewClient.java  | 124 ++++++++++++++++++
 .../example/android/gradle.properties         |   1 +
 .../webview_flutter/example/lib/main.dart     |  51 +++++--
 .../webview_flutter/lib/webview_flutter.dart  | 109 +++++++++++++--
 packages/webview_flutter/pubspec.yaml         |   2 +-
 .../test/webview_flutter_test.dart            | 100 ++++++++++++--
 9 files changed, 373 insertions(+), 32 deletions(-)
 create mode 100644 packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 889a6a144424..7a3256a350b3 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.4
+
+* Support specifying navigation delegates that can prevent navigations from being executed.
+
 ## 0.3.3+2
 
 * Exclude LongPress handler from semantics tree since it does nothing.
diff --git a/packages/webview_flutter/android/build.gradle b/packages/webview_flutter/android/build.gradle
index 098c2f4bf388..45ab74d37938 100644
--- a/packages/webview_flutter/android/build.gradle
+++ b/packages/webview_flutter/android/build.gradle
@@ -44,4 +44,8 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
+
+    dependencies {
+        implementation 'androidx.webkit:webkit:1.0.0'
+    }
 }
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index 44fe31fcf758..070ba74a9669 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -4,7 +4,9 @@
 
 package io.flutter.plugins.webviewflutter;
 
+import android.annotation.TargetApi;
 import android.content.Context;
+import android.os.Build;
 import android.view.View;
 import android.webkit.WebStorage;
 import android.webkit.WebView;
@@ -21,6 +23,7 @@ public class FlutterWebView implements PlatformView, MethodCallHandler {
   private static final String JS_CHANNEL_NAMES_FIELD = "javascriptChannelNames";
   private final WebView webView;
   private final MethodChannel methodChannel;
+  private final FlutterWebViewClient flutterWebViewClient;
 
   @SuppressWarnings("unchecked")
   FlutterWebView(Context context, BinaryMessenger messenger, int id, Map<String, Object> params) {
@@ -31,12 +34,15 @@ public class FlutterWebView implements PlatformView, MethodCallHandler {
     methodChannel = new MethodChannel(messenger, "plugins.flutter.io/webview_" + id);
     methodChannel.setMethodCallHandler(this);
 
+    flutterWebViewClient = new FlutterWebViewClient(methodChannel);
     applySettings((Map<String, Object>) params.get("settings"));
 
     if (params.containsKey(JS_CHANNEL_NAMES_FIELD)) {
       registerJavaScriptChannelNames((List<String>) params.get(JS_CHANNEL_NAMES_FIELD));
     }
 
+    webView.setWebViewClient(flutterWebViewClient);
+
     if (params.containsKey("initialUrl")) {
       String url = (String) params.get("initialUrl");
       webView.loadUrl(url);
@@ -135,6 +141,7 @@ private void updateSettings(MethodCall methodCall, Result result) {
     result.success(null);
   }
 
+  @TargetApi(Build.VERSION_CODES.KITKAT)
   private void evaluateJavaScript(MethodCall methodCall, final Result result) {
     String jsString = (String) methodCall.arguments;
     if (jsString == null) {
@@ -178,6 +185,9 @@ private void applySettings(Map<String, Object> settings) {
         case "jsMode":
           updateJsMode((Integer) settings.get(key));
           break;
+        case "hasNavigationDelegate":
+          flutterWebViewClient.setHasNavigationDelegate((boolean) settings.get(key));
+          break;
         default:
           throw new IllegalArgumentException("Unknown WebView setting: " + key);
       }
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java
new file mode 100644
index 000000000000..fe4482c154b0
--- /dev/null
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java
@@ -0,0 +1,124 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.webviewflutter;
+
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.util.Log;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebView;
+import androidx.webkit.WebViewClientCompat;
+import io.flutter.plugin.common.MethodChannel;
+import java.util.HashMap;
+import java.util.Map;
+
+// We need to use WebViewClientCompat to get
+// shouldOverrideUrlLoading(WebView view, WebResourceRequest request)
+// invoked by the webview on older Android devices, without it pages that use iframes will
+// be broken when a navigationDelegate is set on Android version earlier than N.
+class FlutterWebViewClient extends WebViewClientCompat {
+  private static final String TAG = "FlutterWebViewClient";
+  private final MethodChannel methodChannel;
+  private boolean hasNavigationDelegate;
+
+  FlutterWebViewClient(MethodChannel methodChannel) {
+    this.methodChannel = methodChannel;
+  }
+
+  void setHasNavigationDelegate(boolean hasNavigationDelegate) {
+    this.hasNavigationDelegate = hasNavigationDelegate;
+  }
+
+  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+  @Override
+  public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+    if (!hasNavigationDelegate) {
+      return false;
+    }
+    notifyOnNavigationRequest(
+        request.getUrl().toString(), request.getRequestHeaders(), view, request.isForMainFrame());
+    // We must make a synchronous decision here whether to allow the navigation or not,
+    // if the Dart code has set a navigation delegate we want that delegate to decide whether
+    // to navigate or not, and as we cannot get a response from the Dart delegate synchronously we
+    // return true here to block the navigation, if the Dart delegate decides to allow the
+    // navigation the plugin will later make an addition loadUrl call for this url.
+    //
+    // Since we cannot call loadUrl for a subframe, we currently only allow the delegate to stop
+    // navigations that target the main frame, if the request is not for the main frame
+    // we just return false to allow the navigation.
+    //
+    // For more details see: https://github.com/flutter/flutter/issues/25329#issuecomment-464863209
+    return request.isForMainFrame();
+  }
+
+  @Override
+  public boolean shouldOverrideUrlLoading(WebView view, String url) {
+    if (!hasNavigationDelegate) {
+      return false;
+    }
+    // This version of shouldOverrideUrlLoading is only invoked by the webview on devices with
+    // webview versions  earlier than 67(it is also invoked when hasNavigationDelegate is false).
+    // On these devices we cannot tell whether the navigation is targeted to the main frame or not.
+    // We proceed assuming that the navigation is targeted to the main frame. If the page had any
+    // frames they will be loaded in the main frame instead.
+    Log.w(
+        TAG,
+        "Using a navigationDelegate with an old webview implementation, pages with frames or iframes will not work");
+    notifyOnNavigationRequest(url, null, view, true);
+    return true;
+  }
+
+  private void notifyOnNavigationRequest(
+      String url, Map<String, String> headers, WebView webview, boolean isMainFrame) {
+    HashMap<String, Object> args = new HashMap<>();
+    args.put("url", url);
+    args.put("isForMainFrame", isMainFrame);
+    if (isMainFrame) {
+      methodChannel.invokeMethod(
+          "navigationRequest", args, new OnNavigationRequestResult(url, headers, webview));
+    } else {
+      methodChannel.invokeMethod("navigationRequest", args);
+    }
+  }
+
+  private static class OnNavigationRequestResult implements MethodChannel.Result {
+    private final String url;
+    private final Map<String, String> headers;
+    private final WebView webView;
+
+    private OnNavigationRequestResult(String url, Map<String, String> headers, WebView webView) {
+      this.url = url;
+      this.headers = headers;
+      this.webView = webView;
+    }
+
+    @Override
+    public void success(Object shouldLoad) {
+      Boolean typedShouldLoad = (Boolean) shouldLoad;
+      if (typedShouldLoad) {
+        loadUrl();
+      }
+    }
+
+    @Override
+    public void error(String errorCode, String s1, Object o) {
+      throw new IllegalStateException("navigationRequest calls must succeed");
+    }
+
+    @Override
+    public void notImplemented() {
+      throw new IllegalStateException(
+          "navigationRequest must be implemented by the webview method channel");
+    }
+
+    private void loadUrl() {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        webView.loadUrl(url, headers);
+      } else {
+        webView.loadUrl(url);
+      }
+    }
+  }
+}
diff --git a/packages/webview_flutter/example/android/gradle.properties b/packages/webview_flutter/example/android/gradle.properties
index 8bd86f680510..ad8917e962e5 100644
--- a/packages/webview_flutter/example/android/gradle.properties
+++ b/packages/webview_flutter/example/android/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
\ No newline at end of file
diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index f688b602a359..7d6ce10a56ad 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -3,11 +3,27 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
 void main() => runApp(MaterialApp(home: WebViewExample()));
 
+const String kNavigationExamplePage = '''
+<!DOCTYPE html><html>
+<head><title>Navigation Delegate Example</title></head>
+<body>
+<p>
+The navigation delegate is set to block navigation to the youtube website.
+</p>
+<ul>
+<ul><a href="https://www.youtube.com/">https://www.youtube.com/</a></ul>
+<ul><a href="https://www.google.com/">https://www.google.com/</a></ul>
+</ul>
+</body>
+</html>
+''';
+
 class WebViewExample extends StatelessWidget {
   final Completer<WebViewController> _controller =
       Completer<WebViewController>();
@@ -37,6 +53,14 @@ class WebViewExample extends StatelessWidget {
           javascriptChannels: <JavascriptChannel>[
             _toasterJavascriptChannel(context),
           ].toSet(),
+          navigationDelegate: (NavigationRequest request) {
+            if (request.url.startsWith('https://www.youtube.com/')) {
+              print('blocking navigation to $request}');
+              return NavigationDecision.prevent;
+            }
+            print('allowing navigation to $request');
+            return NavigationDecision.navigate;
+          },
         );
       }),
       floatingActionButton: favoriteButton(),
@@ -76,12 +100,12 @@ class WebViewExample extends StatelessWidget {
 
 enum MenuOptions {
   showUserAgent,
-  toast,
   listCookies,
   clearCookies,
   addToCache,
   listCache,
   clearCache,
+  navigationDelegate,
 }
 
 class SampleMenu extends StatelessWidget {
@@ -102,13 +126,6 @@ class SampleMenu extends StatelessWidget {
               case MenuOptions.showUserAgent:
                 _onShowUserAgent(controller.data, context);
                 break;
-              case MenuOptions.toast:
-                Scaffold.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text('You selected: $value'),
-                  ),
-                );
-                break;
               case MenuOptions.listCookies:
                 _onListCookies(controller.data, context);
                 break;
@@ -124,6 +141,9 @@ class SampleMenu extends StatelessWidget {
               case MenuOptions.clearCache:
                 _onClearCache(controller.data, context);
                 break;
+              case MenuOptions.navigationDelegate:
+                _onNavigationDelegateExample(controller.data, context);
+                break;
             }
           },
           itemBuilder: (BuildContext context) => <PopupMenuItem<MenuOptions>>[
@@ -132,10 +152,6 @@ class SampleMenu extends StatelessWidget {
                   child: const Text('Show user agent'),
                   enabled: controller.hasData,
                 ),
-                const PopupMenuItem<MenuOptions>(
-                  value: MenuOptions.toast,
-                  child: Text('Make a toast'),
-                ),
                 const PopupMenuItem<MenuOptions>(
                   value: MenuOptions.listCookies,
                   child: Text('List cookies'),
@@ -156,6 +172,10 @@ class SampleMenu extends StatelessWidget {
                   value: MenuOptions.clearCache,
                   child: Text('Clear cache'),
                 ),
+                const PopupMenuItem<MenuOptions>(
+                  value: MenuOptions.navigationDelegate,
+                  child: Text('Navigation Delegate example'),
+                ),
               ],
         );
       },
@@ -218,6 +238,13 @@ class SampleMenu extends StatelessWidget {
     ));
   }
 
+  void _onNavigationDelegateExample(
+      WebViewController controller, BuildContext context) async {
+    final String contentBase64 =
+        base64Encode(const Utf8Encoder().convert(kNavigationExamplePage));
+    controller.loadUrl('data:text/html;base64,$contentBase64');
+  }
+
   Widget _getCookieList(String cookies) {
     if (cookies == null || cookies == '""') {
       return Container();
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index 4f0285273df7..8833cb4f9a61 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -33,6 +33,39 @@ class JavascriptMessage {
 /// Callback type for handling messages sent from Javascript running in a web view.
 typedef void JavascriptMessageHandler(JavascriptMessage message);
 
+/// Information about a navigation action that is about to be executed.
+class NavigationRequest {
+  NavigationRequest._({this.url, this.isForMainFrame});
+
+  /// The URL that will be loaded if the navigation is executed.
+  final String url;
+
+  /// Whether the navigation request is to be loaded as the main frame.
+  final bool isForMainFrame;
+
+  @override
+  String toString() {
+    return '$runtimeType(url: $url, isForMainFrame: $isForMainFrame)';
+  }
+}
+
+/// A decision on how to handle a navigation request.
+enum NavigationDecision {
+  /// Prevent the navigation from taking place.
+  prevent,
+
+  /// Allow the navigation to take place.
+  navigate,
+}
+
+/// Decides how to handle a specific navigation request.
+///
+/// The returned [NavigationDecision] determines how the navigation described by
+/// `navigation` should be handled.
+///
+/// See also: [WebView.navigationDelegate].
+typedef NavigationDecision NavigationDelegate(NavigationRequest navigation);
+
 final RegExp _validChannelNames = RegExp('^[a-zA-Z_][a-zA-Z0-9]*\$');
 
 /// A named channel for receiving messaged from JavaScript code running inside a web view.
@@ -78,6 +111,7 @@ class WebView extends StatefulWidget {
     this.initialUrl,
     this.javascriptMode = JavascriptMode.disabled,
     this.javascriptChannels,
+    this.navigationDelegate,
     this.gestureRecognizers,
   })  : assert(javascriptMode != null),
         super(key: key);
@@ -131,6 +165,30 @@ class WebView extends StatefulWidget {
   /// A null value is equivalent to an empty set.
   final Set<JavascriptChannel> javascriptChannels;
 
+  /// A delegate function that decides how to handle navigation actions.
+  ///
+  /// When a navigation is initiated by the WebView (e.g when a user clicks a link)
+  /// this delegate is called and has to decide how to proceed with the navigation.
+  ///
+  /// See [NavigationDecision] for possible decisions the delegate can take.
+  ///
+  /// When null all navigation actions are allowed.
+  ///
+  /// Caveats on Android:
+  ///
+  ///   * Navigation actions targeted to the main frame can be intercepted,
+  ///     navigation actions targeted to subframes are allowed regardless of the value
+  ///     returned by this delegate.
+  ///   * Setting a navigationDelegate makes the WebView treat all navigations as if they were
+  ///     triggered by a user gesture, this disables some of Chromium's security mechanisms.
+  ///     A navigationDelegate should only be set when loading trusted content.
+  ///   * On Android WebView versions earlier than 67(most devices running at least Android L+ should have
+  ///     a later version):
+  ///     * When a navigationDelegate is set pages with frames are not properly handled by the
+  ///       webview, and frames will be opened in the main frame.
+  ///     * When a navigationDelegate is set HTTP requests do not include the HTTP referer header.
+  final NavigationDelegate navigationDelegate;
+
   @override
   State<StatefulWidget> createState() => _WebViewState();
 }
@@ -197,6 +255,7 @@ class _WebViewState extends State<WebView> {
     final WebViewController controller = await _controller.future;
     controller._updateSettings(settings);
     controller._updateJavascriptChannels(widget.javascriptChannels);
+    controller._navigationDelegate = widget.navigationDelegate;
   }
 
   void _onPlatformViewCreated(int id) {
@@ -204,6 +263,7 @@ class _WebViewState extends State<WebView> {
       id,
       _WebSettings.fromWidget(widget),
       widget.javascriptChannels,
+      widget.navigationDelegate,
     );
     _controller.complete(controller);
     if (widget.onWebViewCreated != null) {
@@ -261,27 +321,35 @@ class _CreationParams {
 class _WebSettings {
   _WebSettings({
     this.javascriptMode,
+    this.hasNavigationDelegate,
   });
 
   static _WebSettings fromWidget(WebView widget) {
-    return _WebSettings(javascriptMode: widget.javascriptMode);
+    return _WebSettings(
+      javascriptMode: widget.javascriptMode,
+      hasNavigationDelegate: widget.navigationDelegate != null,
+    );
   }
 
   final JavascriptMode javascriptMode;
+  final bool hasNavigationDelegate;
 
   Map<String, dynamic> toMap() {
     return <String, dynamic>{
       'jsMode': javascriptMode.index,
+      'hasNavigationDelegate': hasNavigationDelegate,
     };
   }
 
   Map<String, dynamic> updatesMap(_WebSettings newSettings) {
-    if (javascriptMode == newSettings.javascriptMode) {
-      return null;
+    final Map<String, dynamic> updates = <String, dynamic>{};
+    if (javascriptMode != newSettings.javascriptMode) {
+      updates['jsMode'] = newSettings.javascriptMode.index;
     }
-    return <String, dynamic>{
-      'jsMode': newSettings.javascriptMode.index,
-    };
+    if (hasNavigationDelegate != newSettings.hasNavigationDelegate) {
+      updates['hasNavigationDelegate'] = newSettings.hasNavigationDelegate;
+    }
+    return updates;
   }
 }
 
@@ -291,29 +359,48 @@ class _WebSettings {
 /// callback for a [WebView] widget.
 class WebViewController {
   WebViewController._(
-      int id, this._settings, Set<JavascriptChannel> javascriptChannels)
-      : _channel = MethodChannel('plugins.flutter.io/webview_$id') {
+    int id,
+    this._settings,
+    Set<JavascriptChannel> javascriptChannels,
+    this._navigationDelegate,
+  ) : _channel = MethodChannel('plugins.flutter.io/webview_$id') {
     _updateJavascriptChannelsFromSet(javascriptChannels);
     _channel.setMethodCallHandler(_onMethodCall);
   }
 
   final MethodChannel _channel;
 
+  NavigationDelegate _navigationDelegate;
+
   _WebSettings _settings;
 
   // Maps a channel name to a channel.
   Map<String, JavascriptChannel> _javascriptChannels =
       <String, JavascriptChannel>{};
 
-  Future<void> _onMethodCall(MethodCall call) async {
+  Future<bool> _onMethodCall(MethodCall call) async {
     switch (call.method) {
       case 'javascriptChannelMessage':
         final String channel = call.arguments['channel'];
         final String message = call.arguments['message'];
         _javascriptChannels[channel]
             .onMessageReceived(JavascriptMessage(message));
-        break;
+        return true;
+      case 'navigationRequest':
+        final NavigationRequest request = NavigationRequest._(
+          url: call.arguments['url'],
+          isForMainFrame: call.arguments['isForMainFrame'],
+        );
+
+        // _navigationDelegate can be null if the widget was rebuilt with no
+        // navigation delegate after a navigation happened and just before we
+        // got the navigationRequest message.
+        final bool allowNavigation = _navigationDelegate == null ||
+            _navigationDelegate(request) == NavigationDecision.navigate;
+        return allowNavigation;
     }
+    throw MissingPluginException(
+        '${call.method} was invoked but has no handler');
   }
 
   /// Loads the specified URL.
@@ -417,7 +504,7 @@ class WebViewController {
 
   Future<void> _updateSettings(_WebSettings setting) async {
     final Map<String, dynamic> updateMap = _settings.updatesMap(setting);
-    if (updateMap == null) {
+    if (updateMap == null || updateMap.isEmpty) {
       return null;
     }
     _settings = setting;
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 8307e1fc7206..84484a2bcbec 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.3+2
+version: 0.3.4
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 
diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart
index 4fcdc7f4e015..8635875ab7a6 100644
--- a/packages/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/test/webview_flutter_test.dart
@@ -575,6 +575,57 @@ void main() {
 
     expect(ttsMessagesReceived, <String>['Hello', 'World']);
   });
+
+  group('navigationDelegate', () {
+    testWidgets('hasNavigationDelegate', (WidgetTester tester) async {
+      await tester.pumpWidget(const WebView(
+        initialUrl: 'https://youtube.com',
+      ));
+
+      final FakePlatformWebView platformWebView =
+          fakePlatformViewsController.lastCreatedView;
+
+      expect(platformWebView.hasNavigationDelegate, false);
+
+      await tester.pumpWidget(WebView(
+        initialUrl: 'https://youtube.com',
+        navigationDelegate: (NavigationRequest r) => null,
+      ));
+
+      expect(platformWebView.hasNavigationDelegate, true);
+    });
+
+    testWidgets('Block navigation', (WidgetTester tester) async {
+      final List<NavigationRequest> navigationRequests = <NavigationRequest>[];
+
+      await tester.pumpWidget(WebView(
+          initialUrl: 'https://youtube.com',
+          navigationDelegate: (NavigationRequest request) {
+            navigationRequests.add(request);
+            // Only allow navigating to https://flutter.dev
+            return request.url == 'https://flutter.dev'
+                ? NavigationDecision.navigate
+                : NavigationDecision.prevent;
+          }));
+
+      final FakePlatformWebView platformWebView =
+          fakePlatformViewsController.lastCreatedView;
+
+      expect(platformWebView.hasNavigationDelegate, true);
+
+      platformWebView.fakeNavigate('https://www.google.com');
+      // The navigation delegate only allows navigation to https://flutter.dev
+      // so we should still be in https://youtube.com.
+      expect(platformWebView.currentUrl, 'https://youtube.com');
+      expect(navigationRequests.length, 1);
+      expect(navigationRequests[0].url, 'https://www.google.com');
+      expect(navigationRequests[0].isForMainFrame, true);
+
+      platformWebView.fakeNavigate('https://flutter.dev');
+      await tester.pump();
+      expect(platformWebView.currentUrl, 'https://flutter.dev');
+    });
+  });
 }
 
 class FakePlatformWebView {
@@ -585,12 +636,14 @@ class FakePlatformWebView {
         history.add(initialUrl);
         currentPosition++;
       }
-      javascriptMode = JavascriptMode.values[params['settings']['jsMode']];
     }
     if (params.containsKey('javascriptChannelNames')) {
       javascriptChannelNames =
           List<String>.from(params['javascriptChannelNames']);
     }
+    javascriptMode = JavascriptMode.values[params['settings']['jsMode']];
+    hasNavigationDelegate =
+        params['settings']['hasNavigationDelegate'] ?? false;
     channel = MethodChannel(
         'plugins.flutter.io/webview_$id', const StandardMethodCodec());
     channel.setMockMethodCallHandler(onMethodCall);
@@ -607,20 +660,21 @@ class FakePlatformWebView {
   JavascriptMode javascriptMode;
   List<String> javascriptChannelNames;
 
+  bool hasNavigationDelegate;
+
   Future<dynamic> onMethodCall(MethodCall call) {
     switch (call.method) {
       case 'loadUrl':
         final String url = call.arguments;
-        history = history.sublist(0, currentPosition + 1);
-        history.add(url);
-        currentPosition++;
-        amountOfReloadsOnCurrentUrl = 0;
+        _loadUrl(url);
         return Future<void>.sync(() {});
       case 'updateSettings':
-        if (call.arguments['jsMode'] == null) {
-          break;
+        if (call.arguments['jsMode'] != null) {
+          javascriptMode = JavascriptMode.values[call.arguments['jsMode']];
+        }
+        if (call.arguments['hasNavigationDelegate'] != null) {
+          hasNavigationDelegate = call.arguments['hasNavigationDelegate'];
         }
-        javascriptMode = JavascriptMode.values[call.arguments['jsMode']];
         break;
       case 'canGoBack':
         return Future<bool>.sync(() => currentPosition > 0);
@@ -672,6 +726,36 @@ class FakePlatformWebView {
     BinaryMessages.handlePlatformMessage(
         channel.name, data, (ByteData data) {});
   }
+
+  // Fakes a main frame navigation that was initiated by the webview, e.g when
+  // the user clicks a link in the currently loaded page.
+  void fakeNavigate(String url) {
+    if (!hasNavigationDelegate) {
+      print('no navigation delegate');
+      _loadUrl(url);
+      return;
+    }
+    final StandardMethodCodec codec = const StandardMethodCodec();
+    final Map<String, dynamic> arguments = <String, dynamic>{
+      'url': url,
+      'isForMainFrame': true
+    };
+    final ByteData data =
+        codec.encodeMethodCall(MethodCall('navigationRequest', arguments));
+    BinaryMessages.handlePlatformMessage(channel.name, data, (ByteData data) {
+      final bool allow = codec.decodeEnvelope(data);
+      if (allow) {
+        _loadUrl(url);
+      }
+    });
+  }
+
+  void _loadUrl(String url) {
+    history = history.sublist(0, currentPosition + 1);
+    history.add(url);
+    currentPosition++;
+    amountOfReloadsOnCurrentUrl = 0;
+  }
 }
 
 class _FakePlatformViewsController {

From 4b241538bb7e9628df52dc5c183dcb072e6aaad4 Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Mon, 11 Mar 2019 13:03:54 -0700
Subject: [PATCH 213/410] [image_picker] delete original file if scaled (#1288)

fixed flutter/flutter#23500
---
 packages/image_picker/CHANGELOG.md                           | 4 ++++
 .../io/flutter/plugins/imagepicker/ImagePickerDelegate.java  | 5 +++++
 packages/image_picker/pubspec.yaml                           | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 27713d639848..e4230963e712 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.0+6
+
+* Delete the original image if it was scaled.
+
 ## 0.5.0+5
 
 Remove unnecessary camera permmision.
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
index a990c435106f..eb1e990045c1 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
@@ -429,6 +429,11 @@ private void handleImageResult(String path) {
 
       String finalImagePath = imageResizer.resizeImageIfNeeded(path, maxWidth, maxHeight);
       finishWithSuccess(finalImagePath);
+
+      //delete original file if scaled
+      if (!finalImagePath.equals(path)) {
+        new File(path).delete();
+      }
     } else {
       throw new IllegalStateException("Received image from picker that was not requested");
     }
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 7a1a57fd233b..454965fee105 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.0+5
+version: 0.5.0+6
 
 flutter:
   plugin:

From 5afa9d5fc87270994cf02f5fa2f9978f3c844ec3 Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Mon, 11 Mar 2019 13:16:21 -0700
Subject: [PATCH 214/410] [package_info] calling new method for BuildNumber in
 new android versions (#1275)

Fixed flutter/flutter#28155
We kept the old method for backward compatibility.
---
 packages/package_info/CHANGELOG.md                    |  4 ++++
 .../plugins/packageinfo/PackageInfoPlugin.java        | 11 ++++++++++-
 packages/package_info/pubspec.yaml                    |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md
index cfb22a9d112e..404108cf7cb7 100644
--- a/packages/package_info/CHANGELOG.md
+++ b/packages/package_info/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0+2
+
+* Android: Using new method for BuildNumber in new android versions
+
 ## 0.4.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java b/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java
index 9c5483584f97..e9d3bfb92042 100644
--- a/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java
+++ b/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java
@@ -7,6 +7,7 @@
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -42,7 +43,7 @@ public void onMethodCall(MethodCall call, Result result) {
         map.put("appName", info.applicationInfo.loadLabel(pm).toString());
         map.put("packageName", context.getPackageName());
         map.put("version", info.versionName);
-        map.put("buildNumber", String.valueOf(info.versionCode));
+        map.put("buildNumber", String.valueOf(getLongVersionCode(info)));
 
         result.success(map);
       } else {
@@ -52,4 +53,12 @@ public void onMethodCall(MethodCall call, Result result) {
       result.error("Name not found", ex.getMessage(), null);
     }
   }
+
+  private static long getLongVersionCode(PackageInfo info) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      return info.getLongVersionCode();
+    }
+    //noinspection deprecation
+    return info.versionCode;
+  }
 }
diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml
index 7fd707d05500..61d94f00f4b8 100644
--- a/packages/package_info/pubspec.yaml
+++ b/packages/package_info/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for querying information about the application
   package, such as CFBundleVersion on iOS or versionCode on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/package_info
-version: 0.4.0+1
+version: 0.4.0+2
 
 flutter:
   plugin:

From 432f775f2a2e51dbf3304c378ac2bcbd14009fb6 Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Tue, 12 Mar 2019 10:04:48 -0700
Subject: [PATCH 215/410] [image_picker] fix error if pick image from yandex
 disk(dropbox) (#1265)

Certain cloud storage platform does not have data column. We return null when there is no data column and fetch the image from online source.
fixed flutter/flutter#26940
fixed flutter/flutter#21547
---
 packages/image_picker/CHANGELOG.md                        | 3 +++
 .../java/io/flutter/plugins/imagepicker/FileUtils.java    | 8 +++++++-
 packages/image_picker/pubspec.yaml                        | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index e4230963e712..4b03f4e82e5e 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.5.0+7
+* Fix a crash when selecting images from yandex.disk and dropbox.
+
 ## 0.5.0+6
 
 * Delete the original image if it was scaled.
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
index 25287c78ea12..54b437ca66a8 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
@@ -116,7 +116,13 @@ private static String getDataColumn(
     try {
       cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
       if (cursor != null && cursor.moveToFirst()) {
-        final int column_index = cursor.getColumnIndexOrThrow(column);
+        final int column_index = cursor.getColumnIndex(column);
+
+        //yandex.disk and dropbox do not have _data column
+        if (column_index == -1) {
+          return null;
+        }
+
         return cursor.getString(column_index);
       }
     } finally {
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 454965fee105..276ffb0272d6 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.0+6
+version: 0.5.0+7
 
 flutter:
   plugin:

From 236885b834fcc43fd5ec513d123d04bddb82c407 Mon Sep 17 00:00:00 2001
From: cvolzke4 <45087979+cvolzke4@users.noreply.github.com>
Date: Thu, 14 Mar 2019 04:48:21 +1100
Subject: [PATCH 216/410] [camera]Fix CameraPreview freezes during
 startVideoRecording on iOS (#1023)

---
 packages/camera/CHANGELOG.md                   |  4 ++++
 .../flutter/plugins/camera/CameraPlugin.java   |  6 ++++++
 packages/camera/ios/Classes/CameraPlugin.m     |  5 +++--
 packages/camera/lib/camera.dart                | 18 ++++++++++++++++++
 packages/camera/pubspec.yaml                   |  2 +-
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 5d349bd8998b..346afa736fc4 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.3
+
+* Add capability to prepare the capture session for video recording on iOS.
+
 ## 0.4.2
 
 * Add sensor orientation value to `CameraDescription`.
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index 7ab3c44f962a..a204c1749264 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -205,6 +205,12 @@ public void onMethodCall(MethodCall call, final Result result) {
           camera.takePicture((String) call.argument("path"), result);
           break;
         }
+      case "prepareForVideoRecording":
+        {
+          // This optimization is not required for Android.
+          result.success(null);
+          break;
+        }
       case "startVideoRecording":
         {
           final String filePath = call.argument("filePath");
diff --git a/packages/camera/ios/Classes/CameraPlugin.m b/packages/camera/ios/Classes/CameraPlugin.m
index 643f361689b2..7d5d28d3a3a7 100644
--- a/packages/camera/ios/Classes/CameraPlugin.m
+++ b/packages/camera/ios/Classes/CameraPlugin.m
@@ -467,9 +467,7 @@ - (void)startVideoRecordingAtPath:(NSString *)path result:(FlutterResult)result
       _eventSink(@{@"event" : @"error", @"errorDescription" : @"Setup Writer Failed"});
       return;
     }
-    [_captureSession stopRunning];
     _isRecording = YES;
-    [_captureSession startRunning];
     result(nil);
   } else {
     _eventSink(@{@"event" : @"error", @"errorDescription" : @"Video is already recording!"});
@@ -726,6 +724,9 @@ - (void)handleMethodCallAsync:(FlutterMethodCall *)call result:(FlutterResult)re
       [_camera close];
       _dispatchQueue = nil;
       result(nil);
+    } else if ([@"prepareForVideoRecording" isEqualToString:call.method]) {
+      [_camera setUpCaptureSessionForAudio];
+      result(nil);
     } else if ([@"startVideoRecording" isEqualToString:call.method]) {
       [_camera startVideoRecordingAtPath:call.arguments[@"filePath"] result:result];
     } else if ([@"stopVideoRecording" isEqualToString:call.method]) {
diff --git a/packages/camera/lib/camera.dart b/packages/camera/lib/camera.dart
index 090e7767c95c..8edbb8c59658 100644
--- a/packages/camera/lib/camera.dart
+++ b/packages/camera/lib/camera.dart
@@ -256,6 +256,24 @@ class CameraController extends ValueNotifier<CameraValue> {
     return _creatingCompleter.future;
   }
 
+  /// Prepare the capture session for video recording.
+  ///
+  /// Use of this method is optional, but it may be called for performance
+  /// reasons on iOS.
+  ///
+  /// Preparing audio can cause a minor delay in the CameraPreview view on iOS.
+  /// If video recording is intended, calling this early eliminates this delay
+  /// that would otherwise be experienced when video recording is started.
+  /// This operation is a no-op on Android.
+  ///
+  /// Throws a [CameraException] if the prepare fails.
+  Future<void> prepareForVideoRecording() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    await _channel.invokeMethod('prepareForVideoRecording');
+  }
+
   /// Listen to events from the native plugins.
   ///
   /// A "cameraClosing" event is sent when the camera is closed automatically by the system (for example when the app go to background). The plugin will try to reopen the camera automatically but any ongoing recording will end.
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 0abbf6a003aa..d3ecc1bc5eeb 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.4.2
+version: 0.4.3
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From 322512c15fa01ac08e433eaa19fa7337b593d8f5 Mon Sep 17 00:00:00 2001
From: Sebastian Roth <sebastian.roth@gmail.com>
Date: Thu, 14 Mar 2019 06:38:59 +0800
Subject: [PATCH 217/410] [video_player] Upgrade ExoPlayer dependency to 2.9.4
 (#1154)

---
 packages/video_player/CHANGELOG.md         | 4 ++++
 packages/video_player/android/build.gradle | 8 ++++----
 packages/video_player/pubspec.yaml         | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md
index 1d635f19d4a8..de5f66e5afd7 100644
--- a/packages/video_player/CHANGELOG.md
+++ b/packages/video_player/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.0+4
+
+* Android: Upgrade ExoPlayer to 2.9.6.
+
 ## 0.10.0+3
 
 * Fix divide by zero bug on iOS.
diff --git a/packages/video_player/android/build.gradle b/packages/video_player/android/build.gradle
index 0ab2a168f533..ec60461e1900 100644
--- a/packages/video_player/android/build.gradle
+++ b/packages/video_player/android/build.gradle
@@ -52,9 +52,9 @@ android {
     }
 
     dependencies {
-        implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1'
-        implementation 'com.google.android.exoplayer:exoplayer-hls:2.9.1'
-        implementation 'com.google.android.exoplayer:exoplayer-dash:2.9.1'
-        implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.9.1'
+        implementation 'com.google.android.exoplayer:exoplayer-core:2.9.6'
+        implementation 'com.google.android.exoplayer:exoplayer-hls:2.9.6'
+        implementation 'com.google.android.exoplayer:exoplayer-dash:2.9.6'
+        implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.9.6'
     }
 }
diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml
index 467b42287862..5d006914ba7a 100644
--- a/packages/video_player/pubspec.yaml
+++ b/packages/video_player/pubspec.yaml
@@ -2,7 +2,7 @@ name: video_player
 description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
-version: 0.10.0+3
+version: 0.10.0+4
 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player
 
 flutter:

From 3a92b9a94b47489839241708f74d6881e64b5dfd Mon Sep 17 00:00:00 2001
From: Paito Anderson <pj.paito@gmail.com>
Date: Wed, 13 Mar 2019 19:44:22 -0400
Subject: [PATCH 218/410] Fix Changelog.md version for firebase_messaging
 (#1329)

---
 packages/firebase_messaging/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index 1f2e0374f5c3..88ecf80be9bc 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 4.0.1+1
+## 4.0.0+1
 
 * Log messages about automatic configuration of the default app are now less confusing.
 

From 6efa5087ebf4586b7044a6ee38bd6a95b68ee21a Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Thu, 14 Mar 2019 11:12:51 -0700
Subject: [PATCH 219/410] Add Kaushik to maps code owners (#1338)

---
 CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 156213bbf897..e9e14ad2fcfb 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -17,7 +17,7 @@ packages/firebase_messaging/* @collinjackson @kroikie
 packages/firebase_ml_vision/* @bparrishMines
 packages/firebase_performance/* @bparrishMines
 packages/firebase_storage/* @collinjackson @kroikie
-packages/google_maps_flutter/* @amirh
+packages/google_maps_flutter/* @amirh @iskakaushik
 packages/google_sign_in/* @cyanglaz @mehmetf
 packages/image_picker/* @cyanglaz
 packages/in_app_purchase/* @mklim

From f30ef67deacea56693d50dacccae7e54fa7ca897 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Thu, 14 Mar 2019 11:28:54 -0700
Subject: [PATCH 220/410] [webview_flutter] Add a page loaded callback (#1335)

---
 .../webviewflutter/FlutterWebViewClient.java  |  7 +++
 .../webview_flutter/example/lib/main.dart     |  5 +-
 .../ios/Classes/FLTWKNavigationDelegate.m     |  3 ++
 .../webview_flutter/lib/webview_flutter.dart  | 31 +++++++++++-
 .../test/webview_flutter_test.dart            | 49 +++++++++++++++++++
 5 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java
index fe4482c154b0..fef2258d5dd8 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java
@@ -70,6 +70,13 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
     return true;
   }
 
+  @Override
+  public void onPageFinished(WebView view, String url) {
+    Map<String, Object> args = new HashMap<>();
+    args.put("url", url);
+    methodChannel.invokeMethod("onPageFinished", args);
+  }
+
   private void notifyOnNavigationRequest(
       String url, Map<String, String> headers, WebView webview, boolean isMainFrame) {
     HashMap<String, Object> args = new HashMap<>();
diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index 7d6ce10a56ad..0ec572956df7 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -43,7 +43,7 @@ class WebViewExample extends StatelessWidget {
       // to allow calling Scaffold.of(context) so we can show a snackbar.
       body: Builder(builder: (BuildContext context) {
         return WebView(
-          initialUrl: 'https://flutter.io',
+          initialUrl: 'https://flutter.dev',
           javascriptMode: JavascriptMode.unrestricted,
           onWebViewCreated: (WebViewController webViewController) {
             _controller.complete(webViewController);
@@ -61,6 +61,9 @@ class WebViewExample extends StatelessWidget {
             print('allowing navigation to $request');
             return NavigationDecision.navigate;
           },
+          onPageFinished: (String url) {
+            print('Page finished loading: $url');
+          },
         );
       }),
       floatingActionButton: favoriteButton(),
diff --git a/packages/webview_flutter/ios/Classes/FLTWKNavigationDelegate.m b/packages/webview_flutter/ios/Classes/FLTWKNavigationDelegate.m
index 3638ddcda117..abcca0a5e8a9 100644
--- a/packages/webview_flutter/ios/Classes/FLTWKNavigationDelegate.m
+++ b/packages/webview_flutter/ios/Classes/FLTWKNavigationDelegate.m
@@ -56,4 +56,7 @@ - (void)webView:(WKWebView*)webView
                         }];
 }
 
+- (void)webView:(WKWebView*)webView didFinishNavigation:(WKNavigation*)navigation {
+  [_methodChannel invokeMethod:@"onPageFinished" arguments:@{@"url" : webView.URL.absoluteString}];
+}
 @end
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index 8833cb4f9a61..96a626b51f10 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -66,6 +66,9 @@ enum NavigationDecision {
 /// See also: [WebView.navigationDelegate].
 typedef NavigationDecision NavigationDelegate(NavigationRequest navigation);
 
+/// Signature for when a [WebView] has finished loading a page.
+typedef void PageFinishedCallback(String url);
+
 final RegExp _validChannelNames = RegExp('^[a-zA-Z_][a-zA-Z0-9]*\$');
 
 /// A named channel for receiving messaged from JavaScript code running inside a web view.
@@ -113,6 +116,7 @@ class WebView extends StatefulWidget {
     this.javascriptChannels,
     this.navigationDelegate,
     this.gestureRecognizers,
+    this.onPageFinished,
   })  : assert(javascriptMode != null),
         super(key: key);
 
@@ -189,6 +193,18 @@ class WebView extends StatefulWidget {
   ///     * When a navigationDelegate is set HTTP requests do not include the HTTP referer header.
   final NavigationDelegate navigationDelegate;
 
+  /// Invoked when a page has finished loading.
+  ///
+  /// This is invoked only for the main frame.
+  ///
+  /// When [onPageFinished] is invoked on Android, the page being rendered may
+  /// not be updated yet.
+  ///
+  /// When invoked on iOS or Android, any Javascript code that is embedded
+  /// directly in the HTML has been loaded and code injected with
+  /// [WebViewController.evaluateJavascript] can assume this.
+  final PageFinishedCallback onPageFinished;
+
   @override
   State<StatefulWidget> createState() => _WebViewState();
 }
@@ -264,6 +280,7 @@ class _WebViewState extends State<WebView> {
       _WebSettings.fromWidget(widget),
       widget.javascriptChannels,
       widget.navigationDelegate,
+      widget.onPageFinished,
     );
     _controller.complete(controller);
     if (widget.onWebViewCreated != null) {
@@ -363,6 +380,7 @@ class WebViewController {
     this._settings,
     Set<JavascriptChannel> javascriptChannels,
     this._navigationDelegate,
+    this._onPageFinished,
   ) : _channel = MethodChannel('plugins.flutter.io/webview_$id') {
     _updateJavascriptChannelsFromSet(javascriptChannels);
     _channel.setMethodCallHandler(_onMethodCall);
@@ -374,6 +392,8 @@ class WebViewController {
 
   _WebSettings _settings;
 
+  final PageFinishedCallback _onPageFinished;
+
   // Maps a channel name to a channel.
   Map<String, JavascriptChannel> _javascriptChannels =
       <String, JavascriptChannel>{};
@@ -391,13 +411,18 @@ class WebViewController {
           url: call.arguments['url'],
           isForMainFrame: call.arguments['isForMainFrame'],
         );
-
         // _navigationDelegate can be null if the widget was rebuilt with no
         // navigation delegate after a navigation happened and just before we
         // got the navigationRequest message.
         final bool allowNavigation = _navigationDelegate == null ||
             _navigationDelegate(request) == NavigationDecision.navigate;
         return allowNavigation;
+      case 'onPageFinished':
+        if (_onPageFinished != null) {
+          _onPageFinished(call.arguments['url']);
+        }
+
+        return null;
     }
     throw MissingPluginException(
         '${call.method} was invoked but has no handler');
@@ -560,6 +585,10 @@ class WebViewController {
   ///
   /// The Future completes with an error if a JavaScript error occurred, or on iOS, if the type of the
   /// evaluated expression is not supported as described above.
+  ///
+  /// When evaluating Javascript in a [WebView], it is best practice to wait for
+  /// the [WebView.onPageFinished] callback. This guarantees all the Javascript
+  /// embedded in the main frame HTML has been loaded.
   Future<String> evaluateJavascript(String javascriptString) async {
     if (_settings.javascriptMode == JavascriptMode.disabled) {
       throw FlutterError(
diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart
index 8635875ab7a6..b1e45d557b36 100644
--- a/packages/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/test/webview_flutter_test.dart
@@ -576,6 +576,40 @@ void main() {
     expect(ttsMessagesReceived, <String>['Hello', 'World']);
   });
 
+  group('$PageFinishedCallback', () {
+    testWidgets('onPageFinished is not null', (WidgetTester tester) async {
+      String returnedUrl;
+
+      await tester.pumpWidget(WebView(
+        initialUrl: 'https://youtube.com',
+        onPageFinished: (String url) {
+          returnedUrl = url;
+        },
+      ));
+
+      final FakePlatformWebView platformWebView =
+          fakePlatformViewsController.lastCreatedView;
+
+      platformWebView.fakeOnPageFinishedCallback();
+
+      expect(platformWebView.currentUrl, returnedUrl);
+    });
+
+    testWidgets('onPageFinished is null', (WidgetTester tester) async {
+      await tester.pumpWidget(const WebView(
+        initialUrl: 'https://youtube.com',
+        onPageFinished: null,
+      ));
+
+      final FakePlatformWebView platformWebView =
+          fakePlatformViewsController.lastCreatedView;
+
+      // The platform side will always invoke a call for onPageFinished. This is
+      // to test that it does not crash on a null callback.
+      platformWebView.fakeOnPageFinishedCallback();
+    });
+  });
+
   group('navigationDelegate', () {
     testWidgets('hasNavigationDelegate', (WidgetTester tester) async {
       await tester.pumpWidget(const WebView(
@@ -750,6 +784,21 @@ class FakePlatformWebView {
     });
   }
 
+  void fakeOnPageFinishedCallback() {
+    final StandardMethodCodec codec = const StandardMethodCodec();
+
+    final ByteData data = codec.encodeMethodCall(MethodCall(
+      'onPageFinished',
+      <dynamic, dynamic>{'url': currentUrl},
+    ));
+
+    BinaryMessages.handlePlatformMessage(
+      channel.name,
+      data,
+      (ByteData data) {},
+    );
+  }
+
   void _loadUrl(String url) {
     history = history.sublist(0, currentPosition + 1);
     history.add(url);

From 228b40f23fc04c48b1061800cc7ad49f1621dcd2 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 14 Mar 2019 14:09:34 -0700
Subject: [PATCH 221/410] [cloud_firestore] ios ceck for nil snapshot in
 cloud_firestore error handling instead of checking for non-nil error (#1339)

* Check for nil snapshot in cloud_firestore error handling instead of checking for non-nil error
---
 packages/cloud_firestore/CHANGELOG.md                 |  5 +++++
 .../ios/Classes/CloudFirestorePlugin.m                | 11 +++++++----
 packages/cloud_firestore/pubspec.yaml                 |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 153ba087e15c..a0033d45bd89 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.9.6
+
+* On iOS, update null checking to match the recommended pattern usage in the Firebase documentation.
+* Fixes a case where snapshot errors might result in plugin crash.
+
 ## 0.9.5+2
 
 * Fixing PlatformException(Error 0, null, null) which happened when a successful operation was performed.
diff --git a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
index 6a4850cb0356..9f100a70aa01 100644
--- a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
@@ -390,7 +390,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     FIRDocumentReference *document = getDocumentReference(call.arguments);
     [document getDocumentWithCompletion:^(FIRDocumentSnapshot *_Nullable snapshot,
                                           NSError *_Nullable error) {
-      if (error) {
+      if (snapshot == nil) {
         result(getFlutterError(error));
       } else {
         result(@{
@@ -411,7 +411,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     }
     id<FIRListenerRegistration> listener = [query
         addSnapshotListener:^(FIRQuerySnapshot *_Nullable snapshot, NSError *_Nullable error) {
-          if (error) {
+          if (snapshot == nil) {
             result(getFlutterError(error));
             return;
           }
@@ -426,7 +426,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     FIRDocumentReference *document = getDocumentReference(call.arguments);
     id<FIRListenerRegistration> listener =
         [document addSnapshotListener:^(FIRDocumentSnapshot *snapshot, NSError *_Nullable error) {
-          if (error) {
+          if (snapshot == nil) {
             result(getFlutterError(error));
             return;
           }
@@ -450,7 +450,10 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     }
     [query getDocumentsWithCompletion:^(FIRQuerySnapshot *_Nullable snapshot,
                                         NSError *_Nullable error) {
-      if (error) result(getFlutterError(error));
+      if (snapshot != nil) {
+        result(getFlutterError(error));
+        return;
+      }
       result(parseQuerySnapshot(snapshot));
     }];
   } else if ([@"Query#removeListener" isEqualToString:call.method]) {
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 9875d6de140b..4e23ccadf1e7 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.5+2
+version: 0.9.6
 
 flutter:
   plugin:

From c5bf62ebc30c6d3d190b0baac94d812789dc648c Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Fri, 15 Mar 2019 08:35:31 -0700
Subject: [PATCH 222/410] [shared_preferences] driver test using package:test
 on device (#1285)

* Add SharedPreference example driver test
---
 .../shared_preferences/example/pubspec.yaml   |  5 +
 .../example/test/shared_preferences.dart      | 93 +++++++++++++++++++
 .../example/test/shared_preferences_test.dart | 11 +++
 .../test_driver/shared_preferences_test.dart  | 12 +++
 packages/shared_preferences/pubspec.yaml      |  3 +
 5 files changed, 124 insertions(+)
 create mode 100644 packages/shared_preferences/example/test/shared_preferences.dart
 create mode 100644 packages/shared_preferences/example/test/shared_preferences_test.dart
 create mode 100644 packages/shared_preferences/example/test_driver/shared_preferences_test.dart

diff --git a/packages/shared_preferences/example/pubspec.yaml b/packages/shared_preferences/example/pubspec.yaml
index 68f61bd084c5..866185589c8d 100644
--- a/packages/shared_preferences/example/pubspec.yaml
+++ b/packages/shared_preferences/example/pubspec.yaml
@@ -7,5 +7,10 @@ dependencies:
   shared_preferences:
     path: ../
 
+dev_dependencies:
+  flutter_driver:
+    sdk: flutter
+  test: any
+
 flutter:
   uses-material-design: true
diff --git a/packages/shared_preferences/example/test/shared_preferences.dart b/packages/shared_preferences/example/test/shared_preferences.dart
new file mode 100644
index 000000000000..bf40888c43b4
--- /dev/null
+++ b/packages/shared_preferences/example/test/shared_preferences.dart
@@ -0,0 +1,93 @@
+import 'dart:async';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('$SharedPreferences', () {
+    const Map<String, dynamic> kTestValues = <String, dynamic>{
+      'flutter.String': 'hello world',
+      'flutter.bool': true,
+      'flutter.int': 42,
+      'flutter.double': 3.14159,
+      'flutter.List': <String>['foo', 'bar'],
+    };
+
+    const Map<String, dynamic> kTestValues2 = <String, dynamic>{
+      'flutter.String': 'goodbye world',
+      'flutter.bool': false,
+      'flutter.int': 1337,
+      'flutter.double': 2.71828,
+      'flutter.List': <String>['baz', 'quox'],
+    };
+
+    SharedPreferences preferences;
+
+    setUp(() async {
+      preferences = await SharedPreferences.getInstance();
+    });
+
+    tearDown(() {
+      preferences.clear();
+    });
+
+    test('reading', () async {
+      expect(preferences.get('String'), isNull);
+      expect(preferences.get('bool'), isNull);
+      expect(preferences.get('int'), isNull);
+      expect(preferences.get('double'), isNull);
+      expect(preferences.get('List'), isNull);
+      expect(preferences.getString('String'), isNull);
+      expect(preferences.getBool('bool'), isNull);
+      expect(preferences.getInt('int'), isNull);
+      expect(preferences.getDouble('double'), isNull);
+      expect(preferences.getStringList('List'), isNull);
+    });
+
+    test('writing', () async {
+      await Future.wait(<Future<bool>>[
+        preferences.setString('String', kTestValues2['flutter.String']),
+        preferences.setBool('bool', kTestValues2['flutter.bool']),
+        preferences.setInt('int', kTestValues2['flutter.int']),
+        preferences.setDouble('double', kTestValues2['flutter.double']),
+        preferences.setStringList('List', kTestValues2['flutter.List'])
+      ]);
+      expect(preferences.getString('String'), kTestValues2['flutter.String']);
+      expect(preferences.getBool('bool'), kTestValues2['flutter.bool']);
+      expect(preferences.getInt('int'), kTestValues2['flutter.int']);
+      expect(preferences.getDouble('double'), kTestValues2['flutter.double']);
+      expect(preferences.getStringList('List'), kTestValues2['flutter.List']);
+    });
+
+    test('removing', () async {
+      const String key = 'testKey';
+      preferences
+        ..setString(key, kTestValues['flutter.String'])
+        ..setBool(key, kTestValues['flutter.bool'])
+        ..setInt(key, kTestValues['flutter.int'])
+        ..setDouble(key, kTestValues['flutter.double'])
+        ..setStringList(key, kTestValues['flutter.List']);
+      await preferences.remove(key);
+      expect(preferences.get('testKey'), isNull);
+    });
+
+    test('clearing', () async {
+      preferences
+        ..setString('String', kTestValues['flutter.String'])
+        ..setBool('bool', kTestValues['flutter.bool'])
+        ..setInt('int', kTestValues['flutter.int'])
+        ..setDouble('double', kTestValues['flutter.double'])
+        ..setStringList('List', kTestValues['flutter.List']);
+      await preferences.clear();
+      expect(preferences.getString('String'), null);
+      expect(preferences.getBool('bool'), null);
+      expect(preferences.getInt('int'), null);
+      expect(preferences.getDouble('double'), null);
+      expect(preferences.getStringList('List'), null);
+    });
+  });
+}
diff --git a/packages/shared_preferences/example/test/shared_preferences_test.dart b/packages/shared_preferences/example/test/shared_preferences_test.dart
new file mode 100644
index 000000000000..c5044730dd3f
--- /dev/null
+++ b/packages/shared_preferences/example/test/shared_preferences_test.dart
@@ -0,0 +1,11 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import '../lib/main.dart';
+
+void main() {
+  testWidgets('SharedPreferences example widget test',
+      (WidgetTester tester) async {
+    await tester.pumpWidget(MyApp());
+    expect(find.text('SharedPreferences Demo'), findsOneWidget);
+  });
+}
diff --git a/packages/shared_preferences/example/test_driver/shared_preferences_test.dart b/packages/shared_preferences/example/test_driver/shared_preferences_test.dart
new file mode 100644
index 000000000000..110203456c7b
--- /dev/null
+++ b/packages/shared_preferences/example/test_driver/shared_preferences_test.dart
@@ -0,0 +1,12 @@
+import 'package:flutter_driver/flutter_driver.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('SharedPreferences', () async {
+    final FlutterDriver driver = await FlutterDriver.connect();
+    await driver.requestData(null, timeout: const Duration(minutes: 1));
+    if (driver != null) {
+      driver.close();
+    }
+  });
+}
diff --git a/packages/shared_preferences/pubspec.yaml b/packages/shared_preferences/pubspec.yaml
index 3bbdbd731e53..548b53a4b093 100644
--- a/packages/shared_preferences/pubspec.yaml
+++ b/packages/shared_preferences/pubspec.yaml
@@ -19,6 +19,9 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  test: any
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"

From 04516a9fec37c0bc1845dcf746024370010e45c4 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Fri, 15 Mar 2019 08:44:31 -0700
Subject: [PATCH 223/410] [shared_preferences] Update shared_preferences for
 release (#1344)

---
 packages/shared_preferences/CHANGELOG.md | 4 ++++
 packages/shared_preferences/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/shared_preferences/CHANGELOG.md b/packages/shared_preferences/CHANGELOG.md
index 992460fa253a..0fd825507df7 100644
--- a/packages/shared_preferences/CHANGELOG.md
+++ b/packages/shared_preferences/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.1+2
+
+* Add a driver test
+
 ## 0.5.1+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/shared_preferences/pubspec.yaml b/packages/shared_preferences/pubspec.yaml
index 548b53a4b093..1ae1c3b1742b 100644
--- a/packages/shared_preferences/pubspec.yaml
+++ b/packages/shared_preferences/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for reading and writing simple key-value pairs.
   Wraps NSUserDefaults on iOS and SharedPreferences on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences
-version: 0.5.1+1
+version: 0.5.1+2
 
 flutter:
   plugin:

From 6aef3754109d91a758c3b56c1a6290554478304d Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Fri, 15 Mar 2019 11:38:15 -0700
Subject: [PATCH 224/410] [cloud_firestore] fix NoSuchMethodError regression
 and add test (#1345)

Fix cloud_firestore regression and add test
---
 packages/cloud_firestore/CHANGELOG.md         |  5 +++
 packages/cloud_firestore/example/pubspec.yaml |  5 +++
 .../example/test_driver/cloud_firestore.dart  | 34 +++++++++++++++++++
 .../test_driver/cloud_firestore_test.dart     | 10 ++++++
 .../ios/Classes/CloudFirestorePlugin.m        |  2 +-
 packages/cloud_firestore/pubspec.yaml         |  5 ++-
 6 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 packages/cloud_firestore/example/test_driver/cloud_firestore.dart
 create mode 100644 packages/cloud_firestore/example/test_driver/cloud_firestore_test.dart

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index a0033d45bd89..39a58e8e2225 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.9.7
+
+* Fixes a NoSuchMethodError when using getDocuments on iOS (introduced in 0.9.6).
+* Adds a driver test for getDocuments.
+
 ## 0.9.6
 
 * On iOS, update null checking to match the recommended pattern usage in the Firebase documentation.
diff --git a/packages/cloud_firestore/example/pubspec.yaml b/packages/cloud_firestore/example/pubspec.yaml
index 09f65bbeb5db..7180f0d9b9dc 100755
--- a/packages/cloud_firestore/example/pubspec.yaml
+++ b/packages/cloud_firestore/example/pubspec.yaml
@@ -8,5 +8,10 @@ dependencies:
     path: ../
   firebase_core: "^0.3.0"
 
+dev_dependencies:
+  flutter_driver:
+    sdk: flutter
+  test: any
+
 flutter:
   uses-material-design: true
diff --git a/packages/cloud_firestore/example/test_driver/cloud_firestore.dart b/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
new file mode 100644
index 000000000000..c56444543d81
--- /dev/null
+++ b/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
@@ -0,0 +1,34 @@
+import 'dart:async';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:firebase_core/firebase_core.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('$Firestore', () {
+    Firestore firestore;
+
+    setUp(() async {
+      final FirebaseApp app = await FirebaseApp.configure(
+        name: 'test',
+        options: const FirebaseOptions(
+          googleAppID: '1:79601577497:ios:5f2bcc6ba8cecddd',
+          gcmSenderID: '79601577497',
+          apiKey: 'AIzaSyArgmRGfB5kiQT6CunAOmKRVKEsxKmy6YI-G72PVU',
+          projectID: 'flutter-firestore',
+        ),
+      );
+      firestore = Firestore(app: app);
+    });
+
+    test('getDocuments', () async {
+      final CollectionReference reference = firestore.collection('messages');
+      final QuerySnapshot snapshot = await reference.getDocuments();
+      expect(snapshot.documents.length, isNonZero);
+    });
+  });
+}
diff --git a/packages/cloud_firestore/example/test_driver/cloud_firestore_test.dart b/packages/cloud_firestore/example/test_driver/cloud_firestore_test.dart
new file mode 100644
index 000000000000..314b54af921d
--- /dev/null
+++ b/packages/cloud_firestore/example/test_driver/cloud_firestore_test.dart
@@ -0,0 +1,10 @@
+import 'package:flutter_driver/flutter_driver.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('CloudFirestore driver test', () async {
+    final FlutterDriver driver = await FlutterDriver.connect();
+    await driver.requestData(null, timeout: const Duration(minutes: 1));
+    driver.close();
+  });
+}
diff --git a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
index 9f100a70aa01..22cd18a08d13 100644
--- a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
@@ -450,7 +450,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     }
     [query getDocumentsWithCompletion:^(FIRQuerySnapshot *_Nullable snapshot,
                                         NSError *_Nullable error) {
-      if (snapshot != nil) {
+      if (snapshot == nil) {
         result(getFlutterError(error));
         return;
       }
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 4e23ccadf1e7..f4b9318a6529 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.6
+version: 0.9.7
 
 flutter:
   plugin:
@@ -21,6 +21,9 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  test: any
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"

From e99d1aab48a75898a4722f9f86141d0ee68b07e1 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Fri, 15 Mar 2019 13:21:50 -0700
Subject: [PATCH 225/410] [cloud_functions] add a driver test (#1346)

---
 packages/cloud_functions/CHANGELOG.md         |  4 ++
 packages/cloud_functions/example/pubspec.yaml |  4 ++
 .../example/test/cloud_functions.dart         | 37 +++++++++++++++++++
 .../example/test/cloud_functions_test.dart    | 15 ++++++++
 .../example/test/widget_test.dart             | 25 -------------
 .../test_driver/cloud_functions_test.dart     | 11 ++++++
 packages/cloud_functions/pubspec.yaml         |  5 ++-
 7 files changed, 75 insertions(+), 26 deletions(-)
 create mode 100644 packages/cloud_functions/example/test/cloud_functions.dart
 create mode 100644 packages/cloud_functions/example/test/cloud_functions_test.dart
 delete mode 100644 packages/cloud_functions/example/test/widget_test.dart
 create mode 100644 packages/cloud_functions/example/test_driver/cloud_functions_test.dart

diff --git a/packages/cloud_functions/CHANGELOG.md b/packages/cloud_functions/CHANGELOG.md
index 24f1d31384ac..6227fb626b3e 100644
--- a/packages/cloud_functions/CHANGELOG.md
+++ b/packages/cloud_functions/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.2+1
+
+* Added a driver test.
+
 ## 0.1.2
 
 * Specifying a version for Cloud Functions CocoaPod dependency to prevent build errors on iOS.
diff --git a/packages/cloud_functions/example/pubspec.yaml b/packages/cloud_functions/example/pubspec.yaml
index 673eb83efc24..dc98e62dfbb4 100644
--- a/packages/cloud_functions/example/pubspec.yaml
+++ b/packages/cloud_functions/example/pubspec.yaml
@@ -14,6 +14,10 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  test: any
+
 
 flutter:
   uses-material-design: true
diff --git a/packages/cloud_functions/example/test/cloud_functions.dart b/packages/cloud_functions/example/test/cloud_functions.dart
new file mode 100644
index 000000000000..aef74c5f960b
--- /dev/null
+++ b/packages/cloud_functions/example/test/cloud_functions.dart
@@ -0,0 +1,37 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:cloud_functions/cloud_functions.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('$CloudFunctions', () {
+    test('call', () async {
+      final dynamic response = await CloudFunctions.instance.call(
+        functionName: 'repeat',
+        parameters: <String, dynamic>{
+          'message': 'foo',
+          'count': 1,
+        },
+      );
+      expect(response['repeat_message'], 'foo');
+      expect(response['repeat_count'], 2);
+      final dynamic response2 = await CloudFunctions.instance.call(
+        functionName: 'repeat',
+        parameters: <String, dynamic>{
+          'message': 'bar',
+          'count': 42,
+        },
+      );
+      expect(response2['repeat_message'], 'bar');
+      expect(response2['repeat_count'], 43);
+    });
+  });
+}
diff --git a/packages/cloud_functions/example/test/cloud_functions_test.dart b/packages/cloud_functions/example/test/cloud_functions_test.dart
new file mode 100644
index 000000000000..f2c29d1115ac
--- /dev/null
+++ b/packages/cloud_functions/example/test/cloud_functions_test.dart
@@ -0,0 +1,15 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:flutter_test/flutter_test.dart';
+
+import '../lib/main.dart';
+
+void main() {
+  testWidgets('CloudFunctions example widget test',
+      (WidgetTester tester) async {
+    await tester.pumpWidget(MyApp());
+    expect(find.text('Cloud Functions example app'), findsOneWidget);
+  });
+}
diff --git a/packages/cloud_functions/example/test/widget_test.dart b/packages/cloud_functions/example/test/widget_test.dart
deleted file mode 100644
index 90c012454b12..000000000000
--- a/packages/cloud_functions/example/test/widget_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// This is a basic Flutter widget test.
-// To perform an interaction with a widget in your test, use the WidgetTester utility that Flutter
-// provides. For example, you can send tap and scroll gestures. You can also use WidgetTester to
-// find child widgets in the widget tree, read text, and verify that the values of widget properties
-// are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import '../lib/main.dart';
-
-void main() {
-  testWidgets('Verify Response', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(MyApp());
-
-    // Verify that platform version is retrieved.
-    expect(
-        find.byWidgetPredicate(
-          (Widget widget) =>
-              widget is Text && widget.data.startsWith('Response'),
-        ),
-        findsOneWidget);
-  });
-}
diff --git a/packages/cloud_functions/example/test_driver/cloud_functions_test.dart b/packages/cloud_functions/example/test_driver/cloud_functions_test.dart
new file mode 100644
index 000000000000..db46258dfebe
--- /dev/null
+++ b/packages/cloud_functions/example/test_driver/cloud_functions_test.dart
@@ -0,0 +1,11 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:flutter_driver/flutter_driver.dart';
+
+Future<void> main() async {
+  final FlutterDriver driver = await FlutterDriver.connect();
+  await driver.requestData(null, timeout: const Duration(minutes: 1));
+  driver.close();
+}
diff --git a/packages/cloud_functions/pubspec.yaml b/packages/cloud_functions/pubspec.yaml
index 7803052c8f40..3bb4751ac4c6 100644
--- a/packages/cloud_functions/pubspec.yaml
+++ b/packages/cloud_functions/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cloud_functions
 description: Flutter plugin for Cloud Functions.
-version: 0.1.2
+version: 0.1.2+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_functions
 
@@ -18,6 +18,9 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  test: any
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"

From 04d6f52e3b09193462a18a38a7249da92b901ba5 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Fri, 15 Mar 2019 15:52:00 -0700
Subject: [PATCH 226/410] [firebase_auth] Add a driver test (#1348)

Add a driver test for signInAnonymously
---
 packages/firebase_auth/CHANGELOG.md           |  4 ++++
 packages/firebase_auth/example/pubspec.yaml   |  5 ++++
 .../example/test/firebase_auth.dart           | 24 +++++++++++++++++++
 .../example/test/firebase_auth_test.dart      | 16 +++++++++++++
 .../test_driver/firebase_auth_test.dart       | 11 +++++++++
 packages/firebase_auth/pubspec.yaml           |  4 +++-
 6 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 packages/firebase_auth/example/test/firebase_auth.dart
 create mode 100644 packages/firebase_auth/example/test/firebase_auth_test.dart
 create mode 100644 packages/firebase_auth/example/test_driver/firebase_auth_test.dart

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index ed09cb3c1bdf..b84b050f85a4 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.1+5
+
+* Added a driver test.
+
 ## 0.8.1+4
 
 * Update README.
diff --git a/packages/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/example/pubspec.yaml
index ed5d762da670..879f53968a41 100755
--- a/packages/firebase_auth/example/pubspec.yaml
+++ b/packages/firebase_auth/example/pubspec.yaml
@@ -10,5 +10,10 @@ dependencies:
   google_sign_in: ^4.0.0
   firebase_core: ^0.3.0
 
+dev_dependencies:
+  flutter_driver:
+    sdk: flutter
+  test: any
+
 flutter:
   uses-material-design: true
diff --git a/packages/firebase_auth/example/test/firebase_auth.dart b/packages/firebase_auth/example/test/firebase_auth.dart
new file mode 100644
index 000000000000..74976da6aa9e
--- /dev/null
+++ b/packages/firebase_auth/example/test/firebase_auth.dart
@@ -0,0 +1,24 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:firebase_auth/firebase_auth.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('$FirebaseAuth', () {
+    final FirebaseAuth auth = FirebaseAuth.instance;
+
+    test('signInAnonymously', () async {
+      final FirebaseUser user = await auth.signInAnonymously();
+      expect(user.uid, isNotNull);
+      expect(user.isAnonymous, isTrue);
+    });
+  });
+}
diff --git a/packages/firebase_auth/example/test/firebase_auth_test.dart b/packages/firebase_auth/example/test/firebase_auth_test.dart
new file mode 100644
index 000000000000..2bc4ea19a1e7
--- /dev/null
+++ b/packages/firebase_auth/example/test/firebase_auth_test.dart
@@ -0,0 +1,16 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:flutter_test/flutter_test.dart';
+
+import '../lib/main.dart';
+
+void main() {
+  testWidgets('FirebaseAuth example widget test', (WidgetTester tester) async {
+    await tester.pumpWidget(MyApp());
+    await tester.tap(find.text('Test registration'));
+    await tester.pumpAndSettle();
+    expect(find.text('Registration'), findsOneWidget);
+  });
+}
diff --git a/packages/firebase_auth/example/test_driver/firebase_auth_test.dart b/packages/firebase_auth/example/test_driver/firebase_auth_test.dart
new file mode 100644
index 000000000000..db46258dfebe
--- /dev/null
+++ b/packages/firebase_auth/example/test_driver/firebase_auth_test.dart
@@ -0,0 +1,11 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:flutter_driver/flutter_driver.dart';
+
+Future<void> main() async {
+  final FlutterDriver driver = await FlutterDriver.connect();
+  await driver.requestData(null, timeout: const Duration(minutes: 1));
+  driver.close();
+}
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 49c1eb8ff24f..7ef7c728d779 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.1+4"
+version: "0.8.1+5"
 
 flutter:
   plugin:
@@ -24,6 +24,8 @@ dev_dependencies:
   test: ^1.3.0
   flutter_test:
     sdk: flutter
+  flutter_driver:
+    sdk: flutter
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"

From d3b3d60c26c06ccb6da9e05c53ba833e0458e051 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 18 Mar 2019 13:06:38 -0700
Subject: [PATCH 227/410] add driver test command to cirrus (#1342)

This teaches Cirrus to run the new drive-examples command added in flutter/plugin_tools#29 on iOS and Android simulators.

I'm sharding the plugins tests more and requesting more powerful Linux VMs to ensure that the tests don't time out now that they're running simulators.
---
 .ci/Dockerfile                                |  5 ++++-
 .cirrus.yml                                   | 22 ++++++++++++++-----
 .../example/test_driver/app_test.dart         |  4 +++-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.ci/Dockerfile b/.ci/Dockerfile
index 49c34ca7c7fe..09db02e8967e 100644
--- a/.ci/Dockerfile
+++ b/.ci/Dockerfile
@@ -5,4 +5,7 @@ RUN yes | sdkmanager \
     "platforms;android-27" \
     "build-tools;27.0.3" \
     "extras;google;m2repository" \
-    "extras;android;m2repository"
+    "extras;android;m2repository" \
+    "system-images;android-21;default;armeabi-v7a"
+
+RUN yes | sdkmanager --licenses
diff --git a/.cirrus.yml b/.cirrus.yml
index 3f184c763f45..1dd45f7789fd 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -2,8 +2,8 @@ task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
   container:
     dockerfile: .ci/Dockerfile
-    cpu: 4
-    memory: 8G
+    cpu: 8
+    memory: 16G
   upgrade_script:
     - flutter channel master
     - flutter upgrade
@@ -22,11 +22,16 @@ task:
       test_script: ./script/incremental_build.sh test
     - name: analyze
       script: ./script/incremental_build.sh analyze
-    - name: build-apks+java-test
+    - name: build-apks+java-test+drive-examples
       env:
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
+      create_device_script:
+        echo no | avdmanager -v create avd -n test -k "system-images;android-21;default;armeabi-v7a"
+      start_emulator_background_script:
+      - $ANDROID_HOME/emulator/emulator -avd test -no-audio -no-window
+      wait_for_emulator_script: adb wait-for-device
       script:
         # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
         # might include non-ASCII characters which makes Gradle crash.
@@ -40,19 +45,22 @@ task:
         - export CIRRUS_COMMIT_MESSAGE=""
         - ./script/incremental_build.sh build-examples --apk
         - ./script/incremental_build.sh java-test  # must come after apk build
+        - ./script/incremental_build.sh drive-examples
         - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
 
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
-  name: build-ipas
+  name: build-ipas+drive-examples
   osx_instance:
     image: mojave-xcode-10.1
   env:
     PATH: $PATH:/usr/local/bin
     matrix:
-      PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
-      PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
+      PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
+      PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
+      PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
+      PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
   setup_script:
     - brew update
     - brew install libimobiledevice
@@ -64,6 +72,8 @@ task:
     - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH
     - flutter doctor
     - pub global activate flutter_plugin_tools
+    - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-1 | xargs xcrun simctl boot
   build_script:
     - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH
     - ./script/incremental_build.sh build-examples --ipa
+    - ./script/incremental_build.sh drive-examples
diff --git a/packages/in_app_purchase/example/test_driver/app_test.dart b/packages/in_app_purchase/example/test_driver/app_test.dart
index abc518540cf9..90fd6db027f7 100644
--- a/packages/in_app_purchase/example/test_driver/app_test.dart
+++ b/packages/in_app_purchase/example/test_driver/app_test.dart
@@ -23,6 +23,8 @@ void main() {
 
     test('can connect', () async {
       await driver.waitFor(connectedFinder);
-    });
+    },
+        skip:
+            "run this test manually https://github.com/flutter/flutter/issues/29462");
   });
 }

From 61c90bf3c1659d58b7fd37297488305ece2cd98e Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 18 Mar 2019 13:47:59 -0700
Subject: [PATCH 228/410] Disable Android emulator testing for now to fix tests
 (#1357)

---
 .cirrus.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 1dd45f7789fd..668287bdf6ca 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -45,7 +45,9 @@ task:
         - export CIRRUS_COMMIT_MESSAGE=""
         - ./script/incremental_build.sh build-examples --apk
         - ./script/incremental_build.sh java-test  # must come after apk build
-        - ./script/incremental_build.sh drive-examples
+        # TODO(jackson): Re-enable once Android emulators support Firebase
+        # https://github.com/flutter/flutter/issues/29571
+        # - ./script/incremental_build.sh drive-examples
         - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
 

From 968e1ce39816bb51d5e48b524c90da1cace6b448 Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Tue, 19 Mar 2019 11:24:40 -0700
Subject: [PATCH 229/410] [image_picker] update Uri Authority for GooglePhotos
 (#1266)

Google photo Uri Authority is always "com.google.android.apps.photos.contentprovider".
---
 packages/image_picker/CHANGELOG.md                            | 4 ++++
 .../main/java/io/flutter/plugins/imagepicker/FileUtils.java   | 2 +-
 packages/image_picker/pubspec.yaml                            | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 4b03f4e82e5e..1f462bc1f4af 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.0+8
+
+* Fixed wrong GooglePhotos authority of image Uri
+
 ## 0.5.0+7
 * Fix a crash when selecting images from yandex.disk and dropbox.
 
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
index 54b437ca66a8..fbc7472428dd 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
@@ -187,6 +187,6 @@ private static boolean isMediaDocument(Uri uri) {
   }
 
   private static boolean isGooglePhotosUri(Uri uri) {
-    return "com.google.android.apps.photos.content".equals(uri.getAuthority());
+    return "com.google.android.apps.photos.contentprovider".equals(uri.getAuthority());
   }
 }
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 276ffb0272d6..ddd659b7fa9e 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.0+7
+version: 0.5.0+8
 
 flutter:
   plugin:

From c78b4e5fb8e7db542fd00f3eb4e7a49a56de7c55 Mon Sep 17 00:00:00 2001
From: Chris Yang <cyang8954@gmail.com>
Date: Tue, 19 Mar 2019 11:43:57 -0700
Subject: [PATCH 230/410] remove unnecessary file path for video (#1315)

Simplified version of #1245 fix.
When pick videos, we used to create an unnecessary extra file. This PR removes the extra temp file logic.
---
 packages/connectivity/README.md                    |  4 ++--
 packages/image_picker/CHANGELOG.md                 | 11 ++++++++---
 .../image_picker/ios/Classes/ImagePickerPlugin.m   | 14 +-------------
 packages/image_picker/pubspec.yaml                 |  2 +-
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/packages/connectivity/README.md b/packages/connectivity/README.md
index bae967dc42fb..b1c2b8b356fe 100644
--- a/packages/connectivity/README.md
+++ b/packages/connectivity/README.md
@@ -33,7 +33,7 @@ import 'package:connectivity/connectivity.dart';
 @override
 initState() {
   super.initState();
-  
+
   subscription = Connectivity().onConnectivityChanged.listen((ConnectivityResult result) {
     // Got a new connectivity status!
   })
@@ -43,7 +43,7 @@ initState() {
 @override
 dispose() {
   super.dispose();
-  
+
   subscription.cancel();
 }
 ```
diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 1f462bc1f4af..eee08ac35aca 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,8 +1,13 @@
+## 0.5.0+9
+
+* Remove unnecessary temp video file path.
+
 ## 0.5.0+8
 
-* Fixed wrong GooglePhotos authority of image Uri
+* Fixed wrong GooglePhotos authority of image Uri.
 
 ## 0.5.0+7
+
 * Fix a crash when selecting images from yandex.disk and dropbox.
 
 ## 0.5.0+6
@@ -11,11 +16,11 @@
 
 ## 0.5.0+5
 
-Remove unnecessary camera permmision.
+* Remove unnecessary camera permission.
 
 ## 0.5.0+4
 
-Preserve transparency when saving images.
+* Preserve transparency when saving images.
 
 ## 0.5.0+3
 
diff --git a/packages/image_picker/ios/Classes/ImagePickerPlugin.m b/packages/image_picker/ios/Classes/ImagePickerPlugin.m
index 0bff07aed34e..da2a3ca6ba71 100644
--- a/packages/image_picker/ios/Classes/ImagePickerPlugin.m
+++ b/packages/image_picker/ios/Classes/ImagePickerPlugin.m
@@ -136,19 +136,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker
     return;
   }
   if (videoURL != nil) {
-    NSData *data = [NSData dataWithContentsOfURL:videoURL];
-    NSString *guid = [[NSProcessInfo processInfo] globallyUniqueString];
-    NSString *tmpFile = [NSString stringWithFormat:@"image_picker_%@.MOV", guid];
-    NSString *tmpDirectory = NSTemporaryDirectory();
-    NSString *tmpPath = [tmpDirectory stringByAppendingPathComponent:tmpFile];
-
-    if ([[NSFileManager defaultManager] createFileAtPath:tmpPath contents:data attributes:nil]) {
-      _result(tmpPath);
-    } else {
-      _result([FlutterError errorWithCode:@"create_error"
-                                  message:@"Temporary file could not be created"
-                                  details:nil]);
-    }
+    _result(videoURL.description);
   } else {
     if (image == nil) {
       image = [info objectForKey:UIImagePickerControllerOriginalImage];
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index ddd659b7fa9e..9610abda2530 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.0+8
+version: 0.5.0+9
 
 flutter:
   plugin:

From 7e7149b21b6282dc4469b2e93559f076c258c0d9 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Tue, 19 Mar 2019 15:55:16 -0700
Subject: [PATCH 231/410] [webview_flutter] Update changelog and bump versions.
 (#1361)

Followup to https://github.com/flutter/plugins/pull/1335
---
 packages/webview_flutter/CHANGELOG.md | 4 ++++
 packages/webview_flutter/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 7a3256a350b3..92e2a10c7eab 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.5
+
+* Added an onPageFinished callback.
+
 ## 0.3.4
 
 * Support specifying navigation delegates that can prevent navigations from being executed.
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 84484a2bcbec..ccaecd36cd3c 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.4
+version: 0.3.5
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From 5c20e7d2b5ba5883f8d40f5194ea767c3377d1f4 Mon Sep 17 00:00:00 2001
From: Arthur Thompson <arthur.thompson.jr@gmail.com>
Date: Wed, 20 Mar 2019 10:06:01 -0700
Subject: [PATCH 232/410] [firebase_crashlytics]Firebase Crashlytics plugin
 (#1080)

* Add Crashlytics support
---
 packages/firebase_crashlytics/.gitignore      |   8 +
 packages/firebase_crashlytics/.metadata       |  10 +
 packages/firebase_crashlytics/CHANGELOG.md    |   5 +
 packages/firebase_crashlytics/LICENSE         |  27 +
 packages/firebase_crashlytics/README.md       | 104 +++
 .../firebase_crashlytics/android/.gitignore   |   8 +
 .../firebase_crashlytics/android/build.gradle |  42 ++
 .../android/gradle.properties                 |   1 +
 .../android/settings.gradle                   |   1 +
 .../android/src/main/AndroidManifest.xml      |   3 +
 .../FirebaseCrashlyticsPlugin.java            | 107 ++++
 .../firebase_crashlytics/example/.gitignore   |  71 ++
 .../firebase_crashlytics/example/.metadata    |  10 +
 .../firebase_crashlytics/example/README.md    |  17 +
 .../example/android/app/build.gradle          |  61 ++
 .../example/android/app/google-services.json  | 545 ++++++++++++++++
 .../android/app/src/main/AndroidManifest.xml  |  39 ++
 .../MainActivity.java                         |  13 +
 .../main/res/drawable/launch_background.xml   |  12 +
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 0 -> 544 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 0 -> 442 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 0 -> 1031 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 0 -> 1443 bytes
 .../app/src/main/res/values/styles.xml        |   8 +
 .../example/android/build.gradle              |  34 +
 .../example/android/gradle.properties         |   1 +
 .../gradle/wrapper/gradle-wrapper.properties  |   6 +
 .../example/android/settings.gradle           |  15 +
 .../ios/Flutter/AppFrameworkInfo.plist        |  26 +
 .../example/ios/Flutter/Debug.xcconfig        |   2 +
 .../example/ios/Flutter/Release.xcconfig      |   2 +
 .../example/ios/GoogleService-Info.plist      |  40 ++
 .../ios/Runner.xcodeproj/project.pbxproj      | 605 ++++++++++++++++++
 .../contents.xcworkspacedata                  |   7 +
 .../xcshareddata/xcschemes/Runner.xcscheme    |  97 +++
 .../contents.xcworkspacedata                  |  10 +
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 +
 .../xcshareddata/WorkspaceSettings.xcsettings |   8 +
 .../example/ios/Runner/AppDelegate.h          |   6 +
 .../example/ios/Runner/AppDelegate.m          |  13 +
 .../AppIcon.appiconset/Contents.json          | 122 ++++
 .../Icon-App-1024x1024@1x.png                 | Bin 0 -> 11112 bytes
 .../AppIcon.appiconset/Icon-App-20x20@1x.png  | Bin 0 -> 564 bytes
 .../AppIcon.appiconset/Icon-App-20x20@2x.png  | Bin 0 -> 1283 bytes
 .../AppIcon.appiconset/Icon-App-20x20@3x.png  | Bin 0 -> 1588 bytes
 .../AppIcon.appiconset/Icon-App-29x29@1x.png  | Bin 0 -> 1025 bytes
 .../AppIcon.appiconset/Icon-App-29x29@2x.png  | Bin 0 -> 1716 bytes
 .../AppIcon.appiconset/Icon-App-29x29@3x.png  | Bin 0 -> 1920 bytes
 .../AppIcon.appiconset/Icon-App-40x40@1x.png  | Bin 0 -> 1283 bytes
 .../AppIcon.appiconset/Icon-App-40x40@2x.png  | Bin 0 -> 1895 bytes
 .../AppIcon.appiconset/Icon-App-40x40@3x.png  | Bin 0 -> 2665 bytes
 .../AppIcon.appiconset/Icon-App-60x60@2x.png  | Bin 0 -> 2665 bytes
 .../AppIcon.appiconset/Icon-App-60x60@3x.png  | Bin 0 -> 3831 bytes
 .../AppIcon.appiconset/Icon-App-76x76@1x.png  | Bin 0 -> 1888 bytes
 .../AppIcon.appiconset/Icon-App-76x76@2x.png  | Bin 0 -> 3294 bytes
 .../Icon-App-83.5x83.5@2x.png                 | Bin 0 -> 3612 bytes
 .../LaunchImage.imageset/Contents.json        |  23 +
 .../LaunchImage.imageset/LaunchImage.png      | Bin 0 -> 68 bytes
 .../LaunchImage.imageset/LaunchImage@2x.png   | Bin 0 -> 68 bytes
 .../LaunchImage.imageset/LaunchImage@3x.png   | Bin 0 -> 68 bytes
 .../LaunchImage.imageset/README.md            |   5 +
 .../Runner/Base.lproj/LaunchScreen.storyboard |  37 ++
 .../ios/Runner/Base.lproj/Main.storyboard     |  26 +
 .../example/ios/Runner/Info.plist             |  45 ++
 .../example/ios/Runner/main.m                 |   9 +
 .../example/lib/main.dart                     |  70 ++
 .../firebase_crashlytics/example/pubspec.yaml |  17 +
 packages/firebase_crashlytics/ios/.gitignore  |  36 ++
 .../firebase_crashlytics/ios/Assets/.gitkeep  |   0
 .../ios/Classes/FirebaseCrashlyticsPlugin.h   |   4 +
 .../ios/Classes/FirebaseCrashlyticsPlugin.m   |  93 +++
 .../ios/firebase_crashlytics.podspec          |  23 +
 .../lib/firebase_crashlytics.dart             |  11 +
 .../lib/src/firebase_crashlytics.dart         | 202 ++++++
 packages/firebase_crashlytics/pubspec.yaml    |  24 +
 .../test/firebase_crashlytics_test.dart       |  98 +++
 77 files changed, 2817 insertions(+)
 create mode 100644 packages/firebase_crashlytics/.gitignore
 create mode 100644 packages/firebase_crashlytics/.metadata
 create mode 100644 packages/firebase_crashlytics/CHANGELOG.md
 create mode 100644 packages/firebase_crashlytics/LICENSE
 create mode 100644 packages/firebase_crashlytics/README.md
 create mode 100644 packages/firebase_crashlytics/android/.gitignore
 create mode 100644 packages/firebase_crashlytics/android/build.gradle
 create mode 100644 packages/firebase_crashlytics/android/gradle.properties
 create mode 100644 packages/firebase_crashlytics/android/settings.gradle
 create mode 100644 packages/firebase_crashlytics/android/src/main/AndroidManifest.xml
 create mode 100644 packages/firebase_crashlytics/android/src/main/java/io/flutter/plugins/firebase/crashlytics/firebasecrashlytics/FirebaseCrashlyticsPlugin.java
 create mode 100644 packages/firebase_crashlytics/example/.gitignore
 create mode 100644 packages/firebase_crashlytics/example/.metadata
 create mode 100644 packages/firebase_crashlytics/example/README.md
 create mode 100644 packages/firebase_crashlytics/example/android/app/build.gradle
 create mode 100644 packages/firebase_crashlytics/example/android/app/google-services.json
 create mode 100644 packages/firebase_crashlytics/example/android/app/src/main/AndroidManifest.xml
 create mode 100644 packages/firebase_crashlytics/example/android/app/src/main/java/io/flutter/plugins/firebase/crashlytics/firebasecrashlyticsexample/MainActivity.java
 create mode 100644 packages/firebase_crashlytics/example/android/app/src/main/res/drawable/launch_background.xml
 create mode 100644 packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 packages/firebase_crashlytics/example/android/app/src/main/res/values/styles.xml
 create mode 100644 packages/firebase_crashlytics/example/android/build.gradle
 create mode 100644 packages/firebase_crashlytics/example/android/gradle.properties
 create mode 100644 packages/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/firebase_crashlytics/example/android/settings.gradle
 create mode 100644 packages/firebase_crashlytics/example/ios/Flutter/AppFrameworkInfo.plist
 create mode 100644 packages/firebase_crashlytics/example/ios/Flutter/Debug.xcconfig
 create mode 100644 packages/firebase_crashlytics/example/ios/Flutter/Release.xcconfig
 create mode 100644 packages/firebase_crashlytics/example/ios/GoogleService-Info.plist
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner.xcodeproj/project.pbxproj
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner.xcworkspace/contents.xcworkspacedata
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/AppDelegate.h
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/AppDelegate.m
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Base.lproj/Main.storyboard
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/Info.plist
 create mode 100644 packages/firebase_crashlytics/example/ios/Runner/main.m
 create mode 100644 packages/firebase_crashlytics/example/lib/main.dart
 create mode 100644 packages/firebase_crashlytics/example/pubspec.yaml
 create mode 100644 packages/firebase_crashlytics/ios/.gitignore
 create mode 100644 packages/firebase_crashlytics/ios/Assets/.gitkeep
 create mode 100644 packages/firebase_crashlytics/ios/Classes/FirebaseCrashlyticsPlugin.h
 create mode 100644 packages/firebase_crashlytics/ios/Classes/FirebaseCrashlyticsPlugin.m
 create mode 100644 packages/firebase_crashlytics/ios/firebase_crashlytics.podspec
 create mode 100644 packages/firebase_crashlytics/lib/firebase_crashlytics.dart
 create mode 100644 packages/firebase_crashlytics/lib/src/firebase_crashlytics.dart
 create mode 100644 packages/firebase_crashlytics/pubspec.yaml
 create mode 100644 packages/firebase_crashlytics/test/firebase_crashlytics_test.dart

diff --git a/packages/firebase_crashlytics/.gitignore b/packages/firebase_crashlytics/.gitignore
new file mode 100644
index 000000000000..7ecebb447a5e
--- /dev/null
+++ b/packages/firebase_crashlytics/.gitignore
@@ -0,0 +1,8 @@
+.DS_Store
+.dart_tool/
+
+.packages
+.pub/
+pubspec.lock
+
+build/
diff --git a/packages/firebase_crashlytics/.metadata b/packages/firebase_crashlytics/.metadata
new file mode 100644
index 000000000000..fbc1f3952e5d
--- /dev/null
+++ b/packages/firebase_crashlytics/.metadata
@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 5391447fae6209bb21a89e6a5a6583cac1af9b4b
+  channel: beta
+
+project_type: plugin
diff --git a/packages/firebase_crashlytics/CHANGELOG.md b/packages/firebase_crashlytics/CHANGELOG.md
new file mode 100644
index 000000000000..bf963537d63d
--- /dev/null
+++ b/packages/firebase_crashlytics/CHANGELOG.md
@@ -0,0 +1,5 @@
+## 0.0.1
+
+* Initial release of Firebase Crashlytics plugin.
+This version reports uncaught errors as non-fatal exceptions in the
+Firebase console.
diff --git a/packages/firebase_crashlytics/LICENSE b/packages/firebase_crashlytics/LICENSE
new file mode 100644
index 000000000000..03118dc2b39b
--- /dev/null
+++ b/packages/firebase_crashlytics/LICENSE
@@ -0,0 +1,27 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/packages/firebase_crashlytics/README.md b/packages/firebase_crashlytics/README.md
new file mode 100644
index 000000000000..858f8b77dad5
--- /dev/null
+++ b/packages/firebase_crashlytics/README.md
@@ -0,0 +1,104 @@
+# firebase_crashlytics plugin
+
+A Flutter plugin to use the [Firebase Crashlytics Service](https://firebase.google.com/docs/crashlytics/).
+
+[![pub package](https://img.shields.io/pub/v/firebase_crashlytics.svg)](https://pub.dartlang.org/packages/firebase_crashlytics)
+
+For Flutter plugins for other Firebase products, see [FlutterFire.md](https://github.com/flutter/plugins/blob/master/FlutterFire.md).
+
+*Note*: This plugin is still under development, and some APIs might not be available yet. [Feedback](https://github.com/flutter/flutter/issues) and [Pull Requests](https://github.com/flutter/plugins/pulls) are most welcome!
+
+## Usage
+
+### Import the firebase_crashlytics plugin
+To use the firebase_crashlytics plugin, follow the [plugin installation instructions](https://pub.dartlang.org/packages/firebase_crashlytics#pub-pkg-tab-installing).
+
+### Android integration
+
+Enable the Google services by configuring the Gradle scripts as such.
+
+1. Add Fabric repository to the `[project]/android/build.gradle` file.
+```
+repositories {
+  google()
+  jcenter()
+  // Additional repository for fabric resources
+  maven {
+    url 'https://maven.fabric.io/public'
+  }
+}
+```
+
+2. Add the classpaths to the `[project]/android/build.gradle` file.
+```gradle
+dependencies {
+  // Example existing classpath
+  classpath 'com.android.tools.build:gradle:3.2.1'
+  // Add the google services classpath
+  classpath 'com.google.gms:google-services:4.2.0'
+  // Add fabric classpath
+  classpath 'io.fabric.tools:gradle:1.26.1'
+}
+```
+
+2. Add the apply plugins to the `[project]/android/app/build.gradle` file.
+```gradle
+// ADD THIS AT THE BOTTOM
+apply plugin: 'io.fabric'
+apply plugin: 'com.google.gms.google-services'
+```
+
+*Note:* If this section is not completed you will get an error like this:
+```
+java.lang.IllegalStateException:
+Default FirebaseApp is not initialized in this process [package name].
+Make sure to call FirebaseApp.initializeApp(Context) first.
+```
+
+*Note:* When you are debugging on Android, use a device or AVD with Google Play services.
+Otherwise you will not be able to use Firebase Crashlytics.
+
+### iOS Integration
+
+Add the Crashlytics run scripts
+
+1. From Xcode select Runner from the project navigation.
+1. Select the Build Phases tab.
+1. Click + Add a new build phase, and select New Run Script Phase.
+1. Add `${PODS_ROOT}/Fabric/run` to the `Type a script...` text box.
+1. If on Xcode 10 Add your app's built Info.plist location to the Build Phase's Input Files field.
+Eg: `$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)`
+
+### Use the plugin
+
+Add the following imports to your Dart code:
+```dart
+import 'package:firebase_crashlytics/firebase_crashlytics.dart';
+```
+
+Setup `Crashlytics`:
+```dart
+void main() {
+  // Set `enableInDevMode` to true to see reports while in debug mode
+  // This is only to be used for confirming that reports are being
+  // submitted as expected. It is not intended to be used for everyday
+  // development.
+  Crashlytics.instance.reportInDevMode = true;
+
+  // Pass all uncaught errors to Crashlytics.
+  FlutterError.onError = (FlutterErrorDetails details) {
+    Crashlytics.instance.onError(details);
+  };
+  runApp(MyApp());
+}
+```
+
+## Example
+
+See the [example application](https://github.com/flutter/plugins/tree/master/packages/firebase_crashlytics/example) source
+for a complete sample app using the Firebase Crashlytics.
+
+## Issues and feedback
+
+Please file [issues](https://github.com/flutter/flutter/issues/new)
+to send feedback or report a bug. Thank you!
\ No newline at end of file
diff --git a/packages/firebase_crashlytics/android/.gitignore b/packages/firebase_crashlytics/android/.gitignore
new file mode 100644
index 000000000000..c6cbe562a427
--- /dev/null
+++ b/packages/firebase_crashlytics/android/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
diff --git a/packages/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/android/build.gradle
new file mode 100644
index 000000000000..45dae6504f22
--- /dev/null
+++ b/packages/firebase_crashlytics/android/build.gradle
@@ -0,0 +1,42 @@
+group 'io.flutter.plugins.firebase.crashlytics.firebasecrashlytics'
+version '1.0-SNAPSHOT'
+
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.3.1'
+    }
+}
+
+rootProject.allprojects {
+    repositories {
+        google()
+        jcenter()
+        maven {
+            url 'https://maven.fabric.io/public'
+        }
+    }
+}
+
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 27
+
+    defaultConfig {
+        minSdkVersion 16
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    lintOptions {
+        disable 'InvalidPackage'
+    }
+}
+
+dependencies {
+    implementation 'com.google.firebase:firebase-core:16.0.7'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
+}
diff --git a/packages/firebase_crashlytics/android/gradle.properties b/packages/firebase_crashlytics/android/gradle.properties
new file mode 100644
index 000000000000..8bd86f680510
--- /dev/null
+++ b/packages/firebase_crashlytics/android/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1536M
diff --git a/packages/firebase_crashlytics/android/settings.gradle b/packages/firebase_crashlytics/android/settings.gradle
new file mode 100644
index 000000000000..0db0f63e40fd
--- /dev/null
+++ b/packages/firebase_crashlytics/android/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'firebase_crashlytics'
diff --git a/packages/firebase_crashlytics/android/src/main/AndroidManifest.xml b/packages/firebase_crashlytics/android/src/main/AndroidManifest.xml
new file mode 100644
index 000000000000..17135213fb56
--- /dev/null
+++ b/packages/firebase_crashlytics/android/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="io.flutter.plugins.firebase.crashlytics.firebasecrashlytics">
+</manifest>
diff --git a/packages/firebase_crashlytics/android/src/main/java/io/flutter/plugins/firebase/crashlytics/firebasecrashlytics/FirebaseCrashlyticsPlugin.java b/packages/firebase_crashlytics/android/src/main/java/io/flutter/plugins/firebase/crashlytics/firebasecrashlytics/FirebaseCrashlyticsPlugin.java
new file mode 100644
index 000000000000..35639229f4a4
--- /dev/null
+++ b/packages/firebase_crashlytics/android/src/main/java/io/flutter/plugins/firebase/crashlytics/firebasecrashlytics/FirebaseCrashlyticsPlugin.java
@@ -0,0 +1,107 @@
+package io.flutter.plugins.firebase.crashlytics.firebasecrashlytics;
+
+import android.util.Log;
+import com.crashlytics.android.Crashlytics;
+import io.fabric.sdk.android.Fabric;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
+import io.flutter.plugin.common.MethodChannel.Result;
+import io.flutter.plugin.common.PluginRegistry.Registrar;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/** FirebaseCrashlyticsPlugin */
+public class FirebaseCrashlyticsPlugin implements MethodCallHandler {
+
+  public static final String TAG = "CrashlyticsPlugin";
+
+  /** Plugin registration. */
+  public static void registerWith(Registrar registrar) {
+    final MethodChannel channel =
+        new MethodChannel(registrar.messenger(), "plugins.flutter.io/firebase_crashlytics");
+    channel.setMethodCallHandler(new FirebaseCrashlyticsPlugin());
+  }
+
+  @Override
+  public void onMethodCall(MethodCall call, Result result) {
+    if (call.method.equals("Crashlytics#onError")) {
+      // Add logs.
+      List<String> logs = call.argument("logs");
+      for (String log : logs) {
+        Crashlytics.log(log);
+      }
+
+      // Set keys.
+      List<Map<String, Object>> keys = call.argument("keys");
+      for (Map<String, Object> key : keys) {
+        switch ((String) key.get("type")) {
+          case "int":
+            Crashlytics.setInt((String) key.get("key"), (int) key.get("value"));
+            break;
+          case "double":
+            Crashlytics.setDouble((String) key.get("key"), (double) key.get("value"));
+            break;
+          case "string":
+            Crashlytics.setString((String) key.get("key"), (String) key.get("value"));
+            break;
+          case "boolean":
+            Crashlytics.setBool((String) key.get("key"), (boolean) key.get("value"));
+            break;
+        }
+      }
+
+      // Report crash.
+      Exception exception = new Exception("Dart Error");
+      List<Map<String, String>> errorElements = call.argument("stackTraceElements");
+      List<StackTraceElement> elements = new ArrayList<>();
+      for (Map<String, String> errorElement : errorElements) {
+        StackTraceElement stackTraceElement = generateStackTraceElement(errorElement);
+        if (stackTraceElement != null) {
+          elements.add(stackTraceElement);
+        }
+      }
+      exception.setStackTrace(elements.toArray(new StackTraceElement[elements.size()]));
+
+      Crashlytics.setString("exception", (String) call.argument("exception"));
+      Crashlytics.logException(exception);
+      result.success("Error reported to Crashlytics.");
+    } else if (call.method.equals("Crashlytics#isDebuggable")) {
+      result.success(Fabric.isDebuggable());
+    } else if (call.method.equals("Crashlytics#getVersion")) {
+      result.success(Crashlytics.getInstance().getVersion());
+    } else if (call.method.equals("Crashlytics#setUserEmail")) {
+      Crashlytics.setUserEmail((String) call.argument("email"));
+      result.success(null);
+    } else if (call.method.equals("Crashlytics#setUserIdentifier")) {
+      Crashlytics.setUserIdentifier((String) call.argument("identifier"));
+      result.success(null);
+    } else if (call.method.equals("Crashlytics#setUserName")) {
+      Crashlytics.setUserName((String) call.argument("name"));
+      result.success(null);
+    } else {
+      result.notImplemented();
+    }
+  }
+
+  /**
+   * Extract StackTraceElement from Dart stack trace element.
+   *
+   * @param errorElement Map representing the parts of a Dart error.
+   * @return Stack trace element to be used as part of an Exception stack trace.
+   */
+  private StackTraceElement generateStackTraceElement(Map<String, String> errorElement) {
+    try {
+      String fileName = errorElement.get("file");
+      String lineNumber = errorElement.get("line");
+      String className = errorElement.get("class");
+      String methodName = errorElement.get("method");
+
+      return new StackTraceElement(className, methodName, fileName, Integer.parseInt(lineNumber));
+    } catch (Exception e) {
+      Log.e(TAG, "Unable to generate stack trace element from Dart side error.");
+      return null;
+    }
+  }
+}
diff --git a/packages/firebase_crashlytics/example/.gitignore b/packages/firebase_crashlytics/example/.gitignore
new file mode 100644
index 000000000000..47e0b4d62146
--- /dev/null
+++ b/packages/firebase_crashlytics/example/.gitignore
@@ -0,0 +1,71 @@
+# Miscellaneous
+*.class
+*.lock
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# Visual Studio Code related
+.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+.dart_tool/
+.flutter-plugins
+.packages
+.pub-cache/
+.pub/
+build/
+
+# Android related
+**/android/**/gradle-wrapper.jar
+**/android/.gradle
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/local.properties
+**/android/**/GeneratedPluginRegistrant.java
+
+# iOS/XCode related
+**/ios/**/*.mode1v3
+**/ios/**/*.mode2v3
+**/ios/**/*.moved-aside
+**/ios/**/*.pbxuser
+**/ios/**/*.perspectivev3
+**/ios/**/*sync/
+**/ios/**/.sconsign.dblite
+**/ios/**/.tags*
+**/ios/**/.vagrant/
+**/ios/**/DerivedData/
+**/ios/**/Icon?
+**/ios/**/Pods/
+**/ios/**/.symlinks/
+**/ios/**/profile
+**/ios/**/xcuserdata
+**/ios/.generated/
+**/ios/Flutter/App.framework
+**/ios/Flutter/Flutter.framework
+**/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/app.flx
+**/ios/Flutter/app.zip
+**/ios/Flutter/flutter_assets/
+**/ios/ServiceDefinitions.json
+**/ios/Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!**/ios/**/default.mode1v3
+!**/ios/**/default.mode2v3
+!**/ios/**/default.pbxuser
+!**/ios/**/default.perspectivev3
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
diff --git a/packages/firebase_crashlytics/example/.metadata b/packages/firebase_crashlytics/example/.metadata
new file mode 100644
index 000000000000..fd2a86fddab1
--- /dev/null
+++ b/packages/firebase_crashlytics/example/.metadata
@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 5391447fae6209bb21a89e6a5a6583cac1af9b4b
+  channel: beta
+
+project_type: app
diff --git a/packages/firebase_crashlytics/example/README.md b/packages/firebase_crashlytics/example/README.md
new file mode 100644
index 000000000000..5e2d12023ec4
--- /dev/null
+++ b/packages/firebase_crashlytics/example/README.md
@@ -0,0 +1,17 @@
+# firebase_crashlytics_example
+
+Demonstrates how to use the firebase_crashlytics plugin.
+
+## Getting Started
+
+### Add your own Firebase project
+
+This example initially uses a default project for CI purposes. You must
+replace the default project with your own so that you can review the error
+reports submitted to the Firebase console.
+
+See [docs](https://firebase.google.com/docs/flutter/setup) for how to add 
+Firebase to a Flutter project.
+
+For further help getting started with Flutter, view our online
+[documentation](http://flutter.io/).
diff --git a/packages/firebase_crashlytics/example/android/app/build.gradle b/packages/firebase_crashlytics/example/android/app/build.gradle
new file mode 100644
index 000000000000..3811065ae4d4
--- /dev/null
+++ b/packages/firebase_crashlytics/example/android/app/build.gradle
@@ -0,0 +1,61 @@
+def localProperties = new Properties()
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.withReader('UTF-8') { reader ->
+        localProperties.load(reader)
+    }
+}
+
+def flutterRoot = localProperties.getProperty('flutter.sdk')
+if (flutterRoot == null) {
+    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+}
+
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
+apply plugin: 'com.android.application'
+apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
+android {
+    compileSdkVersion 27
+
+    lintOptions {
+        disable 'InvalidPackage'
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId "io.flutter.plugins.firebase.crashlytics.firebasecrashlyticsexample"
+        minSdkVersion 16
+        targetSdkVersion 27
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig signingConfigs.debug
+        }
+    }
+}
+
+flutter {
+    source '../..'
+}
+
+dependencies {
+}
+
+apply plugin: 'io.fabric'
+apply plugin: 'com.google.gms.google-services'
diff --git a/packages/firebase_crashlytics/example/android/app/google-services.json b/packages/firebase_crashlytics/example/android/app/google-services.json
new file mode 100644
index 000000000000..4f8ed237b31b
--- /dev/null
+++ b/packages/firebase_crashlytics/example/android/app/google-services.json
@@ -0,0 +1,545 @@
+{
+  "project_info": {
+    "project_number": "380450695418",
+    "firebase_url": "https://fir-for-flutter-xry.firebaseio.com",
+    "project_id": "firebase-for-flutter-xry",
+    "storage_bucket": "firebase-for-flutter-xry.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:df22ebedafef81e5",
+        "android_client_info": {
+          "package_name": "com.example.myapp"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:c1f0f09aa42eba16",
+        "android_client_info": {
+          "package_name": "com.google.firebase.example.fireeats"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-680tdukm5lmsvqdgfjf35oooapesp5qe.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.google.firebase.example.fireeats",
+            "certificate_hash": "13b46061adbac6fccea79893f1eeff8f94b17318"
+          }
+        },
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "380450695418-j9bquuvdhv7iimnca4n7mhrp9a0kv9un.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.flutter.plugins.firebase.crashlytics.firebaseCrashlyticsExample"
+              }
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:cdde97911ac112a2",
+        "android_client_info": {
+          "package_name": "com.google.firehunt"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-56dso58q89k1u1g4jr2csjvu0t0s5sah.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.google.firehunt",
+            "certificate_hash": "13b46061adbac6fccea79893f1eeff8f94b17318"
+          }
+        },
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "380450695418-j9bquuvdhv7iimnca4n7mhrp9a0kv9un.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.flutter.plugins.firebase.crashlytics.firebaseCrashlyticsExample"
+              }
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:66cfa0cc55000185",
+        "android_client_info": {
+          "package_name": "io.flutter.plugins.crashlytics.crashlyticsexample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:7521d73664dc56fc",
+        "android_client_info": {
+          "package_name": "io.flutter.plugins.firebase.cloudfunctions.cloudfunctionsexample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:534a419926d9c345",
+        "android_client_info": {
+          "package_name": "io.flutter.plugins.firebase.crashlytics.firebasecrashlyticsexample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:b46d52db5a4d815e",
+        "android_client_info": {
+          "package_name": "io.flutter.plugins.firebase.firebaseremoteconfig"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:6ef94ae486218531",
+        "android_client_info": {
+          "package_name": "io.flutter.plugins.firebase.firebaseremoteconfigexample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:236f9daea101f77e",
+        "android_client_info": {
+          "package_name": "io.flutter.plugins.firebase.firestoreexample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-s5i0ce3nvtebsqc43fdjq7rub7m5kl52.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "io.flutter.plugins.firebase.firestoreexample",
+            "certificate_hash": "1da568611fe7dcfeafc0f35ad42f585c0a32012d"
+          }
+        },
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "380450695418-j9bquuvdhv7iimnca4n7mhrp9a0kv9un.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.flutter.plugins.firebase.crashlytics.firebaseCrashlyticsExample"
+              }
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:faccb3c5e155ce04",
+        "android_client_info": {
+          "package_name": "io.flutter.plugins.firebase.mlkit.firebasemlkitexample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:11e8f037a4a3ec3b",
+        "android_client_info": {
+          "package_name": "io.flutter.plugins.firebaseauthexample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-1r77qvo64360tkatfaimd7jsge6ookui.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "io.flutter.plugins.firebaseauthexample",
+            "certificate_hash": "13b46061adbac6fccea79893f1eeff8f94b17318"
+          }
+        },
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "380450695418-j9bquuvdhv7iimnca4n7mhrp9a0kv9un.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.flutter.plugins.firebase.crashlytics.firebaseCrashlyticsExample"
+              }
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:c68d3ad04a4046db",
+        "android_client_info": {
+          "package_name": "io.flutter.plugins.firebasedatabaseexample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-nva3tg4js1gmdrm0egas2dlbj3go6nsk.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "io.flutter.plugins.firebasedatabaseexample",
+            "certificate_hash": "1da568611fe7dcfeafc0f35ad42f585c0a32012d"
+          }
+        },
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "380450695418-j9bquuvdhv7iimnca4n7mhrp9a0kv9un.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.flutter.plugins.firebase.crashlytics.firebaseCrashlyticsExample"
+              }
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:620f0e4ca16cbddd",
+        "android_client_info": {
+          "package_name": "io.flutter.plugins.firebasemessagingexample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:380450695418:android:ef48439a0cc0263d",
+        "android_client_info": {
+          "package_name": "io.flutter.plugins.firebasestorageexample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "380450695418-17gd38vnvfrt9ak76bfdeu4jsb0h6is5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD-qW3X8rktjbW3BPEX8KlpqYNCUdlTtGQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/packages/firebase_crashlytics/example/android/app/src/main/AndroidManifest.xml b/packages/firebase_crashlytics/example/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000000..0c7d86680639
--- /dev/null
+++ b/packages/firebase_crashlytics/example/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="io.flutter.plugins.firebase.crashlytics.firebasecrashlyticsexample">
+
+    <!-- The INTERNET permission is required for development. Specifically,
+         flutter needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
+         calls FlutterMain.startInitialization(this); in its onCreate method.
+         In most cases you can leave this as-is, but you if you want to provide
+         additional functionality it is fine to subclass or reimplement
+         FlutterApplication and put your custom class here. -->
+    <application
+        android:name="io.flutter.app.FlutterApplication"
+        android:label="firebase_crashlytics_example"
+        android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name=".MainActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- This keeps the window background of the activity showing
+                 until Flutter renders its first frame. It can be removed if
+                 there is no splash screen (such as the default splash screen
+                 defined in @style/LaunchTheme). -->
+            <meta-data
+                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
+                android:value="true" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/packages/firebase_crashlytics/example/android/app/src/main/java/io/flutter/plugins/firebase/crashlytics/firebasecrashlyticsexample/MainActivity.java b/packages/firebase_crashlytics/example/android/app/src/main/java/io/flutter/plugins/firebase/crashlytics/firebasecrashlyticsexample/MainActivity.java
new file mode 100644
index 000000000000..e70d93f30b57
--- /dev/null
+++ b/packages/firebase_crashlytics/example/android/app/src/main/java/io/flutter/plugins/firebase/crashlytics/firebasecrashlyticsexample/MainActivity.java
@@ -0,0 +1,13 @@
+package io.flutter.plugins.firebase.crashlytics.firebasecrashlyticsexample;
+
+import android.os.Bundle;
+import io.flutter.app.FlutterActivity;
+import io.flutter.plugins.GeneratedPluginRegistrant;
+
+public class MainActivity extends FlutterActivity {
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    GeneratedPluginRegistrant.registerWith(this);
+  }
+}
diff --git a/packages/firebase_crashlytics/example/android/app/src/main/res/drawable/launch_background.xml b/packages/firebase_crashlytics/example/android/app/src/main/res/drawable/launch_background.xml
new file mode 100644
index 000000000000..304732f88420
--- /dev/null
+++ b/packages/firebase_crashlytics/example/android/app/src/main/res/drawable/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29
GIT binary patch
literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc
zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs
zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U<k`UN+s5qQ#T?KrmN7v*f2L%`GO4-^
z(#_kX+jhyc?*UrsvLED<w+p3gfi4y<3GxeO5CDRJfCLa|I1d8%B?X@R0!qL1ba4!c
zIQ;g^b-pGC0f)elH+vJ_clF3>|N3vA*22N<t#oc3|FNCx%`Ll}Jbl*Q`}yg~1ZO@=
zF!6p)NTYsh!6(JdtLiRuwi@`&XeqAXe9fY|=kfFy_3t|md##(iHE+K4ydxH3>aGQG
zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#i<K@6w~yiZZH!59hqLTYF-H
zp0%uz(2~z(X$>qdw@AL`7MR}m`rwr|mZgU`8P7SB<Kba6`>kL78fFf!WnuYWm$5Z0
zNXhDbCv&49sM544K|?c)WrFfiZ<W8RzO1)p=v7f>vCi9h0O)B3Pgg&ebxsLQ05GG~
AQ2+n{

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be
GIT binary patch
literal 442
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB
zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q0<?|W-^A&VhjhO+044$%!YxiPI;`p4Q#=k
za-F;6dk-j1J*_nBlG2>3KywUtLX8Ua?`H+NMzkczFPK3<KtaL4z@UHr{Pp|KpFjT|
z1oAia3j-A_^>lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l
zyt<ns@%x_-ezPmiS-=02Ut8`WUGa5ad?jb?UB<rkVmAJ)*Xy}nR&U>Q?X=U+MF$@3
zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+
yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@U<OZDKbLh*2~7avPrJzg

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..09d4391482be68e9e4a07fab769b5de337d16eb1
GIT binary patch
literal 721
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!iOI#yLg7ec#$`gxH85~pclTsBt
za}(23gHjVyDhp4h+5i=O3-AeX1=1l$e`s#|#^}+&7(N@w0CIr{$Oe+Uk^K-ZP~83C
zcc@hG6rikF&NPT(23>y!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs
z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM
zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R`
zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM
zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg
z<JnHTOuK%sGbNji)8cv6*ZNtnbwxJZ-?eY1e-ZPG#r<}_kct2Ie>oq1^2_p9@|WEo
z*X_Uko@K)qYYv~<poG`LOv(2(Hhkk{Dz;b6_#4<(=XBwh@>>43eQGMdbiGbo>E~Q&
zr<n4_y=h^-h|%}kO&jwCioQ5EzF6K8^VdP)H>YBH{QP^@Sti!`2)uG{irBBq@y*$B
zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N
zdG@vOZB4v_lF7Plrx+hxo7(fCV&}f<lyK#S=nvDw%*y%vwN3psIS+1s7G}QfbZGd|
zV;VoMy*YI2-%hU{-w$hl9!*Y_m~60h&vVVs6)lfgu09v4QWIt25UBGxaN`?mVmn*e
U?z!!Jz`$qlboFyt=akR{0C)T?>Hq)$

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c
GIT binary patch
literal 1031
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xj&#3c(B0U1_%
zz5^97Xt*<I`!eYGGw1~|=m#_ChcFm~F&M`%SZ6TU=QA3HGn&RTnk6urCox*3Gg@ad
z+GI1@<S^O-Q7)rh9;1CBqhm3nV+o^EDWh`*qe~T|Yc-==4WnBvqgx%LdmW=k1EWVH
zqbCqGF?u#LdbTinH8Xm(F#5DJ`gAb*0#PTUUpJ#)52HU2^)d$ZF$VTC22NlMoX8kB
zi7{v*V-S#>%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3
zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc
z$|q_opQ^2TrnVZ0o~wh<3t%W&f<tNc(Fvx&VC63f@(X4V5O7Fnm=6N`&!0cPZsO%v
z3=B;Ao-U3d6}R4ANDmGU6lr~^!Nn0K;_9?HfJbVIkW)*G%Yg&F)*BmaZ)6Dl_&?vn
za8gV0`@6<5-|YBa|J|21FVarliS1gU$698&iU*DCL=pdt&mR>lvYGe#$xqda2bR_R
zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2<a5l9V~;L&ZJD?F
zD6?3<TgqciA=l+!=Lp=a%2;%{dX@{HT-OP1|K<}HAM1TO7OY<MaYyH#Pk)4WR?Ts}
zSNX4tLr#6-^m$z!Pd18IzSivQkh7k6T`o7OKThT4#m*F4b=OPt(kAX%9+=X!JT9f}
zc|=Oray6sl!J;#tXm&@~>^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2
z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b
z<q`EIyVgP^b`|@{uDX5oB6GTR%^Or)?eBf<KkJg@eR6BbGYJ*-U;nQCudos6R9mG`
zc=6fn-^`2s)0Hm%cpbX>pQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE
z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o
zo~|9<SN`RwE}r7KC~Q%?|CMD5O&m%cKw{Bn6{qJbmFIooO_;g=+H+v4V(@hJb6Mw<
G&;$S>I;xof

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/firebase_crashlytics/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0
GIT binary patch
literal 1443
zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`Y<EGuRA6NX2Md
zPqmGQbJPjRLrI#9?bL25ZHra>V6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY
zB_M<hJUv`}aj#i9>sH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv
za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8<s&Q-yp4r*9
z(t|8L&`vhm$wAg!MByQdFQW1h)eqSS&@P++v^xmx2}OHF$WDZ4QHUN37S3Sd0#=@|
zD*$YR!8QbJ55gWH>=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~<G>Lo9vl;Zfs+W#BydUw
zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3
z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w!
zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u
zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%<BT_6>4Q8~Mad
z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt*
zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW
zu72MW`|?8h<N~B$l%}NU6KvLZj~&>t^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w
z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf<
zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$
zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v
zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq
z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek
zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+
zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q
zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl
z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f
z<NEXJGYh+`9LE^Z1#g~OZ)yl?O>%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H
zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP
z(1P?z<YzdcoCZ;A^sD<`wcO1=DLw>~7YxD~Rf<<Lt&2H?f`^~9TW?0O(WnyXeZvF-
hHxv6WEXUT@T$j&O|7sZ6iSVC<kf$5l^{TT-@h=>(a@_y`

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/android/app/src/main/res/values/styles.xml b/packages/firebase_crashlytics/example/android/app/src/main/res/values/styles.xml
new file mode 100644
index 000000000000..00fa4417cfbe
--- /dev/null
+++ b/packages/firebase_crashlytics/example/android/app/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             Flutter draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+</resources>
diff --git a/packages/firebase_crashlytics/example/android/build.gradle b/packages/firebase_crashlytics/example/android/build.gradle
new file mode 100644
index 000000000000..3b6a3b564da7
--- /dev/null
+++ b/packages/firebase_crashlytics/example/android/build.gradle
@@ -0,0 +1,34 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+        maven {
+            url 'https://maven.fabric.io/public'
+        }
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'io.fabric.tools:gradle:1.26.1'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+rootProject.buildDir = '../build'
+subprojects {
+    project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
+    project.evaluationDependsOn(':app')
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/packages/firebase_crashlytics/example/android/gradle.properties b/packages/firebase_crashlytics/example/android/gradle.properties
new file mode 100644
index 000000000000..8bd86f680510
--- /dev/null
+++ b/packages/firebase_crashlytics/example/android/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1536M
diff --git a/packages/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..2819f022f1fd
--- /dev/null
+++ b/packages/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Jun 23 08:50:38 CEST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
diff --git a/packages/firebase_crashlytics/example/android/settings.gradle b/packages/firebase_crashlytics/example/android/settings.gradle
new file mode 100644
index 000000000000..5a2f14fb18f6
--- /dev/null
+++ b/packages/firebase_crashlytics/example/android/settings.gradle
@@ -0,0 +1,15 @@
+include ':app'
+
+def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+
+def plugins = new Properties()
+def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
+if (pluginsFile.exists()) {
+    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
+}
+
+plugins.each { name, path ->
+    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
+    include ":$name"
+    project(":$name").projectDir = pluginDirectory
+}
diff --git a/packages/firebase_crashlytics/example/ios/Flutter/AppFrameworkInfo.plist b/packages/firebase_crashlytics/example/ios/Flutter/AppFrameworkInfo.plist
new file mode 100644
index 000000000000..9367d483e44e
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Flutter/AppFrameworkInfo.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>App</string>
+  <key>CFBundleIdentifier</key>
+  <string>io.flutter.flutter.app</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>App</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1.0</string>
+  <key>MinimumOSVersion</key>
+  <string>8.0</string>
+</dict>
+</plist>
diff --git a/packages/firebase_crashlytics/example/ios/Flutter/Debug.xcconfig b/packages/firebase_crashlytics/example/ios/Flutter/Debug.xcconfig
new file mode 100644
index 000000000000..e8efba114687
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Flutter/Debug.xcconfig
@@ -0,0 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include "Generated.xcconfig"
diff --git a/packages/firebase_crashlytics/example/ios/Flutter/Release.xcconfig b/packages/firebase_crashlytics/example/ios/Flutter/Release.xcconfig
new file mode 100644
index 000000000000..399e9340e6f6
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Flutter/Release.xcconfig
@@ -0,0 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include "Generated.xcconfig"
diff --git a/packages/firebase_crashlytics/example/ios/GoogleService-Info.plist b/packages/firebase_crashlytics/example/ios/GoogleService-Info.plist
new file mode 100644
index 000000000000..c9c6c3ae12aa
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/GoogleService-Info.plist
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AD_UNIT_ID_FOR_BANNER_TEST</key>
+	<string>ca-app-pub-3940256099942544/2934735716</string>
+	<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
+	<string>ca-app-pub-3940256099942544/4411468910</string>
+	<key>CLIENT_ID</key>
+	<string>380450695418-j9bquuvdhv7iimnca4n7mhrp9a0kv9un.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.380450695418-j9bquuvdhv7iimnca4n7mhrp9a0kv9un</string>
+	<key>API_KEY</key>
+	<string>AIzaSyDKzrI_W_MaUt46jthsPB7FTG-RdSKeKEw</string>
+	<key>GCM_SENDER_ID</key>
+	<string>380450695418</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>io.flutter.plugins.firebase.crashlytics.firebaseCrashlyticsExample</string>
+	<key>PROJECT_ID</key>
+	<string>firebase-for-flutter-xry</string>
+	<key>STORAGE_BUCKET</key>
+	<string>firebase-for-flutter-xry.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<true></true>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<false></false>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:380450695418:ios:2693ad5ab6a23cde</string>
+	<key>DATABASE_URL</key>
+	<string>https://fir-for-flutter-xry.firebaseio.com</string>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/packages/firebase_crashlytics/example/ios/Runner.xcodeproj/project.pbxproj b/packages/firebase_crashlytics/example/ios/Runner.xcodeproj/project.pbxproj
new file mode 100644
index 000000000000..40c572dde0ed
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner.xcodeproj/project.pbxproj
@@ -0,0 +1,605 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
+		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
+		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
+		9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
+		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
+		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
+		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
+		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
+		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		C402FAF4F184B60574825BEF /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C402FD7E9DA6F279205D8C27 /* GoogleService-Info.plist */; };
+		F3CD36E5DA207BF24A9BECE5 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 90669E7218FC80716B8D1896 /* libPods-Runner.a */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
+				9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
+		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
+		3483EF1253077C699E331BE4 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
+		76260442B9364E9433AC028C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		90669E7218FC80716B8D1896 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
+		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
+		9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
+		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		C402FD7E9DA6F279205D8C27 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.info; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
+		D14C8104C6F6DBC16421D2F4 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		97C146EB1CF9000F007C117D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
+				3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
+				F3CD36E5DA207BF24A9BECE5 /* libPods-Runner.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		578F13DB49C24452CA02A630 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				76260442B9364E9433AC028C /* Pods-Runner.debug.xcconfig */,
+				D14C8104C6F6DBC16421D2F4 /* Pods-Runner.release.xcconfig */,
+				3483EF1253077C699E331BE4 /* Pods-Runner.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
+		9278C72542532A6D4853596F /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				90669E7218FC80716B8D1896 /* libPods-Runner.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		9740EEB11CF90186004384FC /* Flutter */ = {
+			isa = PBXGroup;
+			children = (
+				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
+				3B80C3931E831B6300D905FE /* App.framework */,
+				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
+				9740EEBA1CF902C7004384FC /* Flutter.framework */,
+				9740EEB21CF90195004384FC /* Debug.xcconfig */,
+				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
+				9740EEB31CF90195004384FC /* Generated.xcconfig */,
+			);
+			name = Flutter;
+			sourceTree = "<group>";
+		};
+		97C146E51CF9000F007C117D = {
+			isa = PBXGroup;
+			children = (
+				9740EEB11CF90186004384FC /* Flutter */,
+				97C146F01CF9000F007C117D /* Runner */,
+				97C146EF1CF9000F007C117D /* Products */,
+				578F13DB49C24452CA02A630 /* Pods */,
+				9278C72542532A6D4853596F /* Frameworks */,
+				C402FD7E9DA6F279205D8C27 /* GoogleService-Info.plist */,
+			);
+			sourceTree = "<group>";
+		};
+		97C146EF1CF9000F007C117D /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				97C146EE1CF9000F007C117D /* Runner.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		97C146F01CF9000F007C117D /* Runner */ = {
+			isa = PBXGroup;
+			children = (
+				7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
+				7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
+				97C146FA1CF9000F007C117D /* Main.storyboard */,
+				97C146FD1CF9000F007C117D /* Assets.xcassets */,
+				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
+				97C147021CF9000F007C117D /* Info.plist */,
+				97C146F11CF9000F007C117D /* Supporting Files */,
+				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
+				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
+			);
+			path = Runner;
+			sourceTree = "<group>";
+		};
+		97C146F11CF9000F007C117D /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				97C146F21CF9000F007C117D /* main.m */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		97C146ED1CF9000F007C117D /* Runner */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
+			buildPhases = (
+				FF93E33FF58D2AD673D0393E /* [CP] Check Pods Manifest.lock */,
+				9740EEB61CF901F6004384FC /* Run Script */,
+				97C146EA1CF9000F007C117D /* Sources */,
+				97C146EB1CF9000F007C117D /* Frameworks */,
+				97C146EC1CF9000F007C117D /* Resources */,
+				9705A1C41CF9048500538489 /* Embed Frameworks */,
+				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				048FD65633588382F9E468AC /* [CP] Embed Pods Frameworks */,
+				324E062721E4156B000CBB4D /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Runner;
+			productName = Runner;
+			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		97C146E61CF9000F007C117D /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0910;
+				ORGANIZATIONNAME = "The Chromium Authors";
+				TargetAttributes = {
+					97C146ED1CF9000F007C117D = {
+						CreatedOnToolsVersion = 7.3.1;
+					};
+				};
+			};
+			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 97C146E51CF9000F007C117D;
+			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				97C146ED1CF9000F007C117D /* Runner */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		97C146EC1CF9000F007C117D /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
+				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
+				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
+				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
+				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
+				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
+				C402FAF4F184B60574825BEF /* GoogleService-Info.plist in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		048FD65633588382F9E468AC /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		324E062721E4156B000CBB4D /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"$(SRCROOT)/newInputFile",
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\"${PODS_ROOT}/Fabric/run\"\n";
+		};
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Thin Binary";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
+		};
+		9740EEB61CF901F6004384FC /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
+		};
+		FF93E33FF58D2AD673D0393E /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		97C146EA1CF9000F007C117D /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */,
+				97C146F31CF9000F007C117D /* main.m in Sources */,
+				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				97C146FB1CF9000F007C117D /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				97C147001CF9000F007C117D /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		249021D3217E4FDB00AE95B9 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Profile;
+		};
+		249021D4217E4FDB00AE95B9 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = S8QB4VV633;
+				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firebase.crashlytics.firebaseCrashlyticsExample;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Profile;
+		};
+		97C147031CF9000F007C117D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		97C147041CF9000F007C117D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		97C147061CF9000F007C117D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firebase.crashlytics.firebaseCrashlyticsExample;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		97C147071CF9000F007C117D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firebase.crashlytics.firebaseCrashlyticsExample;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				97C147031CF9000F007C117D /* Debug */,
+				97C147041CF9000F007C117D /* Release */,
+				249021D3217E4FDB00AE95B9 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				97C147061CF9000F007C117D /* Debug */,
+				97C147071CF9000F007C117D /* Release */,
+				249021D4217E4FDB00AE95B9 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 97C146E61CF9000F007C117D /* Project object */;
+}
diff --git a/packages/firebase_crashlytics/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/firebase_crashlytics/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000000..1d526a16ed0f
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Runner.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/packages/firebase_crashlytics/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/firebase_crashlytics/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
new file mode 100644
index 000000000000..ec99067959e0
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0910"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+               BuildableName = "Runner.app"
+               BlueprintName = "Runner"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-FIRDebugEnabled"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Profile"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/packages/firebase_crashlytics/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/firebase_crashlytics/example/ios/Runner.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000000..21a3cc14c74e
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Runner.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/packages/firebase_crashlytics/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/firebase_crashlytics/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000000..18d981003d68
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/packages/firebase_crashlytics/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/firebase_crashlytics/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000000..949b67898200
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+</dict>
+</plist>
diff --git a/packages/firebase_crashlytics/example/ios/Runner/AppDelegate.h b/packages/firebase_crashlytics/example/ios/Runner/AppDelegate.h
new file mode 100644
index 000000000000..36e21bbf9cf4
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner/AppDelegate.h
@@ -0,0 +1,6 @@
+#import <Flutter/Flutter.h>
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : FlutterAppDelegate
+
+@end
diff --git a/packages/firebase_crashlytics/example/ios/Runner/AppDelegate.m b/packages/firebase_crashlytics/example/ios/Runner/AppDelegate.m
new file mode 100644
index 000000000000..59a72e90be12
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner/AppDelegate.m
@@ -0,0 +1,13 @@
+#include "AppDelegate.h"
+#include "GeneratedPluginRegistrant.h"
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application
+    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+  [GeneratedPluginRegistrant registerWithRegistry:self];
+  // Override point for customization after application launch.
+  return [super application:application didFinishLaunchingWithOptions:launchOptions];
+}
+
+@end
diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 000000000000..d36b1fab2d9d
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,122 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "Icon-App-1024x1024@1x.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d43d11e66f4de3da27ed045ca4fe38ad8b48094
GIT binary patch
literal 11112
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
P-1+_A+?hGkL;m(J7kc&K

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..28c6bf03016f6c994b70f38d1b7346e5831b531f
GIT binary patch
literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$?ny*JR5%f>l)FnDQ543{x%ZCiu33$Wg!pQFfT_}?5Q|_VSlIbLC`dpoMXL}9
zHfd9&47Mo(7D231gb+kjFxZHS4-m~7WurTH&doVX2KI5sU4v(sJ1@T9eCIKPjsqSr
z)C01LsCxk=72-vXmX}CQD#BD;Cthymh&~=f$Q8nn0J<}ZrusBy4PvRNE}+1ceuj8u
z0mW5k8fmgeLnTbWHGwfKA3@PdZxhn|PypR&^p?weGftrtCbjF#+zk_5BJh7;0`#Wr
zgDpM_;Ax{jO##IrT`Oz;MvfwGfV$zD#c2xckpcXC6oou4ML~ezCc2EtnsQTB4tWNg
z?4bkf;hG7IMfhgNI(FV5Gs4|*GyMTIY0$B=_*mso9<WQhydS~rpwVfTyjm}~vs+Nj
zL2;<v%s@b+9jXc@S}#x@@VwF4twVwRxFCih^tWg?H)v?24ZSeYC3aaOsM8yWc7GEz
z7zKYq3)^d7srCATzmw!h1d8POV>Ityq$m^S>15>-?0(zQ<8Qy<_TjHE33(?_M8oaM
zyc;NxzRVK@DL6RJnX%U^xW0Gpg(lXp(!uK1v0YgHjs^ZXSQ|m#lV<y2`lV{mrphLz
zZs5NcIN~Wp-YgL)o*yksN!%A$BK4ovtf60)eD^OF((VmRH^fQ+0000<MNUMnLSTXr
Cg!*^@

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ccbfd967d9697cd4b83225558af2911e9571c9b
GIT binary patch
literal 1283
zcmV+e1^oJnP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T7000EaNkl<Zc$~$U
zO>7ip7{`C_J2Tx<S}3NqpxB^%g)f1Fg2os<-~kDV#FGRs+&p_AidZnjqZ&0H2nR1*
zj0q8l5fTo51w)j?(&7h*nm|&p(vR)ByR$QY4>Pmfw%h$|%acrYHt)Re^PB%O&&=~a
zhS(%I#+V>J-vjIib^<+s%ludY7y^C(P8nmqn9fp!i+?vr`bziDE=bx`%2W#Xyrj|i
z!XQ4v1%L`m{7KT7q+LZNB^h8Ha2e=`Wp65^0;J00)_^G=au=8Yo;1b`CV&@#=jIBo
zjN^JNVfYSs)+kDdGe7`1&8!?MQYKS?D<dJ!G*SVsfpkGU(q>uHZf3iogk_%#9E|5S
zWeHrmAo>P;ejX7mwq#*}W25m^ZI+{(Z8fI?4jM_fffY0nok=+88^|*_DwcW>mR#e+
z<Ez>X$F_KMdb6sRz!~7KkyN0G(3XQ+;z3X%PZ4gh;n-%62U<*VUKNv(D&<?Pa8X$2
z7!Cm2JRI`|2MxYb7DBni>Q->Na@Xb&u5Q3`3DGf+a8O5x7c#7+R+EAYl@R5us)CIw
z7sT@_y~Ao@uL#&^LIh&QceqiT^+lb0YbFZt_SHOtWA%mgPEKVNvVgCsXy{5+zl*X8
zCJe)Q@y>wH^>l4;h1l^Y*9%-23TSmE>q5nI@?mt%n;Sj4Qq`Z+ib)a*a^cJc%E9^J
zB;4s+K@rARbcBLT5P=@r;IVnBMKvT*)ew*R;&8vu%?Z&S>s?8?)3*YawM0P4!q$Kv
zMmKh3lgE~&w&v%wVzH3Oe=jeNT=n@Y6J6TdHWTjXfX~-=1A1Bw`EW8rn}MqeI34nh
zexFeA?&C3B2(E?0{drE@DA2pu(A#ElY&6el60Rn|Qpn-FkfQ8M93AfWIr)drgDFEU
zghdWK)^71EWCP(@(=c4kfH1Y(4iugD4fve6;nSUpLT%!)MUHs1!zJYy4y||C+SwQ!
z)KM&$7_tyM`sljP2fz6&Z;jxRn{Wup8IOUx8D4uh&(=<hAE@CMcU{$tA%YXI_aT>O
zx-7$a;U><*5L^!%<hgO?EU&+RjyvO7JjW1(jTP<<mHfpWO->xRlw)vAbh;sdlR||&
ze}8_8%)c2Fwy=F&H|LM+p{pZB5DKTx>Y?F1N%BlZkXf!}JeGuMZk~LPi7{cidvUGB
zAJ4LVeNV%XO>LTrklB#^-;8nb;}6l;1oW&WS=Mz*Az!4cqqQzbOSFq`$Q%PfD7srM
zpKgP-D_0XPTRX*hAqeq0TDkJ;5HB1%$3Np)99#1<DGLlIe;R_chCpIPcPAH*zr@Cs
z?fB^|EuMpG4X$HBVo_%sSAM_4?&DuFlF8#(Lxtca1NV%iv%qemMnJ<G_#|w%M>6c{
zJImlNL(np<oN+CTXIZs=Ip^Qn&FbY#Fn}>L!W|Gr_kxl1GVmF5&^$^YherS7+~q$p
zt}{a=*RiD2Ikv6o=IM1kgc7zqpaZ;OB)P!1zz*i3{U()Dq#jG)egvK}@uFLa`oyWZ
zf~=MV)|yJn`M^$N%ul5);JuQvaU1r2wt(}J_Qgyy`qWQI`hEeRX0uC@c1(dQ2}=U$
tNIIaX+dr)NRWXcxoR{>fqI{SF_dm1Ylv~=3YHI)h002ovPDHLkV1g(pWS;;4

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f091b6b0bca859a3f474b03065bef75ba58a9e4c
GIT binary patch
literal 1588
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

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cde12118dda48d71e01fcb589a74d069c5d7cb5
GIT binary patch
literal 1025
zcmV+c1pfPpP)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB000BXNkl<Zc$~GD
zO=w(I6vuz}zV|Yjbed17ZK+8~s#O|MP&clmqDBgWZmLq<SX}r4y4TvKx^iJf5Gq-y
zOGQEjOCyP3MX4X5l~PNgieUPsktUPGBs1^bzl-}OnIxT=SE~o^V(z=|{La^$dmfUE
zBm*GnK}km>U6E9hRK9^#O7(mu>ETqrXGsduA8$)?`v2seloOCza43C{NQ$$<lg6i9
zl}<@|7r;n*02l>gAOH**MCn0Q?+L7dl7qnbRdqZ8LSVp1ItDxhxD?t@5_yHg6A8yI
zC*%Wgg22K|8E#!~c<Gji=2TnCP5=vx8A($>TNYR~@Y9Kep<iQi*1HiJn2AMS!E&HK
zVnfa>MPrrB8cABapAFa=`H+UGhkXUZV1GnwR1*lPyZ;*K(i~2gp|@bzp8}og7e*#%
zEnr|^CWdVV!-4*Y_7rFvlww2Ze+>j*!Z!pQ?2l->4q#nqRu9`ELo6RMS5=br47g_X
zRw}P9a7RRYQ%2Vsd0Me{_(EggTnuN6j=-?uFS6j^u69elMypu?t>op*wBx<=Wx8?(
ztpe^(fwM6jJX7M-l*k3kEpWOl_Vk3@(_w4oc}4YF<H6foEqi-Iie=wvW~+c5O@{fz
z15Zzj&L+qQPza&y;JLn#y}co!t)163;kCwx>4|Rt=<qKwceYzzPl3~A@%(s+$wlbO
zc~D^BY8jsH33#eIY*@)P+hFCz&o3t2+iBU*?19gIU*g-zge@(Wn_CP4Vk(AbwubEK
z374wAp49EV)x|L}FJ3uW;>2V^XU?#Yz`8(e?aZ@#li0n*=g^qOcVpd-Wbok=@b#Yw
zqn8u9a)z>l(1<yk<F_A9G0?W)jg&H7#tqwGWPN2m*&Q-?N5mfsA}|J<Z(-)UuQ+*R
zjGb?c@Yn1jfi)zqX5f~c$$GU_a(w7qiMP%R9Utb>kEaPYZ6hwubN6i<8QHgsu0oE)
ziJ(p;Wxm>sf!K+cw>R-(^Y2_bahB+&KI9y^);#0qt}t-$C|Bo71lHi{_+lg#f%RFy
z0um=e3$K3i6K{U_4K!EX<i!R0Z{NtsYrELo(c*J#)_6Q;B#i<)$v7hkaB2AVeLT(w
zU;Ip%kGwHqz-)1z`*v*RqZjUHU2}-Rka8<C(s3i{5#T7-ISo1qYYdC!WW~O<hQAkM
zTAD(la4CD$)8M0iM>?F&rExl^W|G8Z8;`5z-k}OGNZ0#WVb$WCpQu-_YsiqKP?BB#
vzVHS-CTUF4Ozn5G+mq_~Qqto~ahA+K`|lyv3(-e}00000NkvXXu0mjfd`9t{

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0ef06e7edb86cdfe0d15b4b0d98334a86163658
GIT binary patch
literal 1716
zcmds$`#;kQ7{|XelZftyR5~xW7?MLxS4^|Hw3&P7^y)@A9Fj{Xm1~_CIV^XZ%SLBn
zA;!r`GqGHg=7>xrB{?psZQs88ZaedDoagm^KF{a*>G|dJWRSe^I$DNW008I^+;Kjt
z>9p3GNR^I;v>5_`+91i(*G;u5|L+Bu6M=(afLjtkya#yZ175|z$pU~>2#^Z_pCZ7o
z1c6UNcv2B3?;<Go5WWQn|6+uH2_m2r5lB}%5TZuPR`V-CQi_n2Vq{<`GLVi8qN@j#
zqI`={L3C8G3I^(@3RHBhE;&c<RtGw!0)4Fxo!p8}d#c|cHc-(hHf$6dbHN{)B&J-6
z8CPP?l~^=?vruV^WG`2|w?$&vBC(2KTgB8_sZ6T`6J3jmsl%uYPl@SJV)#nyIF2<>
zX%qdxCXQp<sXX*V>dKRz=#b*q0P%b&o)5ZrNZt7$fiETSK_VaY=mb4GK`#~0K#~9^
zcY!`#Af+4h?UMR-gMKOmpuYeN5P*RKF!(tb`)oe0j2B<k6JOOEKm0v@7`o2xzafNf
z3ZX<HM12iqsu+Xris0NgGTIwip-5ILf*5aQWp8EWDyC!=Q!?hXjP-1SH7#S$$T+=I
zoW3be|GWDB>H1l?=>y#S5pMqkx6i{*=V9JF%>N8`ewGhRE(|WohnD59R^$_36{4>S
zDFlPC5|k?;SPsDo87!B{6*7eqmMdU|QZ84>6)Kd9wNfh90=y=TFQay-0__>=<4pk&
zYDjgIhL-jQ9o>z32K)BgAH+HxamL{ZL~ozu)Qqe@a`FpH=oQRA8=L-m-1dam(Ix2V
z?du;LdMO+ooBelr^_y4<euq@26~q7NegFU@k$`jdb$`xyeJ4P8+-Tj3Ra{hbRCmT!
zBMV($^{^e=(UH`dj`r@`Y(H|el`alrd8skZwkzYhRr(Gz(QZp(Qd(hE^@5E~qU`i;
z(SkYe?}g2Y&YJj296Moad2)yG0fTMR6U}BWMARc(<#Fztb!h_|mPqTik`s(WVh&f0
z?pxZ)BEP>{|44tmgH^2hSzPFd;U^!1p>6d|o)<M!d`#7E^t}^Xk~3cs-?nsZx|T{j
zmy5ZGo@mfoIbG>(-01z{i&Kj@)z-yfWQ)V#3Uo!_U}q3u`(fOs`_f^ueFii1xBNUB
z6Me<Ad__=MhyIK(Twff~+;!n_S-82~DqfzFOPkl&Gp}(|cUQyE@haMbYi+pu2R#52
zQ(?79{^}u<pnJs07X?Jd1xEs{hF)^P@+6Hdd>cwJN$CqV&vhc+)b(p4NzGGEgwWNs
z@*lUV6LaduZH)4_g!cE<2G6#+hJrWd5(|p1Z;YJ7ifVHv+n49btR}dq?HHDjl{m$T
z!jLZcGkb&XS2OG~u%&R$(X+Z`CWec%QKt>NGYvd5g20)PU(dOn^7%@6kQb}C(%=vr
z{?RP(z~C9DPnL{q^@pVw@|Vx~@3v!9dCaBtbh2EdtoNHm4kGxp>i#ct)7p|$QJs+U
z-a3qtcPvhihub?wnJqEt>zC@)2suY?%-96cYCm$Q8R%-8$PZYsx3~QOLMDf(piXMm
zB=<63yQk1AdOz#-qsEDX>>c)EES%$owHKue;?B3)8aRd}m~_)>SL3h2(9X;|+2#7X
z+#2)NpD%qJvCQ0a-uzZLmz*ms+l*N}w)3LRQ*6>|Ub-fyptY(keUxw+)jfwF5K{L9
z|Cl_w=`!l_o><384d&?)$6Nh(GAm=4p_;{qVn#hI8lqewW7~wUlyBM-4Z|)cZr?Rh
z=xZ&Ol>4(CU85ea(CZ^aO@2N18K>ftl8>2MqetAR53_JA>Fal`^)1Y--Am~UDa4th
zKfCYpcXky$XSFDWBMIl(q=Mxj$iMBX=|<EP6d-<IdS!f=-N7pvgRfUm7gq{u46xo{
z(betbRXvB#X1rgdf*#8+ETp0)ap9@+(t?IGTzEX?@U7?cr16G3E(5=(NmSno5Zt_R
J4_(fr{s-Hn_EP`=

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcdc2306c28505ebc0b6c3a359c4d252bf626b9f
GIT binary patch
literal 1920
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
GLSTY{`iRf~

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ccbfd967d9697cd4b83225558af2911e9571c9b
GIT binary patch
literal 1283
zcmV+e1^oJnP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T7000EaNkl<Zc$~$U
zO>7ip7{`C_J2Tx<S}3NqpxB^%g)f1Fg2os<-~kDV#FGRs+&p_AidZnjqZ&0H2nR1*
zj0q8l5fTo51w)j?(&7h*nm|&p(vR)ByR$QY4>Pmfw%h$|%acrYHt)Re^PB%O&&=~a
zhS(%I#+V>J-vjIib^<+s%ludY7y^C(P8nmqn9fp!i+?vr`bziDE=bx`%2W#Xyrj|i
z!XQ4v1%L`m{7KT7q+LZNB^h8Ha2e=`Wp65^0;J00)_^G=au=8Yo;1b`CV&@#=jIBo
zjN^JNVfYSs)+kDdGe7`1&8!?MQYKS?D<dJ!G*SVsfpkGU(q>uHZf3iogk_%#9E|5S
zWeHrmAo>P;ejX7mwq#*}W25m^ZI+{(Z8fI?4jM_fffY0nok=+88^|*_DwcW>mR#e+
z<Ez>X$F_KMdb6sRz!~7KkyN0G(3XQ+;z3X%PZ4gh;n-%62U<*VUKNv(D&<?Pa8X$2
z7!Cm2JRI`|2MxYb7DBni>Q->Na@Xb&u5Q3`3DGf+a8O5x7c#7+R+EAYl@R5us)CIw
z7sT@_y~Ao@uL#&^LIh&QceqiT^+lb0YbFZt_SHOtWA%mgPEKVNvVgCsXy{5+zl*X8
zCJe)Q@y>wH^>l4;h1l^Y*9%-23TSmE>q5nI@?mt%n;Sj4Qq`Z+ib)a*a^cJc%E9^J
zB;4s+K@rARbcBLT5P=@r;IVnBMKvT*)ew*R;&8vu%?Z&S>s?8?)3*YawM0P4!q$Kv
zMmKh3lgE~&w&v%wVzH3Oe=jeNT=n@Y6J6TdHWTjXfX~-=1A1Bw`EW8rn}MqeI34nh
zexFeA?&C3B2(E?0{drE@DA2pu(A#ElY&6el60Rn|Qpn-FkfQ8M93AfWIr)drgDFEU
zghdWK)^71EWCP(@(=c4kfH1Y(4iugD4fve6;nSUpLT%!)MUHs1!zJYy4y||C+SwQ!
z)KM&$7_tyM`sljP2fz6&Z;jxRn{Wup8IOUx8D4uh&(=<hAE@CMcU{$tA%YXI_aT>O
zx-7$a;U><*5L^!%<hgO?EU&+RjyvO7JjW1(jTP<<mHfpWO->xRlw)vAbh;sdlR||&
ze}8_8%)c2Fwy=F&H|LM+p{pZB5DKTx>Y?F1N%BlZkXf!}JeGuMZk~LPi7{cidvUGB
zAJ4LVeNV%XO>LTrklB#^-;8nb;}6l;1oW&WS=Mz*Az!4cqqQzbOSFq`$Q%PfD7srM
zpKgP-D_0XPTRX*hAqeq0TDkJ;5HB1%$3Np)99#1<DGLlIe;R_chCpIPcPAH*zr@Cs
z?fB^|EuMpG4X$HBVo_%sSAM_4?&DuFlF8#(Lxtca1NV%iv%qemMnJ<G_#|w%M>6c{
zJImlNL(np<oN+CTXIZs=Ip^Qn&FbY#Fn}>L!W|Gr_kxl1GVmF5&^$^YherS7+~q$p
zt}{a=*RiD2Ikv6o=IM1kgc7zqpaZ;OB)P!1zz*i3{U()Dq#jG)egvK}@uFLa`oyWZ
zf~=MV)|yJn`M^$N%ul5);JuQvaU1r2wt(}J_Qgyy`qWQI`hEeRX0uC@c1(dQ2}=U$
tNIIaX+dr)NRWXcxoR{>fqI{SF_dm1Ylv~=3YHI)h002ovPDHLkV1g(pWS;;4

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8f9ed8f5cee1c98386d13b17e89f719e83555b2
GIT binary patch
literal 1895
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

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6d6b8609df07bf62e5100a53a01510388bd2b22
GIT binary patch
literal 2665
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
XsPq=LnkwKG00000NkvXXu0mjfhAk5^

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6d6b8609df07bf62e5100a53a01510388bd2b22
GIT binary patch
literal 2665
zcmV-v3YPVWP)<h;3K|Lk000e1NJLTq004LZ004Lh1^@s6Ib=4{000UwNkl<Zc-rlq
zYm5|C7RRe*0FADziHUDrU-1=;kC>oFh3q0MFesq&64WThn3$;G69TfjsAv=f2G9}p
zgSx99+!Y<vIH1Geh#8IOh)*#1HYf~_d31O6R2|Q)y0`mwP4_U<^}M(4N&cy3hVJUQ
zzy6<d?!BEVO)E11Kt~NDN7v6rqHaJfM>V6qME!>9MD13x)k(+XE7W?_O4LoLb5ND8
zaV{9+P@>42xDfRiYBMSgD$0!vssptcb;&?u9u(LLBKmkZ>RMD=kvD3h`sk6!QYtBa
ztlZI#nu$8lJ^q2Z79UTgZe>B<XqJPiqP$?hv#xRc0#zTFn@Js@#}iPmawjhJ$y4D^
zFn6<9i#nBO;uWmUJ}r2hg4&_LMh?1@xtXvjy8&~-oy(mptHwLB;NAQXSC@4!aF;6A
z#;#5?(5uUGGFNk#(HAmQ^Ax)<=<&HB&6hd2^Ib2bBEFCx9aQ7RrR8Z{y;aT?1M+nP
zPN7(_rc<Ha+#-bvF=}!T>U73(Aospiq+?SdMt8lDZ;*?@tyWVZVS_Q7S&*tJaiRlJ
z+aSMOmbg3@h5}v;A*c8SbqM3icg-`Cnwl;7Ts%A1RkNIp+Txl-Ckkvg4oxrq<vjr@
zjsDtgSYVi;xOhA2fZV(oAB^VyL!weLiH5CNn6W7XH??Qr#sGBlM;WO7APoz@Fl^WX
zr)y@=D!$2D1^F$%M8Gxa2rv6K3*%bSFzx*`Oz}}u>GA5ewEg<CHfLauVTDl=*xJR5
z3@&S~65(Js-0?X0#9h^G{;LjOcVcTA?*23bJ=xIeJv+s(sJ{}xqmq)EdALgn+zk#~
z;xfNQ;7-8TzYF1ZQ@ExT>YqwtECD<_3Egu)xGllKt&J8g&+=ac@Jq4-?w6M3b*>w5
z69N3O%=I^6&UL5gZ!}trC7bUj*12xLdkNs~Bz4QdJJ*UDZox2UGR}SNg@lmOvhCc~
z*f_UeXv(=#I#*7>VZx2ObEN~UoGUTl=-@)E;YtCRZ>SVp$p9yG5hEFZ!`wI!spd)n
zSk+vK0Vin7FL{7f&6OB%f;SH22dtbcF<|9fi2<wSM~MNeEkB6?E9XiKSZ(=93|Ki=
zV!&$oQDVSq%THp!Y7s+Xz-r4+V!*2AN(@+S`AG~|)m(`ItBnJR0W0T93^?x2W$!Nx
zNe4LY%a4|Fus<tQaoqA_zbBVA+PvF@&-a+n5s<d*HKBc%nR{=-1CG0M+3)un7R=t9
zfq&xjuh^J|$pMI5PHFVJDOmE2VP6o<vIGarzyD=1cJ4m>Fp%q4kxL!b1#l^)8dUwJ
zwEf{(wJj@8iYDVnKB<p?ZP?C=qjPz<LB2oIP_EpX&7Ip49Wc90AGz=sxd7P24URkF
zFcsp{vJH2G+;9U=(Zt1bI~*7L3E2zWeMU&mZHXRk;7t~ZRG+_)eQ|E9{LT$!nq+d2
z=X5xos+WQFRC5#N+|U*}*Z_NVvZu71O`dZ@U8*c}vSB-UD3I$!fZGy3xS?(~@J=2I
zWG~JoS6IK}lMGBsDBRGu3y11tFV5}ESWwlPf{}0a+KUZA!d($lxS<0s=HyZ}xz;1x
z$>`eSU+;ml-t2`@%_)0jDM`+a46xhDbBj2+&Ih>1A>6aky#(-SYyE{R3f#y57wfLs
z6w1p~$bp;6!9DX$M+J~S@D6vJAaElETnsX4h9<T8<6H*UPsnkd3dI(%8!`cV`zQW6
zcR<Jzr{!1y=9e{zYrC?Ab=s?Q{eUc@b7KXVhwOgrhjYC^7S*}21I)l$0XerE$Ray8
zmVjX>a5tvPhC3L@qB~bOz<xP*Fpz5`aIR2*+2E3U|CLj72M@UyYTHsc&rQLKt%mS$
zg#gUz@{W{+DKiCsd!yG^xIE<3*Y?1<>kL@^z0<?@S>k_hS{T4PF*TDrgdXp+dzsE?
z>V|VR035Pl9n5&-RePFdS{7KAr2vPOqR9=M$vXA1Yy5>w;EsF`;OK{2pkn-kpp9Pw
z)r;5JfJKKaT$4q<t?4J^Jlyv{yL<uY)lb8S>Cb{TaXHjb$QA{y0EYy*+b1XI;6Ah-
zw13P)xT`>~eFoJC!>{2XL(a_#upp3gaR1#5+L(Jmzp4TBnx{~WHedpJ1ch8JFk~Sw
z>F+gN+i+VD?gMXwcIhn8rz`>e>J^TI3E-MW>f}6R-pL}>WMOa0k#jN+`RyUVUC;#D
zg|~oS^$6%wpF{^Qr+}X>0PKcr3Fc&>Z>uv@C);pwDs<Gm|AThk4A95j5BlUq=-|Z^
z@JbGFA>@2bZWhYP!rvGx?_|q{d`t<*XEb#=aOb=N+L@C<AA_lRJOZBdFz8o40s6G1
zn5HRU4s0>VBGqImZf&<eC+Fba_cCZFj{$wu4WN&{1N5<TK%cnKaj*@yu_Rn~x~>+a
zCQEa3$~@#kC);pasdG=f6tuIi0PO-y&tvX%>Mv=oY<R2p3%7r|j=z(oy1lG>3U$nD
zJ#gMegnQ46pq+3r=;zmgcG+zRc9D~c>z+jo9&D+`E6$LmyFqlmCYw;-Zooma{sR@~
z)_^|YL1&&@|GXo*pivH7k!msl+$Sew3%XJnxajt0K%3M6Bd&YFNy9}tWG^aovK2eX
z1aL1%7;KRDrA@eG-Wr6w+;*H_VD~qLiVI`{_;>o)k`{8xa3EJT1O_>#iy_?va0eR?
zDV=N<fjm8U$PsTfvXgEnfd5DT(Fc-7R8Ed?tC5*?9RWOFcEBZ_9C%HRth;6`A18pv
z%36b?gdFi!BRkPl0{BqWuL^Pikf#?mUXHA=;C7;p)JWii|I%M%Apy~^CgVK0vVL_4
z-L-SxfEo8umQ5N9V&x>%;Zjb%Z2s$@O>w@iqt!I}tLjGk!=p`D23I}N4Be@$(|iSA
zf3Ih7b<{zqpDB4WF_5X1(peKe+rASze%u8eKLn#KKXt;UZ+Adf$_TO+vTqshLLJ5c
z52HucO=lrNVae5XWOLm!V@n-ObU11!b+DN<$RuU+YsrBq*lYT;?AwJpmNKniF0Q1<
zJCo>Q$=v$@&y=sj6{r!Y&y&`0$<R(v2Y-h;n6lJ0J~$VTqEE;sVO}glh2h-$_kQkm
zL1qotJ@g5N8o$^FW3-TGSTZ=sFDb~vz+J=G^-Ik~0F!!Li5iZ2M?sD~+%~$7QL$gR
z9OMcLniTA2?gdp%jvw5^7&C1s!JdG}15ht>-I}S!H_~pI&2H8Z1C|BX4VgZ^-!<n_
zZjPo?Cb6g(qjDkZoSVts@s|p8WMH?Us`xUh`4!we`7dO(1ht1daUbNjsZ@A}+UEk>
zje3-;x0PBD!M`v*J_)rL^+$<1VJhH*2Fi~aA7s<M0d-n220=mAU7(LZ-At!cdlWCv
zu@AK#bt~#<9;~k^d5}}7VXmK@h?<Ui3iTm4-?>&@_rUHYJ9zD=M%4AFQ`}k8OC$9s
XsPq=LnkwKG00000NkvXXu0mjfhAk5^

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..75b2d164a5a98e212cca15ea7bf2ab5de5108680
GIT binary patch
literal 3831
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

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4df70d39da7941ef3f6dcb7f06a192d8dcb308d
GIT binary patch
literal 1888
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
aR{jt9+;fr}hV%pg0000<MNUMnLSTYU=Zg*i

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a84f41e14e27f4b11f16f9ee39279ac98f8d5ac
GIT binary patch
literal 3294
zcmV<43?cK0P)<h;3K|Lk000e1NJLTq005W(005W>1^@s67{VYS000c7Nkl<Zc-rlq
zd5~1q6~^Cdw&b4x6|JN&(JB%b90i05MIb{MfdDfE24;g{F+?IUlo};s83Q4>QEG_j
zup^)eW&WUIAp<jE5oC3Yi3uU4siGi=fCvUFINd$d%gMR@?rrY$yzc4c^;_;cr|P4-
z2Wt9t-`{-ad*@xIHO=AzfB>qy$=APz8jE@awGp)!bsTjDbrJO`$x^ZR^dr;>)LW>{
zs70vpsD38v)19rI=GNk1b(0?Js9~rjsQsu*K;@SD40RB-3^gKU-MYC7G!Bw{fZsqp
zih4iIi;Hr_xZ<RuO1#hFeUF>033Iu{sQxLS=}yBXgLMn40d++>aQ0#%8D1EbGZp7+
z5=mK?t31BkVYbGOxE9`i74<yo3+X^3{HKP>8x`YgCMwL$qMsChbSGSE1`p{nSmadR
zcQ#R<pyt`;X5#D+Z~LHrPhcqxn(SzQLVaCkpqOwCL46<vc4~$G0PR1h(xN~n!BxqF
zAfymZrFMz6ZbQwo6fy~}AEk^MsQh;#AY#yimOv)KHCK8PYKe3b!0P7(K_-nMDkayV
zAWtRdvU~D^OoD4DDoD;nmBz`KM&~rb;6pX0zNk}_xu`N^GFEI>)(?!~dmtD0+D2!K
zR9%!Xp1oOJzm(vbLvT^$IKp@+W2=-}<Mm){t)bjSl}jFD^U<5qwo1vp){uKq<=HC#
zXzF6zxfpr3q1vJ2P>qTzTgVtQ!#Y7Gxz}stUIm<1;oBQ^Sh2X{F4ibaOOx;5ZGSNK
z0maF^@(UtV$=p6DX<Tsaa?sP{UipC~;5zVW6t<s>LgRURwF95C=|U8?osGhgOED*b
z7woJ_PWXBD>V-NjQAm{~T%sjyJ{5tn2f{G%?J!KRSrrGvQ1(^`YLA5B!~eycY(e5_
z*%aa{at13SxC(=7JT7$IQF~R3sy`Nn%EMv!$-8ZEAryB*yB1k&stni)=)8-ODo41g
zkJu~roIgAih94tb=YsL%iH5@^b~kU9M-=aqgXIrbtxMpFy5mekFm#edF9z7RQ6V}R
zBIhbXs~pMzt0VWy1Fi$^fh+1xxLDoK09&5&MJl(q#THjPm(0=z2H2Yfm^a&E)V+a5
zbi>08u;bJsDRUKR9(INSc7XyuWv(JsD+BB*0hS)FO&l&7MdViuur@-<-EHw>kHRGY
zqoT}3fDv2-m{NhBG8X}+rgOEZ;amh*DqN?jEfQdqxd<??!bO>j08`Sr=C-KmT)qU1
z+9Cl)a1mgXxhQiHVB}l`m;-RpmKy?0*|yl?FXvJkFxuu!fKlcmz$kN(a}i*saM3nr
z0!;a~_%Xqy24IxA2rz<+08=B-Q|2PT)O4;EaxP^6qixOv7-cRh?*T?zZU`{nIM-at
zT<QQuZIJ*YxTw4b7-cR3jGT+gdw|iF8v@KfZIR9v)d7sQITK)%xv0Dcm`a%|?h+AT
zCUALun{%9;&Ru}1w9Q$(jw|hPIE&xoJnEdyIv<KBj{l?9xT{=DBe)97Tmr^_T!}&b
zv9`qbWiDKE#6H#X4=0^;FbvHXq8;8}-vOp7T<m*JIb<w&m5r+5ucsW}$ENd9*R^X$
z08=4zCE@zqfNSbu`(KN2unO*6ZXBs-cEc5k0jxV2Nql&^SBI#n&gCRr<p@`kOW|?^
zurLDl#PRk7VAGF!xGj=%xf3u}?FiYgPqf1X8zEB-F1I_E;~A{YM#xmlT;(2cF2~0d
zsgM=xOwx*N&Xl=4I%qAnlNDnW;S^le9)!ykmx_u7nM!cgcoZ(j0V@_{DrPP(!sQCU
ztj=UsI@j^fsVyo2m{m?@rE|S=IhFux8e42~F7E?Y=$y=o34MhB`=bcgtviD-s5zLt
za7}P209d~5(hBEF!gVPI19k=B76j}zydC=IVDh4J6~X0wz;cDmip-S?*UgPVC}|49
z?Hn{aAX5=8*8-MpCbQJJE_1jLs5=lYcAv=($mBrZtPotT1}sx1tFpW;Mw4)rNN|}!
zR&6n4syde^088g&^~Va|=G>KYWr9rJ=tppQ9I#Z#mLg<j`$I5Kf-6=iT#e?=l?`N7
z1ef;#OKq1c{@o5|S}lTWXLfK|*)CNXqACTL3|YFzR%NbYI++)@-1r7C0Tpwt{Nc(j
za}~qM{L&UZ4Ol*923JV|aOLA<UfSkNfVlv!Tp;tKbNK==tJ`8%kPX@0d4%D&%;g)v
z?1C#(Cad<bb14m2tjKM#Ysf+gxT+2XVdC2%-@>INVB!pO-^FOcvFw6NhV0gztuO?g
ztoA*C-52Q-Z<PdW{$JYQx;I*3aI>-P#xB4HAY3KQVd%dz1S4PA3vHp0aa=zAO?FCt
zC_GaTyVBg2F!bBr3U@Zy2iJgIAt>1sf$JWA9kh{;L+P*HfUBX1Zy{4MgNbDfBV_ly
z!y#+753arsZUt@366jIC0klaC@ckuk!qu=pAyf7&QmiBUT^L1&tOHzsK)4n|pmrVT
zs2($4=?s~VejTFHbFdDOwG;_58LkIj1Fh@{glkO#F1>a==ymJS$z;gdedT1zPx4Kj
ztjS`y_C}%af-RtpehdQDt3a<=W5C4$)9W@QAse;WUry$WYmr51ml9lkeunUrE`-3e
zmq1SgSOPNEE-Mf+AGJ$g0M;3@w!$Ej;hMh=v=I+Lpz^n%Pg^MgwyqOkNyu2c^of)C
z1~ALor3}}+RiF*K4+4{(1%1j3pif1>sv0r^mTZ?5Jd-It!tfPfiG_p$AY*Vfak%FG
z4z#;wLtw&E&?}w+eKG^=#jF7HQzr8rV0mY<1YAJ_uGz~$E13p?F^fPSzXSn$8UcI$
z8er9{5w5iv0qf8%70zV71T1IBB<JcqV;N}Q8V7;W1)!Jx0`wm&2ECjC_8jPyD-f`k
zIAH72g4GGK3U!^#w}5qkEGo^(nlfZA2G@<>1N}R5Kp%NO0=5wJalZt8;xYp;b{1K)
zHY>2wW-`Sl{=NpR%iu3(u6l&)rc%%cSA#aV7WCowf<F2Ybgw53uo8~7k!wTlknwgo
zN*=~4;AFlBtP^AjCkw)zyEt6?Vn$p1=5WvlP62ID6=)-VieNouw8H5K)bv;Kf+}sh
zR49`XVCkG}M+gS(i$L$X#n=`{g8tomK^yzH5#$+AGd3G=SpZhrIhg_@3<AtFlf@CT
zAOvccLtyA^BfK-1>bFR4wcc{LQZv~o1u_`}EJA3>ki`?9CKYTA!rhO)if*zRdd}Kn
zEPfYbhoVE~!FI_2YbC5qAj1kq;xP6%J8+?2PAs?`V3}nyFVD#sV3+uP`pi}{$l9U^
zSz}_M9f7Rg<l3co+GUsl_8|e51!T(%$a*>nnRhaoIJgT8us!1aB&4!*vYF07Hp&}L
zCRlop0oK4DL<uLCL*|`pmx86&8DR6s!91AB+`au;0QMLI>@ISz{2_BPlezc;xj2|I
z23RlDNpi9LgTG_#(w%cMaS)%N`e>~1&a3<{Xy}>?WbF>OOLuO+j&hc^YohQ$4F&ze
z+hwnro1puQjnKm;vFG~o>`kCeUIlkA-2tI?WBKCFLMBY=J{hpSsQ=PDtU$=duS_hq
zHpymHt^uuV1q@uc4bFb{MdG*|VoW@15Osrqt2@8ll0qO=j*u<bco^zd?1dRC_rdfR
z?Nc3UR>OXn{M0UJX#SUztui9FN4)K3{9!y8PC-A<A6xSL)bYdw*}T}D0KYvzSuB6Z
zqOrK+au9YA?*GnAOE9G+t<1O`Lx52g=w3B4Q!-@2#r6<nRC&VnF5{?!dzrY{Kpxhj
zbVf;)BVeVb?qvemayp}=%HhnB)rO34@xRo0K>HHvpVTU;x|-7P+taAtyglk#rjlH2
z5Gq8ik}BPaGiM{#Woyg;*&N9R2{J0V+WGB69cEtH7F?U~Kbi6ksi*`CFXsi931q7Y
zGO82?whBhN%w1iDetv%~wM*Y;E^)@Vl?VDj-f*RX>{;o_=$fU!&KAXbuadYZ46Zbg
z&6jMF=49$uL^73y;;N5jaHYv)BTyfh&`qVLYn?`o6BCA_z-0niZz=qPG!vonK3MW_
zo$V96zM!+kJRs{P-5-rQVse0VBH*n6A58)4uc&gfHMa{gIhV2fGf{st>E8sKyP-<W
z(I>$8zp~wJX^A<y89SItR3oY_%?pYVaE<|$uDh_W?MBt1dOGG>*@DI&-;8>gANXZj
zU)R+Y)PB?=)a|Kj>8NXEu^S_h^7R`~Q&7*Kn!xyvzVv&^>?^iu;S~R2e-2fJx-oUb
cX)(b1KSk$M<O5+z9{>OV07*qoM6N<$f&<qXM*si-

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e1f58536026aebc4f1f70e481f6993c9ff088d
GIT binary patch
literal 3612
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

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
new file mode 100644
index 000000000000..0bedcf2fd467
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchImage.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchImage@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchImage@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
new file mode 100644
index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838
GIT binary patch
literal 68
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J
Q1PU{Fy85}Sb4q9e0B4a5jsO4v

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838
GIT binary patch
literal 68
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J
Q1PU{Fy85}Sb4q9e0B4a5jsO4v

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838
GIT binary patch
literal 68
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J
Q1PU{Fy85}Sb4q9e0B4a5jsO4v

literal 0
HcmV?d00001

diff --git a/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
new file mode 100644
index 000000000000..89c2725b70f1
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
@@ -0,0 +1,5 @@
+# Launch Screen Assets
+
+You can customize the launch screen with your own desired assets by replacing the image files in this directory.
+
+You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
\ No newline at end of file
diff --git a/packages/firebase_crashlytics/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/firebase_crashlytics/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
new file mode 100644
index 000000000000..f2e259c7c939
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
+                        <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="LaunchImage" width="168" height="185"/>
+    </resources>
+</document>
diff --git a/packages/firebase_crashlytics/example/ios/Runner/Base.lproj/Main.storyboard b/packages/firebase_crashlytics/example/ios/Runner/Base.lproj/Main.storyboard
new file mode 100644
index 000000000000..f3c28516fb38
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner/Base.lproj/Main.storyboard
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+    </dependencies>
+    <scenes>
+        <!--Flutter View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="FlutterViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
+                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>
diff --git a/packages/firebase_crashlytics/example/ios/Runner/Info.plist b/packages/firebase_crashlytics/example/ios/Runner/Info.plist
new file mode 100644
index 000000000000..0f5908f87367
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner/Info.plist
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>firebase_crashlytics_example</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(FLUTTER_BUILD_NAME)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+</dict>
+</plist>
diff --git a/packages/firebase_crashlytics/example/ios/Runner/main.m b/packages/firebase_crashlytics/example/ios/Runner/main.m
new file mode 100644
index 000000000000..dff6597e4513
--- /dev/null
+++ b/packages/firebase_crashlytics/example/ios/Runner/main.m
@@ -0,0 +1,9 @@
+#import <Flutter/Flutter.h>
+#import <UIKit/UIKit.h>
+#import "AppDelegate.h"
+
+int main(int argc, char* argv[]) {
+  @autoreleasepool {
+    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+  }
+}
diff --git a/packages/firebase_crashlytics/example/lib/main.dart b/packages/firebase_crashlytics/example/lib/main.dart
new file mode 100644
index 000000000000..ba10fb26391b
--- /dev/null
+++ b/packages/firebase_crashlytics/example/lib/main.dart
@@ -0,0 +1,70 @@
+import 'package:flutter/material.dart';
+
+import 'package:firebase_crashlytics/firebase_crashlytics.dart';
+
+void main() {
+  // Set `enableInDevMode` to true to see reports while in debug mode
+  // This is only to be used for confirming that reports are being
+  // submitted as expected. It is not intended to be used for everyday
+  // development.
+  Crashlytics.instance.enableInDevMode = true;
+
+  // Pass all uncaught errors to Crashlytics.
+  FlutterError.onError = (FlutterErrorDetails details) {
+    Crashlytics.instance.onError(details);
+  };
+  runApp(MyApp());
+}
+
+class MyApp extends StatefulWidget {
+  @override
+  _MyAppState createState() => _MyAppState();
+}
+
+class _MyAppState extends State<MyApp> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      home: Scaffold(
+        appBar: AppBar(
+          title: const Text('Crashlytics example app'),
+        ),
+        body: Center(
+          child: Column(
+            children: <Widget>[
+              FlatButton(
+                  child: const Text('Key'),
+                  onPressed: () {
+                    Crashlytics.instance.setString('foo', 'bar');
+                  }),
+              FlatButton(
+                  child: const Text('Log'),
+                  onPressed: () {
+                    Crashlytics.instance.log('baz');
+                  }),
+              FlatButton(
+                  child: const Text('Crash'),
+                  onPressed: () {
+                    // Use Crashlytics to throw an error. Use this for
+                    // confirmation that errors are being correctly reported.
+                    Crashlytics.instance.crash();
+                  }),
+              FlatButton(
+                  child: const Text('Throw Error'),
+                  onPressed: () {
+                    // Example of thrown error, it will be caught and sent to
+                    // Crashlytics.
+                    throw StateError('Uncaught error thrown by app.');
+                  }),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/packages/firebase_crashlytics/example/pubspec.yaml b/packages/firebase_crashlytics/example/pubspec.yaml
new file mode 100644
index 000000000000..43bfc8159f98
--- /dev/null
+++ b/packages/firebase_crashlytics/example/pubspec.yaml
@@ -0,0 +1,17 @@
+name: firebase_crashlytics_example
+description: Demonstrates how to use the firebase_crashlytics plugin.
+
+environment:
+  sdk: ">=2.0.0-dev.68.0 <3.0.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+
+  cupertino_icons: ^0.1.2
+
+  firebase_crashlytics:
+    path: ../
+
+flutter:
+  uses-material-design: true
diff --git a/packages/firebase_crashlytics/ios/.gitignore b/packages/firebase_crashlytics/ios/.gitignore
new file mode 100644
index 000000000000..710ec6cf1c71
--- /dev/null
+++ b/packages/firebase_crashlytics/ios/.gitignore
@@ -0,0 +1,36 @@
+.idea/
+.vagrant/
+.sconsign.dblite
+.svn/
+
+.DS_Store
+*.swp
+profile
+
+DerivedData/
+build/
+GeneratedPluginRegistrant.h
+GeneratedPluginRegistrant.m
+
+.generated/
+
+*.pbxuser
+*.mode1v3
+*.mode2v3
+*.perspectivev3
+
+!default.pbxuser
+!default.mode1v3
+!default.mode2v3
+!default.perspectivev3
+
+xcuserdata
+
+*.moved-aside
+
+*.pyc
+*sync/
+Icon?
+.tags*
+
+/Flutter/Generated.xcconfig
diff --git a/packages/firebase_crashlytics/ios/Assets/.gitkeep b/packages/firebase_crashlytics/ios/Assets/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/firebase_crashlytics/ios/Classes/FirebaseCrashlyticsPlugin.h b/packages/firebase_crashlytics/ios/Classes/FirebaseCrashlyticsPlugin.h
new file mode 100644
index 000000000000..ff9cf31e3943
--- /dev/null
+++ b/packages/firebase_crashlytics/ios/Classes/FirebaseCrashlyticsPlugin.h
@@ -0,0 +1,4 @@
+#import <Flutter/Flutter.h>
+
+@interface FirebaseCrashlyticsPlugin : NSObject <FlutterPlugin>
+@end
diff --git a/packages/firebase_crashlytics/ios/Classes/FirebaseCrashlyticsPlugin.m b/packages/firebase_crashlytics/ios/Classes/FirebaseCrashlyticsPlugin.m
new file mode 100644
index 000000000000..0215e61be035
--- /dev/null
+++ b/packages/firebase_crashlytics/ios/Classes/FirebaseCrashlyticsPlugin.m
@@ -0,0 +1,93 @@
+#import "FirebaseCrashlyticsPlugin.h"
+
+#import <Firebase/Firebase.h>
+
+@interface FirebaseCrashlyticsPlugin ()
+@property(nonatomic, retain) FlutterMethodChannel *channel;
+@end
+
+@implementation FirebaseCrashlyticsPlugin
++ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
+  FlutterMethodChannel *channel =
+      [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/firebase_crashlytics"
+                                  binaryMessenger:[registrar messenger]];
+  FirebaseCrashlyticsPlugin *instance = [[FirebaseCrashlyticsPlugin alloc] init];
+  [registrar addMethodCallDelegate:instance channel:channel];
+}
+
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    if (![FIRApp defaultApp]) {
+      [FIRApp configure];
+    }
+  }
+  return self;
+}
+
+- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
+  if ([@"Crashlytics#onError" isEqualToString:call.method]) {
+    // Add logs.
+    NSArray *logs = call.arguments[@"logs"];
+    for (NSString *log in logs) {
+      CLS_LOG(@"%@", log);
+    }
+
+    // Set keys.
+    NSArray *keys = call.arguments[@"keys"];
+    for (NSDictionary *key in keys) {
+      if ([@"int" isEqualToString:key[@"type"]]) {
+        [[Crashlytics sharedInstance] setIntValue:(int)call.arguments[@"value"]
+                                           forKey:call.arguments[@"key"]];
+      } else if ([@"double" isEqualToString:key[@"type"]]) {
+        [[Crashlytics sharedInstance] setFloatValue:[call.arguments[@"value"] floatValue]
+                                             forKey:call.arguments[@"key"]];
+      } else if ([@"string" isEqualToString:key[@"type"]]) {
+        [[Crashlytics sharedInstance] setObjectValue:call.arguments[@"value"]
+                                              forKey:call.arguments[@"key"]];
+      } else if ([@"boolean" isEqualToString:key[@"type"]]) {
+        [[Crashlytics sharedInstance] setBoolValue:[call.arguments[@"value"] boolValue]
+                                            forKey:call.arguments[@"key"]];
+      }
+    }
+
+    // Report crash.
+    NSArray *errorElements = call.arguments[@"stackTraceElements"];
+    NSMutableArray *frames = [NSMutableArray array];
+    for (NSDictionary *errorElement in errorElements) {
+      [frames addObject:[self generateFrame:errorElement]];
+    }
+    [[Crashlytics sharedInstance] recordCustomExceptionName:call.arguments[@"exception"]
+                                                     reason:call.arguments[@"context"]
+                                                 frameArray:frames];
+    result(@"Error reported to Crashlytics.");
+  } else if ([@"Crashlytics#isDebuggable" isEqualToString:call.method]) {
+    result([NSNumber numberWithBool:[Crashlytics sharedInstance].debugMode]);
+  } else if ([@"Crashlytics#getVersion" isEqualToString:call.method]) {
+    result([Crashlytics sharedInstance].version);
+  } else if ([@"Crashlytics#setUserEmail" isEqualToString:call.method]) {
+    [[Crashlytics sharedInstance] setUserEmail:call.arguments[@"email"]];
+    result(nil);
+  } else if ([@"Crashlytics#setUserName" isEqualToString:call.method]) {
+    [[Crashlytics sharedInstance] setUserName:call.arguments[@"name"]];
+    result(nil);
+  } else if ([@"Crashlytics#setUserIdentifier" isEqualToString:call.method]) {
+    [[Crashlytics sharedInstance] setUserEmail:call.arguments[@"identifier"]];
+    result(nil);
+  } else {
+    result(FlutterMethodNotImplemented);
+  }
+}
+
+- (CLSStackFrame *)generateFrame:(NSDictionary *)errorElement {
+  CLSStackFrame *frame = [CLSStackFrame stackFrame];
+
+  frame.library = [errorElement valueForKey:@"class"];
+  frame.symbol = [errorElement valueForKey:@"method"];
+  frame.fileName = [errorElement valueForKey:@"file"];
+  frame.lineNumber = [[errorElement valueForKey:@"line"] intValue];
+
+  return frame;
+}
+
+@end
diff --git a/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec b/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec
new file mode 100644
index 000000000000..b513b43228cd
--- /dev/null
+++ b/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec
@@ -0,0 +1,23 @@
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
+#
+Pod::Spec.new do |s|
+  s.name             = 'firebase_crashlytics'
+  s.version          = '0.0.1'
+  s.summary          = 'A new flutter plugin project.'
+  s.description      = <<-DESC
+A new flutter plugin project.
+                       DESC
+  s.homepage         = 'http://example.com'
+  s.license          = { :file => '../LICENSE' }
+  s.author           = { 'Your Company' => 'email@example.com' }
+  s.source           = { :path => '.' }
+  s.source_files = 'Classes/**/*'
+  s.public_header_files = 'Classes/**/*.h'
+  s.ios.deployment_target = '8.0'
+  s.dependency 'Flutter'
+  s.dependency 'Fabric'
+  s.dependency 'Crashlytics'
+  s.dependency 'Firebase/Core'
+end
+
diff --git a/packages/firebase_crashlytics/lib/firebase_crashlytics.dart b/packages/firebase_crashlytics/lib/firebase_crashlytics.dart
new file mode 100644
index 000000000000..9125e4282dd7
--- /dev/null
+++ b/packages/firebase_crashlytics/lib/firebase_crashlytics.dart
@@ -0,0 +1,11 @@
+library firebase_crashlytics;
+
+import 'dart:async';
+import 'dart:collection';
+import 'dart:typed_data';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+import 'package:stack_trace/stack_trace.dart';
+
+part 'src/firebase_crashlytics.dart';
diff --git a/packages/firebase_crashlytics/lib/src/firebase_crashlytics.dart b/packages/firebase_crashlytics/lib/src/firebase_crashlytics.dart
new file mode 100644
index 000000000000..b6fed22776da
--- /dev/null
+++ b/packages/firebase_crashlytics/lib/src/firebase_crashlytics.dart
@@ -0,0 +1,202 @@
+// Copyright 2019, the Flutter project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+part of firebase_crashlytics;
+
+/// The entry point for accessing Crashlytics.
+///
+/// You can get an instance by calling `Crashlytics.instance`.
+class Crashlytics {
+  static final Crashlytics instance = Crashlytics();
+
+  /// Set to true to have errors sent to Crashlytics while in debug mode. By
+  /// default this is false.
+  bool enableInDevMode = false;
+
+  /// Keys to be included with report.
+  final Map<String, dynamic> _keys = <String, dynamic>{};
+
+  /// Logs to be included with report.
+  final ListQueue<String> _logs = ListQueue<String>(15);
+  int _logSize = 0;
+
+  @visibleForTesting
+  static const MethodChannel channel =
+      MethodChannel('plugins.flutter.io/firebase_crashlytics');
+
+  /// Submits non-fatal crash report to Firebase Crashlytics.
+  Future<void> onError(FlutterErrorDetails details) async {
+    print('Error caught by Crashlytics plugin:');
+
+    bool inDebugMode = false;
+    if (!enableInDevMode) {
+      assert(inDebugMode = true);
+    }
+
+    if (inDebugMode && !enableInDevMode) {
+      print(Trace.format(details.stack).trimRight().split('\n'));
+    } else {
+      // Report error
+      final List<String> stackTraceLines =
+          Trace.format(details.stack).trimRight().split('\n');
+      final List<Map<String, String>> stackTraceElements =
+          _getStackTraceElements(stackTraceLines);
+      final dynamic result =
+          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+          // https://github.com/flutter/flutter/issues/26431
+          // ignore: strong_mode_implicit_dynamic_method
+          await channel.invokeMethod('Crashlytics#onError', <String, dynamic>{
+        'exception': details.exceptionAsString(),
+        'context': details.context,
+        'stackTraceElements': stackTraceElements,
+        'logs': _logs.toList(),
+        'keys': _prepareKeys(),
+      });
+      print(result);
+    }
+  }
+
+  void crash() {
+    throw StateError('Error thrown by Crashlytics plugin');
+  }
+
+  /// Reports the global value for debug mode.
+  /// TODO(kroikie): Clarify what this means in context of both Android and iOS.
+  Future<bool> isDebuggable() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    final bool result = await channel.invokeMethod('Crashlytics#isDebuggable');
+    return result;
+  }
+
+  /// Returns Crashlytics SDK version.
+  Future<String> getVersion() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    final String result = await channel.invokeMethod('Crashlytics#getVersion');
+    return result;
+  }
+
+  /// Add text logging that will be sent with your next report. `msg` will be
+  /// printed to the console when in debug mode. Each report has a rolling max
+  /// of 64k of logs, older logs are removed to allow newer logs to fit within
+  /// the limit.
+  void log(String msg) {
+    _logSize += Uint8List.fromList(msg.codeUnits).length;
+    _logs.add(msg);
+    // Remove oldest log till logSize is no more than 64K.
+    while (_logSize > 65536) {
+      final String first = _logs.removeFirst();
+      _logSize -= Uint8List.fromList(first.codeUnits).length;
+    }
+  }
+
+  void _setValue(String key, dynamic value) {
+    // Check that only 64 keys are set.
+    if (_keys.containsKey(key) || _keys.length <= 64) {
+      _keys[key] = value;
+    }
+  }
+
+  /// Sets a value to be associated with a given key for your crash data.
+  void setBool(String key, bool value) {
+    _setValue(key, value);
+  }
+
+  /// Sets a value to be associated with a given key for your crash data.
+  void setDouble(String key, double value) {
+    _setValue(key, value);
+  }
+
+  /// Sets a value to be associated with a given key for your crash data.
+  void setInt(String key, int value) {
+    _setValue(key, value);
+  }
+
+  /// Sets a value to be associated with a given key for your crash data.
+  void setString(String key, String value) {
+    _setValue(key, value);
+  }
+
+  /// Optionally set a end-user's name or username for display within the
+  /// Crashlytics UI. Please be mindful of end-user's privacy.
+  Future<void> setUserEmail(String email) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    await channel.invokeMethod(
+        'Crashlytics#setUserEmail', <String, dynamic>{'email': email});
+  }
+
+  /// Specify a user identifier which will be visible in the Crashlytics UI.
+  /// Please be mindful of end-user's privacy.
+  Future<void> setUserIdentifier(String identifier) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    await channel.invokeMethod('Crashlytics#setUserIdentifier',
+        <String, dynamic>{'identifier': identifier});
+  }
+
+  /// Specify a user name which will be visible in the Crashlytics UI. Please
+  /// be mindful of end-user's privacy.
+  Future<void> setUserName(String name) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    await channel.invokeMethod(
+        'Crashlytics#setUserName', <String, dynamic>{'name': name});
+  }
+
+  List<Map<String, dynamic>> _prepareKeys() {
+    final List<Map<String, dynamic>> crashlyticsKeys = <Map<String, dynamic>>[];
+    for (String key in _keys.keys) {
+      final dynamic value = _keys[key];
+
+      final Map<String, dynamic> crashlyticsKey = <String, dynamic>{
+        'key': key,
+        'value': value
+      };
+
+      if (value is int) {
+        crashlyticsKey['type'] = 'int';
+      } else if (value is double) {
+        crashlyticsKey['type'] = 'double';
+      } else if (value is String) {
+        crashlyticsKey['type'] = 'string';
+      } else if (value is bool) {
+        crashlyticsKey['type'] = 'boolean';
+      }
+    }
+
+    return crashlyticsKeys;
+  }
+
+  List<Map<String, String>> _getStackTraceElements(List<String> lines) {
+    final List<Map<String, String>> elements = <Map<String, String>>[];
+    for (String line in lines) {
+      final List<String> lineParts = line.split(RegExp('\\s+'));
+      try {
+        final String fileName = lineParts[0];
+        final String lineNumber =
+            lineParts[1].substring(0, lineParts[1].indexOf(":")).trim();
+        final String className =
+            lineParts[2].substring(0, lineParts[2].indexOf(".")).trim();
+        final String methodName =
+            lineParts[2].substring(lineParts[2].indexOf(".") + 1).trim();
+
+        elements.add(<String, String>{
+          'class': className,
+          'method': methodName,
+          'file': fileName,
+          'line': lineNumber,
+        });
+      } catch (e) {
+        print(e.toString());
+      }
+    }
+    return elements;
+  }
+}
diff --git a/packages/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/pubspec.yaml
new file mode 100644
index 000000000000..30b3bc5fcc05
--- /dev/null
+++ b/packages/firebase_crashlytics/pubspec.yaml
@@ -0,0 +1,24 @@
+name: firebase_crashlytics
+description: Flutter plugin for Firebase Crashlytics. It reports uncaught errors to the
+  Firebase console.
+version: 0.0.1
+author: Flutter Team <flutter-dev@google.com>
+homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_crashlytics
+
+environment:
+  sdk: ">=2.0.0-dev.68.0 <3.0.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+  stack_trace: ^1.9.3
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  test: ^1.5.1
+
+flutter:
+  plugin:
+    androidPackage: io.flutter.plugins.firebase.crashlytics.firebasecrashlytics
+    pluginClass: FirebaseCrashlyticsPlugin
diff --git a/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart b/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart
new file mode 100644
index 000000000000..ab92c9eafdec
--- /dev/null
+++ b/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart
@@ -0,0 +1,98 @@
+import 'package:firebase_crashlytics/firebase_crashlytics.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('$Crashlytics', () {
+    final List<MethodCall> log = <MethodCall>[];
+
+    final Crashlytics crashlytics = Crashlytics.instance;
+
+    setUp(() async {
+      Crashlytics.channel
+          .setMockMethodCallHandler((MethodCall methodCall) async {
+        log.add(methodCall);
+        switch (methodCall.method) {
+          case 'Crashlytics#isDebuggable':
+            return true;
+          case 'Crashlytics#setUserEmail':
+            return true;
+          case 'Crashlytics#setUserIdentifier':
+            return true;
+          case 'Crashlytics#setUserName':
+            return true;
+        }
+      });
+      log.clear();
+    });
+
+    test('onError', () async {
+      final FlutterErrorDetails details = FlutterErrorDetails(
+        exception: 'foo exception',
+        stack: StackTrace.current,
+        library: 'foo library',
+        context: 'foo context',
+        informationCollector: (StringBuffer information) {
+          information.writeln('foo information');
+        },
+      );
+      crashlytics.enableInDevMode = true;
+      crashlytics.log('foo');
+      await crashlytics.onError(details);
+      expect(log[0].method, 'Crashlytics#onError');
+      expect(log[0].arguments['exception'], 'foo exception');
+      expect(log[0].arguments['context'], 'foo context');
+      expect(log[0].arguments['logs'], isNotEmpty);
+      expect(log[0].arguments['logs'], contains('foo'));
+      expect(log[0].arguments['keys'], isEmpty);
+    });
+
+    test('isDebuggable', () async {
+      expect(await crashlytics.isDebuggable(), true);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'Crashlytics#isDebuggable',
+            arguments: null,
+          )
+        ],
+      );
+    });
+
+    test('crash', () {
+      expect(() => crashlytics.crash(), throwsStateError);
+    });
+
+    test('getVersion', () async {
+      await crashlytics.getVersion();
+      expect(log,
+          <Matcher>[isMethodCall('Crashlytics#getVersion', arguments: null)]);
+    });
+
+    test('setUserEmail', () async {
+      await crashlytics.setUserEmail('foo');
+      expect(log, <Matcher>[
+        isMethodCall('Crashlytics#setUserEmail',
+            arguments: <String, dynamic>{'email': 'foo'})
+      ]);
+    });
+
+    test('setUserIdentifier', () async {
+      await crashlytics.setUserIdentifier('foo');
+      expect(log, <Matcher>[
+        isMethodCall('Crashlytics#setUserIdentifier',
+            arguments: <String, dynamic>{'identifier': 'foo'})
+      ]);
+    });
+
+    test('setUserName', () async {
+      await crashlytics.setUserName('foo');
+      expect(log, <Matcher>[
+        isMethodCall('Crashlytics#setUserName',
+            arguments: <String, dynamic>{'name': 'foo'})
+      ]);
+    });
+  });
+}

From 5ee3f4d0ad89545b0209b8d21e5f908d671ba811 Mon Sep 17 00:00:00 2001
From: Vinay Phadnis <21256352+vinayphadnis@users.noreply.github.com>
Date: Thu, 21 Mar 2019 00:13:01 +0530
Subject: [PATCH 233/410] [cloud_firestore] add sample to get specific document
 (#790)

---
 packages/cloud_firestore/CHANGELOG.md |  4 ++++
 packages/cloud_firestore/README.md    | 12 ++++++++++++
 packages/cloud_firestore/pubspec.yaml |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 39a58e8e2225..09a5cd81433b 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.7+1
+
+* Update README with example of getting a document.
+
 ## 0.9.7
 
 * Fixes a NoSuchMethodError when using getDocuments on iOS (introduced in 0.9.6).
diff --git a/packages/cloud_firestore/README.md b/packages/cloud_firestore/README.md
index d0d10d036914..c34e2fa4709e 100755
--- a/packages/cloud_firestore/README.md
+++ b/packages/cloud_firestore/README.md
@@ -75,6 +75,18 @@ Firestore.instance
         data.documents.forEach((doc) => print(doc["title"])));
 ```
 
+Get a specific document:
+
+```dart
+Firestore.instance
+        .collection('talks')
+        .document('document-name')
+        .get()
+        .then((DocumentSnapshot ds) {
+      // use ds as a snapshot
+    });
+```
+
 Running a transaction:
 
 ```dart
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index f4b9318a6529..1e3c4d6a00b4 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.7
+version: 0.9.7+1
 
 flutter:
   plugin:

From b7026db0e5860031ba1ba10e01ba9a063e3e1ae6 Mon Sep 17 00:00:00 2001
From: David <david@workpail.com>
Date: Wed, 20 Mar 2019 14:48:26 -0400
Subject: [PATCH 234/410] [google_sign_in] Fix filename in google_sign_in docs,
 which leads to crash (#721)

---
 packages/google_sign_in/CHANGELOG.md |  4 ++++
 packages/google_sign_in/README.md    | 12 +++++++-----
 packages/google_sign_in/pubspec.yaml |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md
index 1f4e4940d9da..5b902dd33ca5 100644
--- a/packages/google_sign_in/CHANGELOG.md
+++ b/packages/google_sign_in/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.1+2
+
+* Fix README.md to correctly spell `GoogleService-Info.plist`.
+
 ## 4.0.1+1
 
 * Remove categories.
diff --git a/packages/google_sign_in/README.md b/packages/google_sign_in/README.md
index 50e20e729872..94ed47720d14 100755
--- a/packages/google_sign_in/README.md
+++ b/packages/google_sign_in/README.md
@@ -21,10 +21,12 @@ enable the [Google People API](https://developers.google.com/people/).
 ## iOS integration
 
 1. [First register your application](https://developers.google.com/mobile/add?platform=ios).
-2. Open Xcode. You'll have to paste this into Xcode to properly register `GoogleServices-Info.plist`.
-3. Select `GoogleServices-Info.plist` from the file manager and drag that file into the `Runner` directory, `[my_project]/ios/Runner/GoogleServices-Info.plist`.
-4. A dialog will show up and ask you to select the targets, select the `Runner` target.
-5. Then add the `CFBundleURLTypes` attributes below into the `[my_project]/ios/Runner/Info.plist` file.
+2. Make sure the file you download in step 1 is named `GoogleService-Info.plist`.
+3. Move or copy `GoogleService-Info.plist` into the `[my_project]/ios/Runner` directory.
+4. Open Xcode, then right-click on `Runner` directory and select `Add Files to "Runner"`.
+5. Select `GoogleService-Info.plist` from the file manager.
+6. A dialog will show up and ask you to select the targets, select the `Runner` target.
+7. Then add the `CFBundleURLTypes` attributes below into the `[my_project]/ios/Runner/Info.plist` file.
 
 ```xml
 <!-- Put me in the [my_project]/ios/Runner/Info.plist file -->
@@ -37,7 +39,7 @@ enable the [Google People API](https://developers.google.com/people/).
 		<key>CFBundleURLSchemes</key>
 		<array>
 			<!-- TODO Replace this value: -->
-			<!-- Copied from GoogleServices-Info.plist key REVERSED_CLIENT_ID -->
+			<!-- Copied from GoogleService-Info.plist key REVERSED_CLIENT_ID -->
 			<string>com.googleusercontent.apps.861823949799-vc35cprkp249096uujjn0vvnmcvjppkn</string>
 		</array>
 	</dict>
diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml
index 45c58738a875..0f4db18f2b3a 100755
--- a/packages/google_sign_in/pubspec.yaml
+++ b/packages/google_sign_in/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in
-version: 4.0.1+1
+version: 4.0.1+2
 
 flutter:
   plugin:

From 81a59956814a38e9e991d3a12b29c403d63739e1 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Mar 2019 11:29:03 -0700
Subject: [PATCH 235/410] Update CONTRIBUTING.md (#1374)

Explains how to run the tests and process updates
---
 CONTRIBUTING.md | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 919c80947617..749e48ddefef 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,5 @@
-Contributing to Flutter
-=======================
+Contributing to Flutter Plugins
+===============================
 
 [![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)
 
@@ -40,6 +40,24 @@ USB and debugging enabled on that device.
  * `cd packages/battery/example`
  * `flutter run`
 
+Running the tests
+-----------------
+
+Flutter plugins have both unit tests of their Dart API and integration tests that run on a virtual or actual device.
+
+To run the unit tests:
+
+```
+flutter test test/<name_of_plugin>_test.dart
+```
+
+To run the integration tests:
+
+```
+cd example
+flutter drive test/<name_of_plugin>.dart
+```
+
 Contributing code
 -----------------
 
@@ -74,19 +92,16 @@ To send us a pull request:
 
 Please make sure all your checkins have detailed commit messages explaining the patch.
 
-Once you've gotten an LGTM from a project maintainer and once your PR has received
-the green light from all our automated testing (Travis, AppVeyor, etc), submit your
-changes to the `master` branch using one of the following methods:
+Plugins tests are run automatically on contributions using Cirrus CI. However, due to
+cost constraints, pull requests from non-committers may not run all the tests
+automatically.
 
-* Wait for one of the project maintainers to submit it for you.
-* Click the green "Merge pull request" button on the GitHub UI of your pull
-  request (requires commit access).
+Once you've gotten an LGTM from a project maintainer and once your PR has received
+the green light from all our automated testing, wait for one the package maintainers
+to merge the pull request and `pub submit` any affected packages.
 
 You must complete the
 [Contributor License Agreement](https://cla.developers.google.com/clas).
 You can do this online, and it only takes a minute.
 If you've never submitted code before, you must add your (or your
 organization's) name and contact info to the [AUTHORS](AUTHORS) file.
-
-We grant commit access to people who have gained our trust and demonstrated
-a commitment to Flutter.

From 2f776ac66e2512745556148bca38cc16f825b460 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Mar 2019 11:45:41 -0700
Subject: [PATCH 236/410] Add pull request template (#1375)

---
 .github/PULL_REQUEST_TEMPLATE.md | 37 ++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000000..1a4279852a2e
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,37 @@
+## Description
+
+*Replace this paragraph with a description of what this PR is doing. If you're modifying existing behavior, describe the existing behavior, how this PR is changing it, and what motivated the change.*
+
+## Related Issues
+
+*Replace this paragraph with a list of issues related to this PR from the [issue database](https://github.com/flutter/flutter/issues). Indicate, which of these issues are resolved or fixed by this PR. Note that you'll have to prefix the issue numbers with flutter/flutter#.*
+
+## Checklist
+
+Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (`[x]`). This will ensure a smooth and quick review process.
+
+- [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
+- [ ] My PR includes unit or integration tests for *all* changed/updated/fixed behaviors (See [Contribution Guide]).
+- [ ] All existing and new tests are passing.
+- [ ] I updated/added relevant documentation (doc comments with `///`).
+- [ ] The analyzer (`flutter analyze`) does not report any problems on my PR.
+- [ ] I read and followed the [Flutter Style Guide].
+- [ ] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]
+- [ ] I updated pubspec.yaml with an appropriate new version according to the [pub versioning philosophy].
+- [ ] I updated CHANGELOG.md to add a description of the change.
+- [ ] I signed the [CLA].
+- [ ] I am willing to follow-up on review comments in a timely manner.
+
+## Breaking Change
+
+Does your PR require plugin user to manually update their apps to accommodate your change?
+
+- [ ] Yes, this is a breaking change (please indicate a breaking change in CHANGELOG.md and increment major revision).
+- [ ] No, this is *not* a breaking change.
+
+<!-- Links -->
+[issue database]: https://github.com/flutter/flutter/issues
+[Contributor Guide]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md
+[Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
+[pub versioning philosophy]: https://www.dartlang.org/tools/pub/versioning
+[CLA]: https://cla.developers.google.com/

From ade2187bb282127086488615e46cce613f92ad24 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Mar 2019 13:23:48 -0700
Subject: [PATCH 237/410] Update PULL_REQUEST_TEMPLATE.md

Fix hyperlink
---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1a4279852a2e..ee39f88be7f0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,7 +11,7 @@
 Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (`[x]`). This will ensure a smooth and quick review process.
 
 - [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
-- [ ] My PR includes unit or integration tests for *all* changed/updated/fixed behaviors (See [Contribution Guide]).
+- [ ] My PR includes unit or integration tests for *all* changed/updated/fixed behaviors (See [Contributor Guide]).
 - [ ] All existing and new tests are passing.
 - [ ] I updated/added relevant documentation (doc comments with `///`).
 - [ ] The analyzer (`flutter analyze`) does not report any problems on my PR.

From 3a2a75985329cd24179b04560afab39e35b71001 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 21 Mar 2019 13:25:18 -0700
Subject: [PATCH 238/410] Update PULL_REQUEST_TEMPLATE.md

Fixes a typo
---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ee39f88be7f0..083e125b32d2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -24,7 +24,7 @@ Before you create this PR confirm that it meets all requirements listed below by
 
 ## Breaking Change
 
-Does your PR require plugin user to manually update their apps to accommodate your change?
+Does your PR require plugin users to manually update their apps to accommodate your change?
 
 - [ ] Yes, this is a breaking change (please indicate a breaking change in CHANGELOG.md and increment major revision).
 - [ ] No, this is *not* a breaking change.

From 5461d259cbf470e2c496a68c1d6c7ca605a33a14 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirha@google.com>
Date: Wed, 20 Mar 2019 13:14:52 -0700
Subject: [PATCH 239/410] Update the controller's onPageFinished reference when
 the widget is rebuilt.

---
 packages/webview_flutter/CHANGELOG.md         |  4 ++++
 .../webview_flutter/lib/webview_flutter.dart  |  3 ++-
 packages/webview_flutter/pubspec.yaml         |  2 +-
 .../test/webview_flutter_test.dart            | 23 +++++++++++++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 92e2a10c7eab..813ab33f426c 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.5+1
+
+* Fix a bug where updates to onPageFinished were ignored.
+
 ## 0.3.5
 
 * Added an onPageFinished callback.
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index 96a626b51f10..e172c6152508 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -272,6 +272,7 @@ class _WebViewState extends State<WebView> {
     controller._updateSettings(settings);
     controller._updateJavascriptChannels(widget.javascriptChannels);
     controller._navigationDelegate = widget.navigationDelegate;
+    controller._onPageFinished = widget.onPageFinished;
   }
 
   void _onPlatformViewCreated(int id) {
@@ -392,7 +393,7 @@ class WebViewController {
 
   _WebSettings _settings;
 
-  final PageFinishedCallback _onPageFinished;
+  PageFinishedCallback _onPageFinished;
 
   // Maps a channel name to a channel.
   Map<String, JavascriptChannel> _javascriptChannels =
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index ccaecd36cd3c..e21da558eb95 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.5
+version: 0.3.5+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 
diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart
index b1e45d557b36..d66f56d212f5 100644
--- a/packages/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/test/webview_flutter_test.dart
@@ -608,6 +608,29 @@ void main() {
       // to test that it does not crash on a null callback.
       platformWebView.fakeOnPageFinishedCallback();
     });
+
+    testWidgets('onPageFinished changed', (WidgetTester tester) async {
+      String returnedUrl;
+
+      await tester.pumpWidget(WebView(
+        initialUrl: 'https://youtube.com',
+        onPageFinished: (String url) {},
+      ));
+
+      await tester.pumpWidget(WebView(
+        initialUrl: 'https://youtube.com',
+        onPageFinished: (String url) {
+          returnedUrl = url;
+        },
+      ));
+
+      final FakePlatformWebView platformWebView =
+          fakePlatformViewsController.lastCreatedView;
+
+      platformWebView.fakeOnPageFinishedCallback();
+
+      expect(platformWebView.currentUrl, returnedUrl);
+    });
   });
 
   group('navigationDelegate', () {

From 60b26f29f56998c9e41a8f50fa7eb7b42fb57d54 Mon Sep 17 00:00:00 2001
From: Herbert Poul <herbert@poul.at>
Date: Thu, 21 Mar 2019 11:07:00 +0200
Subject: [PATCH 240/410] Refactor WebViewController to have a reference to the
 widget, to minimize necessary update calls.

---
 .../webview_flutter/lib/webview_flutter.dart  | 48 +++++++------------
 1 file changed, 17 insertions(+), 31 deletions(-)

diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index e172c6152508..d67e769fb1bb 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -213,8 +213,6 @@ class _WebViewState extends State<WebView> {
   final Completer<WebViewController> _controller =
       Completer<WebViewController>();
 
-  _WebSettings _settings;
-
   @override
   Widget build(BuildContext context) {
     if (defaultTargetPlatform == TargetPlatform.android) {
@@ -263,26 +261,12 @@ class _WebViewState extends State<WebView> {
   void didUpdateWidget(WebView oldWidget) {
     super.didUpdateWidget(oldWidget);
     _assertJavascriptChannelNamesAreUnique();
-    _updateConfiguration(_WebSettings.fromWidget(widget));
-  }
-
-  Future<void> _updateConfiguration(_WebSettings settings) async {
-    _settings = settings;
-    final WebViewController controller = await _controller.future;
-    controller._updateSettings(settings);
-    controller._updateJavascriptChannels(widget.javascriptChannels);
-    controller._navigationDelegate = widget.navigationDelegate;
-    controller._onPageFinished = widget.onPageFinished;
+    _controller.future.then(
+        (WebViewController controller) => controller._updateWidget(widget));
   }
 
   void _onPlatformViewCreated(int id) {
-    final WebViewController controller = WebViewController._(
-      id,
-      _WebSettings.fromWidget(widget),
-      widget.javascriptChannels,
-      widget.navigationDelegate,
-      widget.onPageFinished,
-    );
+    final WebViewController controller = WebViewController._(id, widget);
     _controller.complete(controller);
     if (widget.onWebViewCreated != null) {
       widget.onWebViewCreated(controller);
@@ -378,22 +362,18 @@ class _WebSettings {
 class WebViewController {
   WebViewController._(
     int id,
-    this._settings,
-    Set<JavascriptChannel> javascriptChannels,
-    this._navigationDelegate,
-    this._onPageFinished,
+    this._widget,
   ) : _channel = MethodChannel('plugins.flutter.io/webview_$id') {
-    _updateJavascriptChannelsFromSet(javascriptChannels);
+    _settings = _WebSettings.fromWidget(_widget);
+    _updateJavascriptChannelsFromSet(_widget.javascriptChannels);
     _channel.setMethodCallHandler(_onMethodCall);
   }
 
   final MethodChannel _channel;
 
-  NavigationDelegate _navigationDelegate;
-
   _WebSettings _settings;
 
-  PageFinishedCallback _onPageFinished;
+  WebView _widget;
 
   // Maps a channel name to a channel.
   Map<String, JavascriptChannel> _javascriptChannels =
@@ -415,12 +395,12 @@ class WebViewController {
         // _navigationDelegate can be null if the widget was rebuilt with no
         // navigation delegate after a navigation happened and just before we
         // got the navigationRequest message.
-        final bool allowNavigation = _navigationDelegate == null ||
-            _navigationDelegate(request) == NavigationDecision.navigate;
+        final bool allowNavigation = _widget.navigationDelegate == null ||
+            _widget.navigationDelegate(request) == NavigationDecision.navigate;
         return allowNavigation;
       case 'onPageFinished':
-        if (_onPageFinished != null) {
-          _onPageFinished(call.arguments['url']);
+        if (_widget.onPageFinished != null) {
+          _widget.onPageFinished(call.arguments['url']);
         }
 
         return null;
@@ -528,6 +508,12 @@ class WebViewController {
     return reload();
   }
 
+  Future<void> _updateWidget(WebView widget) async {
+    _widget = widget;
+    await _updateSettings(_WebSettings.fromWidget(widget));
+    await _updateJavascriptChannels(widget.javascriptChannels);
+  }
+
   Future<void> _updateSettings(_WebSettings setting) async {
     final Map<String, dynamic> updateMap = _settings.updatesMap(setting);
     if (updateMap == null || updateMap.isEmpty) {

From b5edcbb36300a572d21d044cfcae6ed6be036c70 Mon Sep 17 00:00:00 2001
From: Ben Konyi <bkonyi@google.com>
Date: Fri, 22 Mar 2019 03:58:41 -0700
Subject: [PATCH 241/410] Removed dependency on Firebase for
 android_alarm_manager example (#1341)

---
 packages/android_alarm_manager/CHANGELOG.md   |  4 +
 .../example/android/app/build.gradle          |  2 -
 .../example/android/app/google-services.json  | 55 -------------
 .../example/lib/main.dart                     | 79 +++----------------
 .../example/pubspec.yaml                      |  2 -
 packages/android_alarm_manager/pubspec.yaml   |  5 +-
 6 files changed, 15 insertions(+), 132 deletions(-)
 delete mode 100644 packages/android_alarm_manager/example/android/app/google-services.json

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index 3eedeee31ba5..3ddcca9a3c91 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.1+4
+
+* Updated example to remove dependency on Firebase.
+
 ## 0.4.1+3
 
 * Update README.md to include instructions for setting the WAKE_LOCK permission.
diff --git a/packages/android_alarm_manager/example/android/app/build.gradle b/packages/android_alarm_manager/example/android/app/build.gradle
index 1beebc3c12bb..d296cafa8e7c 100644
--- a/packages/android_alarm_manager/example/android/app/build.gradle
+++ b/packages/android_alarm_manager/example/android/app/build.gradle
@@ -58,5 +58,3 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
-
-apply plugin: 'com.google.gms.google-services'
diff --git a/packages/android_alarm_manager/example/android/app/google-services.json b/packages/android_alarm_manager/example/android/app/google-services.json
deleted file mode 100644
index b1c623895620..000000000000
--- a/packages/android_alarm_manager/example/android/app/google-services.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "project_info": {
-    "project_number": "469543255310",
-    "firebase_url": "https://flutter-plugins-alarmmanager.firebaseio.com",
-    "project_id": "flutter-plugins-alarmmanager",
-    "storage_bucket": "flutter-plugins-alarmmanager.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:469543255310:android:b691665129a4b343",
-        "android_client_info": {
-          "package_name": "io.flutter.plugins.androidalarmmanagerexample"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "469543255310-eb57hpmenljlgej9urc8k3iju63a70ig.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "io.flutter.plugins.androidalarmmanagerexample",
-            "certificate_hash": "f8323ac5fe6e7adc1ddc5612e16b5d04d7f1358b"
-          }
-        },
-        {
-          "client_id": "469543255310-39gq6cjl6h84529omissps5v81la963c.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAXOxEfOptvOfvaRhdXeoUe-KmVDYtc72M"
-        }
-      ],
-      "services": {
-        "analytics_service": {
-          "status": 1
-        },
-        "appinvite_service": {
-          "status": 2,
-          "other_platform_oauth_client": [
-            {
-              "client_id": "469543255310-39gq6cjl6h84529omissps5v81la963c.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        },
-        "ads_service": {
-          "status": 2
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/packages/android_alarm_manager/example/lib/main.dart b/packages/android_alarm_manager/example/lib/main.dart
index 0c7fc2a2cd7e..e68735a75085 100644
--- a/packages/android_alarm_manager/example/lib/main.dart
+++ b/packages/android_alarm_manager/example/lib/main.dart
@@ -3,88 +3,29 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:isolate';
 
 import 'package:android_alarm_manager/android_alarm_manager.dart';
-import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/widgets.dart';
 
-final FirebaseAuth firebaseAuth = FirebaseAuth.instance;
-FirebaseUser firebaseUser;
+void printMessage(String msg) => print('[${DateTime.now()}] $msg');
 
-Future<void> ensureFirebaseUser() async {
-  if (firebaseUser == null) {
-    firebaseUser = await firebaseAuth.currentUser();
-    if (firebaseUser == null) {
-      firebaseUser = await firebaseAuth.signInAnonymously();
-    }
-  }
-}
-
-class HelloMessage {
-  HelloMessage(this._now, this._msg, this._isolate, this._user, this._token);
-
-  final DateTime _now;
-  final String _msg;
-  final int _isolate;
-  final FirebaseUser _user;
-  final String _token;
-
-  @override
-  String toString() {
-    return "[$_now] $_msg "
-        "isolate=$_isolate "
-        "user='$_user' "
-        "token=$_token";
-  }
-}
-
-void printHelloMessage(String msg) {
-  ensureFirebaseUser().then((_) {
-    firebaseUser.getIdToken().then((String idToken) {
-      print(HelloMessage(
-        DateTime.now(),
-        msg,
-        Isolate.current.hashCode,
-        firebaseUser,
-        idToken,
-      ));
-    });
-  });
-}
-
-void printHello() {
-  printHelloMessage("Hello, world!");
-}
-
-void printGoodbye() {
-  printHelloMessage("Goodbye, world!");
-}
-
-bool oneShotFired = false;
-
-void printOneShot() {
-  printHelloMessage("Hello, once!");
-}
+void printPeriodic() => printMessage("Periodic!");
+void printOneShot() => printMessage("One shot!");
 
 Future<void> main() async {
-  final int helloAlarmID = 0;
-  final int goodbyeAlarmID = 1;
-  final int oneShotID = 2;
+  final int periodicID = 0;
+  final int oneShotID = 1;
 
   // Start the AlarmManager service.
   await AndroidAlarmManager.initialize();
 
-  printHelloMessage("Hello, main()!");
+  printMessage("main run");
   runApp(const Center(
-      child: Text('Hello, world!', textDirection: TextDirection.ltr)));
+      child:
+          Text('See device log for output', textDirection: TextDirection.ltr)));
   await AndroidAlarmManager.periodic(
-      const Duration(seconds: 5), helloAlarmID, printHello,
+      const Duration(seconds: 5), periodicID, printPeriodic,
       wakeup: true);
   await AndroidAlarmManager.oneShot(
-      const Duration(seconds: 5), goodbyeAlarmID, printGoodbye);
-  if (!oneShotFired) {
-    await AndroidAlarmManager.oneShot(
-        const Duration(seconds: 5), oneShotID, printOneShot);
-  }
+      const Duration(seconds: 5), oneShotID, printOneShot);
 }
diff --git a/packages/android_alarm_manager/example/pubspec.yaml b/packages/android_alarm_manager/example/pubspec.yaml
index 692964f259d1..392c03dc8902 100644
--- a/packages/android_alarm_manager/example/pubspec.yaml
+++ b/packages/android_alarm_manager/example/pubspec.yaml
@@ -6,8 +6,6 @@ dependencies:
     sdk: flutter
   android_alarm_manager:
     path: ../
-  firebase_auth: "^0.8.0+1"
-  google_sign_in: "^4.0.0"
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index d0b36c3a73fd..6e5dc009798f 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -1,7 +1,7 @@
 name: android_alarm_manager
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.4.1+3
+version: 0.4.1+4
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 
@@ -9,9 +9,6 @@ dependencies:
   flutter:
     sdk: flutter
 
-dev_dependencies:
-  firebase_auth: "^0.8.0+1"
-
 flutter:
   plugin:
     androidPackage: io.flutter.plugins.androidalarmmanager

From 6cf046cdb6a738598a8a6ef8c35c1180c1915f5d Mon Sep 17 00:00:00 2001
From: Leo Farias <leokcta@gmail.com>
Date: Fri, 22 Mar 2019 07:15:00 -0400
Subject: [PATCH 242/410] [firebase_crashlytics] Support compatibility with
 Swift plugins (#1378)

Updated the podspec to a static framework.
---
 packages/firebase_crashlytics/CHANGELOG.md                    | 4 ++++
 .../firebase_crashlytics/ios/firebase_crashlytics.podspec     | 1 +
 packages/firebase_crashlytics/pubspec.yaml                    | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_crashlytics/CHANGELOG.md b/packages/firebase_crashlytics/CHANGELOG.md
index bf963537d63d..87869d32072f 100644
--- a/packages/firebase_crashlytics/CHANGELOG.md
+++ b/packages/firebase_crashlytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.2
+
+* Updated the iOS podspec to a static framework to support compatibility with Swift plugins.
+
 ## 0.0.1
 
 * Initial release of Firebase Crashlytics plugin.
diff --git a/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec b/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec
index b513b43228cd..0cecb9fccaa6 100644
--- a/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec
+++ b/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec
@@ -15,6 +15,7 @@ A new flutter plugin project.
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.ios.deployment_target = '8.0'
+  s.static_framework = true
   s.dependency 'Flutter'
   s.dependency 'Fabric'
   s.dependency 'Crashlytics'
diff --git a/packages/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/pubspec.yaml
index 30b3bc5fcc05..d19c114fba83 100644
--- a/packages/firebase_crashlytics/pubspec.yaml
+++ b/packages/firebase_crashlytics/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_crashlytics
 description: Flutter plugin for Firebase Crashlytics. It reports uncaught errors to the
   Firebase console.
-version: 0.0.1
+version: 0.0.2
 author: Flutter Team <flutter-dev@google.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_crashlytics
 

From c5fe96b24d261343aaa4363750cf3e1dbf8fc1b3 Mon Sep 17 00:00:00 2001
From: Kenneth Liang <KaYBlitZ@users.noreply.github.com>
Date: Fri, 22 Mar 2019 07:21:12 -0400
Subject: [PATCH 243/410] [firebase_crashlytics] Upgrade dependencies (#1379)

---
 packages/firebase_crashlytics/CHANGELOG.md         | 1 +
 packages/firebase_crashlytics/android/build.gradle | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/firebase_crashlytics/CHANGELOG.md b/packages/firebase_crashlytics/CHANGELOG.md
index 87869d32072f..57ac2b58d9d8 100644
--- a/packages/firebase_crashlytics/CHANGELOG.md
+++ b/packages/firebase_crashlytics/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 0.0.2
 
 * Updated the iOS podspec to a static framework to support compatibility with Swift plugins.
+* Updated the Android gradle dependencies to prevent build errors.
 
 ## 0.0.1
 
diff --git a/packages/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/android/build.gradle
index 45dae6504f22..fd3f9d8ee6d8 100644
--- a/packages/firebase_crashlytics/android/build.gradle
+++ b/packages/firebase_crashlytics/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
     }
 }
 
@@ -25,11 +25,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
@@ -37,6 +37,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-core:16.0.7'
+    implementation 'com.google.firebase:firebase-core:16.0.8'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
 }

From 71fa7a073d7b3399e1b674ed55d3dc1d2d42ac2b Mon Sep 17 00:00:00 2001
From: Sebastian Roth <sebastian.roth@gmail.com>
Date: Fri, 22 Mar 2019 20:29:50 +0800
Subject: [PATCH 244/410] [firebase_auth] fixes Android linkWithCredential
 (#1333)

---
 packages/firebase_auth/CHANGELOG.md                  |  4 ++++
 .../plugins/firebaseauth/FirebaseAuthPlugin.java     | 12 ++++--------
 packages/firebase_auth/pubspec.yaml                  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index b84b050f85a4..83e7fa7111e6 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.2
+
+ * Fixed `linkWithCredential` on Android.
+
 ## 0.8.1+5
 
 * Added a driver test.
diff --git a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
index ce7010ee4fb0..3a9872e8f17d 100755
--- a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
+++ b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
@@ -120,7 +120,7 @@ public void onMethodCall(MethodCall call, Result result) {
         handleReauthenticateWithCredential(call, result, getAuth(call));
         break;
       case "linkWithCredential":
-        handleLinkWithEmailAndPassword(call, result, getAuth(call));
+        handleLinkWithCredential(call, result, getAuth(call));
         break;
       case "unlinkFromProvider":
         handleUnlinkFromProvider(call, result, getAuth(call));
@@ -264,19 +264,15 @@ private Map<String, Object> getVerifyPhoneNumberExceptionMap(FirebaseException e
     return exceptionMap;
   }
 
-  private void handleLinkWithEmailAndPassword(
-      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+  private void handleLinkWithCredential(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
     final FirebaseUser currentUser = firebaseAuth.getCurrentUser();
     if (currentUser == null) {
       markUserRequired(result);
       return;
     }
 
-    Map<String, String> arguments = call.arguments();
-    String email = arguments.get("email");
-    String password = arguments.get("password");
-
-    AuthCredential credential = EmailAuthProvider.getCredential(email, password);
+    @SuppressWarnings("unchecked")
+    AuthCredential credential = getCredential((Map<String, Object>) call.arguments);
 
     currentUser
         .linkWithCredential(credential)
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 7ef7c728d779..19438d63b132 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.1+5"
+version: "0.8.2"
 
 flutter:
   plugin:

From e9f141bc4e4ae50ce81b280da0a6c5536ca1ff59 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 22 Mar 2019 14:39:58 -0700
Subject: [PATCH 245/410] [in_app_purchase] Iap refactor (#1381)

Refactor the store kit wrapper code in IAP
---
 packages/in_app_purchase/build.yaml           |   2 +-
 .../in_app_purchase/example/lib/main.dart     |  21 +-
 .../enum_converters.g.dart                    |   6 +
 .../purchase_wrapper.g.dart                   |  20 ++
 .../sku_details_wrapper.g.dart                |  26 ++
 .../sk_download_wrapper.dart                  | 127 ++++++++
 .../sk_download_wrapper.g.dart                |  66 +++++
 .../sk_payment_queue_wrapper.dart             | 277 +-----------------
 .../sk_payment_queue_wrapper.g.dart           |  95 ++----
 .../sk_payment_transaction_wrappers.dart      | 160 ++++++++++
 .../sk_payment_transaction_wrappers.g.dart    |  70 +++++
 .../sk_payment_wrapper.dart                   |   1 +
 .../sk_product_wrapper.dart                   |   2 +-
 .../sk_product_wrapper.g.dart                 |  56 +++-
 .../lib/store_kit_wrappers.dart               |   4 +-
 15 files changed, 559 insertions(+), 374 deletions(-)
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.dart
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.g.dart
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.g.dart
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_wrapper.dart

diff --git a/packages/in_app_purchase/build.yaml b/packages/in_app_purchase/build.yaml
index 3ee298a9c25f..d7b59734f27e 100644
--- a/packages/in_app_purchase/build.yaml
+++ b/packages/in_app_purchase/build.yaml
@@ -4,5 +4,5 @@ targets:
       json_serializable:
         options:
           any_map: true
-          create_to_json: false
+          create_to_json: true
           nullable: false
\ No newline at end of file
diff --git a/packages/in_app_purchase/example/lib/main.dart b/packages/in_app_purchase/example/lib/main.dart
index 52ad8e530599..e6d284a7a40e 100644
--- a/packages/in_app_purchase/example/lib/main.dart
+++ b/packages/in_app_purchase/example/lib/main.dart
@@ -99,15 +99,16 @@ class _MyAppState extends State<MyApp> {
   }
 
   Future<Card> _buildProductList() async {
-    final bool available = await InAppPurchaseConnection.instance.isAvailable();
+    InAppPurchaseConnection connection = InAppPurchaseConnection.instance;
+    final bool available = await connection.isAvailable();
     if (!available) {
       return Card();
     }
     final ListTile productHeader = ListTile(
         title: Text('Products for Sale',
             style: Theme.of(context).textTheme.headline));
-    ProductDetailsResponse response = await InAppPurchaseConnection.instance
-        .queryProductDetails(_kProductIds.toSet());
+    ProductDetailsResponse response =
+        await connection.queryProductDetails(_kProductIds.toSet());
     List<ListTile> productList = <ListTile>[];
     if (!response.notFoundIDs.isEmpty) {
       productList.add(ListTile(
@@ -117,20 +118,6 @@ class _MyAppState extends State<MyApp> {
               'This app needs special configuration to run. Please see example/README.md for instructions.')));
     }
 
-    productList.addAll(response.productDetails.map(
-      (ProductDetails productDetails) {
-        return ListTile(
-          title: Text(
-            productDetails.title,
-          ),
-          subtitle: Text(
-            productDetails.description,
-          ),
-          trailing: Text(productDetails.price),
-        );
-      },
-    ));
-
     return Card(
         child:
             Column(children: <Widget>[productHeader, Divider()] + productList));
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart
index 3af571bdf5a8..ec8d57ba60e1 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/enum_converters.g.dart
@@ -12,6 +12,12 @@ _SerializedEnums _$_SerializedEnumsFromJson(Map json) {
     ..type = _$enumDecode(_$SkuTypeEnumMap, json['type']);
 }
 
+Map<String, dynamic> _$_SerializedEnumsToJson(_SerializedEnums instance) =>
+    <String, dynamic>{
+      'response': _$BillingResponseEnumMap[instance.response],
+      'type': _$SkuTypeEnumMap[instance.type]
+    };
+
 T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
   if (source == null) {
     throw ArgumentError('A value must be provided. Supported values: '
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart
index 1681a1f773bc..4af4b6992587 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart
@@ -18,6 +18,18 @@ PurchaseWrapper _$PurchaseWrapperFromJson(Map json) {
       originalJson: json['originalJson'] as String);
 }
 
+Map<String, dynamic> _$PurchaseWrapperToJson(PurchaseWrapper instance) =>
+    <String, dynamic>{
+      'orderId': instance.orderId,
+      'packageName': instance.packageName,
+      'purchaseTime': instance.purchaseTime,
+      'purchaseToken': instance.purchaseToken,
+      'signature': instance.signature,
+      'sku': instance.sku,
+      'isAutoRenewing': instance.isAutoRenewing,
+      'originalJson': instance.originalJson
+    };
+
 PurchasesResultWrapper _$PurchasesResultWrapperFromJson(Map json) {
   return PurchasesResultWrapper(
       responseCode: const BillingResponseConverter()
@@ -26,3 +38,11 @@ PurchasesResultWrapper _$PurchasesResultWrapperFromJson(Map json) {
           .map((e) => PurchaseWrapper.fromJson(e as Map))
           .toList());
 }
+
+Map<String, dynamic> _$PurchasesResultWrapperToJson(
+        PurchasesResultWrapper instance) =>
+    <String, dynamic>{
+      'responseCode':
+          const BillingResponseConverter().toJson(instance.responseCode),
+      'purchasesList': instance.purchasesList
+    };
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
index 631cd15c22e1..3d059834a4f7 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
@@ -24,6 +24,24 @@ SkuDetailsWrapper _$SkuDetailsWrapperFromJson(Map json) {
       isRewarded: json['isRewarded'] as bool);
 }
 
+Map<String, dynamic> _$SkuDetailsWrapperToJson(SkuDetailsWrapper instance) =>
+    <String, dynamic>{
+      'description': instance.description,
+      'freeTrialPeriod': instance.freeTrialPeriod,
+      'introductoryPrice': instance.introductoryPrice,
+      'introductoryPriceMicros': instance.introductoryPriceMicros,
+      'introductoryPriceCycles': instance.introductoryPriceCycles,
+      'introductoryPricePeriod': instance.introductoryPricePeriod,
+      'price': instance.price,
+      'priceAmountMicros': instance.priceAmountMicros,
+      'priceCurrencyCode': instance.priceCurrencyCode,
+      'sku': instance.sku,
+      'subscriptionPeriod': instance.subscriptionPeriod,
+      'title': instance.title,
+      'type': const SkuTypeConverter().toJson(instance.type),
+      'isRewarded': instance.isRewarded
+    };
+
 SkuDetailsResponseWrapper _$SkuDetailsResponseWrapperFromJson(Map json) {
   return SkuDetailsResponseWrapper(
       responseCode: const BillingResponseConverter()
@@ -32,3 +50,11 @@ SkuDetailsResponseWrapper _$SkuDetailsResponseWrapperFromJson(Map json) {
           .map((e) => SkuDetailsWrapper.fromJson(e as Map))
           .toList());
 }
+
+Map<String, dynamic> _$SkuDetailsResponseWrapperToJson(
+        SkuDetailsResponseWrapper instance) =>
+    <String, dynamic>{
+      'responseCode':
+          const BillingResponseConverter().toJson(instance.responseCode),
+      'skuDetailsList': instance.skuDetailsList
+    };
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.dart
new file mode 100644
index 000000000000..356e0c9cf467
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.dart
@@ -0,0 +1,127 @@
+import 'package:flutter/foundation.dart';
+import 'package:json_annotation/json_annotation.dart';
+import 'sk_payment_transaction_wrappers.dart';
+import 'sk_payment_queue_wrapper.dart';
+
+part 'sk_download_wrapper.g.dart';
+
+/// Dart wrapper around StoreKit's [SKDownload](https://developer.apple.com/documentation/storekit/skdownload?language=objc).
+///
+/// When a product is created in the App Store Connect, one or more download contents can be associated with it.
+/// When the product is purchased, a List of [SKDownloadWrapper] object will be present in an [SKPaymentTransactionWrapper] object.
+/// To download the content, add the [SKDownloadWrapper] objects to the payment queue and wait for the content to be downloaded.
+/// You can also read the [contentURL] to get the URL of the downloaded content after the download completes.
+/// Note that all downloaded files must be processed before the completion of the [SKPaymentTransactionWrapper]([SKPaymentQueueWrapper.finishTransaction] is called).
+/// After the transaction is complete, any [SKDownloadWrapper] object in the transaction will not be able to be added to the payment queue
+/// and the [contentURL ]of the [SKDownloadWrapper] object will be invalid.
+@JsonSerializable(nullable: true)
+class SKDownloadWrapper {
+  SKDownloadWrapper({
+    @required this.contentIdentifier,
+    @required this.state,
+    @required this.contentLength,
+    @required this.contentURL,
+    @required this.contentVersion,
+    @required this.transactionID,
+    @required this.progress,
+    @required this.timeRemaining,
+    @required this.downloadTimeUnknown,
+    @required this.error,
+  });
+
+  /// Constructs an instance of this from a key value map of data.
+  ///
+  /// The map needs to have named string keys with values matching the names and
+  /// types of all of the members on this class.
+  /// The `map` parameter must not be null.
+  factory SKDownloadWrapper.fromJson(Map map) {
+    assert(map != null);
+    return _$SKDownloadWrapperFromJson(map);
+  }
+
+  /// Identifies the downloadable content.
+  ///
+  /// It is specified in the App Store Connect when the downloadable content is created.
+  final String contentIdentifier;
+
+  /// The current download state.
+  ///
+  /// When the state changes, one of the [SKTransactionObserverWrapper] subclasses' observing methods should be triggered.
+  /// The developer should properly handle the downloadable content based on the state.
+  final SKDownloadState state;
+
+  /// Length of the content in bytes.
+  final int contentLength;
+
+  /// The URL string of the content.
+  final String contentURL;
+
+  /// Version of the content formatted as a series of dot-separated integers.
+  final String contentVersion;
+
+  /// The transaction ID of the transaction that is associated with the downloadable content.
+  final String transactionID;
+
+  /// The download progress, between 0.0 to 1.0.
+  final double progress;
+
+  /// The estimated time remaining for the download; if no good estimate is able to be made,
+  /// [downloadTimeUnknown] will be set to true.
+  final double timeRemaining;
+
+  /// true if [timeRemaining] cannot be estimated.
+  final bool downloadTimeUnknown;
+
+  /// The error that prevented the downloading; only available if the [transactionState] is [SKPaymentTransactionStateWrapper.failed].
+  final SKError error;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    final SKDownloadWrapper typedOther = other;
+    return typedOther.contentIdentifier == contentIdentifier &&
+        typedOther.state == state &&
+        typedOther.contentLength == contentLength &&
+        typedOther.contentURL == contentURL &&
+        typedOther.contentVersion == contentVersion &&
+        typedOther.transactionID == transactionID &&
+        typedOther.progress == progress &&
+        typedOther.timeRemaining == timeRemaining &&
+        typedOther.downloadTimeUnknown == downloadTimeUnknown &&
+        typedOther.error == error;
+  }
+}
+
+/// Dart wrapper around StoreKit's [SKDownloadState](https://developer.apple.com/documentation/storekit/skdownloadstate?language=objc).
+///
+/// The state a download operation that can be in.
+enum SKDownloadState {
+  /// Indicates that downloadable content is waiting to start.
+  @JsonValue(0)
+  waiting,
+
+  /// The downloadable content is currently being downloaded
+  @JsonValue(1)
+  active,
+
+  /// The app paused the download.
+  @JsonValue(2)
+  pause,
+
+  /// The content is successfully downloaded.
+  @JsonValue(3)
+  finished,
+
+  /// Indicates that some error occurred while the content was being downloaded.
+  @JsonValue(4)
+  failed,
+
+  /// The app canceled the download.
+  @JsonValue(5)
+  cancelled,
+}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.g.dart
new file mode 100644
index 000000000000..cc61e4983728
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.g.dart
@@ -0,0 +1,66 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'sk_download_wrapper.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SKDownloadWrapper _$SKDownloadWrapperFromJson(Map json) {
+  return SKDownloadWrapper(
+      contentIdentifier: json['contentIdentifier'] as String,
+      state: _$enumDecodeNullable(_$SKDownloadStateEnumMap, json['state']),
+      contentLength: json['contentLength'] as int,
+      contentURL: json['contentURL'] as String,
+      contentVersion: json['contentVersion'] as String,
+      transactionID: json['transactionID'] as String,
+      progress: (json['progress'] as num)?.toDouble(),
+      timeRemaining: (json['timeRemaining'] as num)?.toDouble(),
+      downloadTimeUnknown: json['downloadTimeUnknown'] as bool,
+      error: json['error'] == null
+          ? null
+          : SKError.fromJson(json['error'] as Map));
+}
+
+Map<String, dynamic> _$SKDownloadWrapperToJson(SKDownloadWrapper instance) =>
+    <String, dynamic>{
+      'contentIdentifier': instance.contentIdentifier,
+      'state': _$SKDownloadStateEnumMap[instance.state],
+      'contentLength': instance.contentLength,
+      'contentURL': instance.contentURL,
+      'contentVersion': instance.contentVersion,
+      'transactionID': instance.transactionID,
+      'progress': instance.progress,
+      'timeRemaining': instance.timeRemaining,
+      'downloadTimeUnknown': instance.downloadTimeUnknown,
+      'error': instance.error
+    };
+
+T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    throw ArgumentError('A value must be provided. Supported values: '
+        '${enumValues.values.join(', ')}');
+  }
+  return enumValues.entries
+      .singleWhere((e) => e.value == source,
+          orElse: () => throw ArgumentError(
+              '`$source` is not one of the supported values: '
+              '${enumValues.values.join(', ')}'))
+      .key;
+}
+
+T _$enumDecodeNullable<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    return null;
+  }
+  return _$enumDecode<T>(enumValues, source);
+}
+
+const _$SKDownloadStateEnumMap = <SKDownloadState, dynamic>{
+  SKDownloadState.waiting: 0,
+  SKDownloadState.active: 1,
+  SKDownloadState.pause: 2,
+  SKDownloadState.finished: 3,
+  SKDownloadState.failed: 4,
+  SKDownloadState.cancelled: 5
+};
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
index d9a1e45f8987..c4dda97688cd 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
@@ -8,7 +8,9 @@ import 'package:flutter/foundation.dart';
 import 'package:in_app_purchase/src/channel.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:flutter/services.dart';
-import './sk_product_wrapper.dart';
+import 'sk_payment_transaction_wrappers.dart';
+import 'sk_product_wrapper.dart';
+import 'sk_download_wrapper.dart';
 
 part 'sk_payment_queue_wrapper.g.dart';
 
@@ -177,274 +179,6 @@ class SKPaymentQueueWrapper {
   }
 }
 
-/// This class is Dart wrapper around [SKTransactionObserver](https://developer.apple.com/documentation/storekit/skpaymenttransactionobserver?language=objc).
-///
-/// Must be subclassed. Must be instantiated and added to the [SKPaymentQueueWrapper] via [SKPaymentQueueWrapper.setTransactionObserver] at the app launch.
-abstract class SKTransactionObserverWrapper {
-  /// Triggered when any transactions are updated.
-  void updatedTransactions({List<SKPaymentTransactionWrapper> transactions});
-
-  /// Triggered when any transactions are removed from the payment queue.
-  void removedTransactions({List<SKPaymentTransactionWrapper> transactions});
-
-  /// Triggered when there is an error while restoring transactions.
-  void restoreCompletedTransactions({Error error});
-
-  /// Triggered when payment queue has finished sending restored transactions.
-  void paymentQueueRestoreCompletedTransactionsFinished();
-
-  /// Triggered when any download objects are updated.
-  void updatedDownloads({List<SKDownloadWrapper> downloads});
-
-  /// Triggered when a user initiated an in-app purchase from App Store.
-  ///
-  /// Return `true` to continue the transaction in your app. If you have multiple [SKTransactionObserverWrapper]s, the transaction
-  /// will continue if one [SKTransactionObserverWrapper] has [shouldAddStorePayment] returning `true`.
-  /// Return `false` to defer or cancel the transaction. For example, you may need to defer a transaction if the user is in the middle of onboarding.
-  /// You can also continue the transaction later by calling
-  /// [addPayment] with the [SKPaymentWrapper] object you get from this method.
-  bool shouldAddStorePayment(
-      {SKPaymentWrapper payment, SKProductWrapper product});
-}
-
-/// Dart wrapper around StoreKit's
-/// [SKPaymentTransactionState](https://developer.apple.com/documentation/storekit/skpaymenttransactionstate?language=objc).
-///
-/// Presents the state of a transaction. Used for handling a transaction based on different state.
-enum SKPaymentTransactionStateWrapper {
-  /// Indicates the transaction is being processed in App Store.
-  ///
-  /// You should update your UI to indicate the process and waiting for the transaction to update to the next state.
-  /// Never complete a transaction that is in purchasing state.
-  @JsonValue(0)
-  purchasing,
-
-  /// The payment is processed. You should provide the user the content they purchased.
-  @JsonValue(1)
-  purchased,
-
-  /// The transaction failed. Check the [SKPaymentTransactionWrapper.error] property from [SKPaymentTransactionWrapper] for details.
-  @JsonValue(2)
-  failed,
-
-  /// This transaction restores the content previously purchased by the user. The previous transaction information can be
-  /// obtained in [SKPaymentTransactionWrapper.originalTransaction] from [SKPaymentTransactionWrapper].
-  @JsonValue(3)
-  restored,
-
-  /// The transaction is in the queue but pending external action. Wait for another callback to get the final state.
-  ///
-  /// You should update your UI to indicate the process and waiting for the transaction to update to the next state.
-  @JsonValue(4)
-  deferred,
-}
-
-/// Dart wrapper around StoreKit's [SKPaymentTransaction](https://developer.apple.com/documentation/storekit/skpaymenttransaction?language=objc).
-///
-/// Created when a payment is added to the [SKPaymentQueueWrapper]. Transactions are delivered to your app when a payment is finished processing.
-/// Completed transactions provide a receipt and a transaction identifier that the app can use to save a permanent record of the processed payment.
-@JsonSerializable(nullable: true)
-class SKPaymentTransactionWrapper {
-  SKPaymentTransactionWrapper({
-    @required this.payment,
-    @required this.transactionState,
-    @required this.originalTransaction,
-    @required this.transactionTimeStamp,
-    @required this.transactionIdentifier,
-    @required this.downloads,
-    @required this.error,
-  });
-
-  /// Constructs an instance of this from a key value map of data.
-  ///
-  /// The map needs to have named string keys with values matching the names and
-  /// types of all of the members on this class.
-  /// The `map` parameter must not be null.
-  @visibleForTesting
-  factory SKPaymentTransactionWrapper.fromJson(Map map) {
-    if (map == null) {
-      return null;
-    }
-    return _$SKPaymentTransactionWrapperFromJson(map);
-  }
-
-  /// Current transaction state.
-  final SKPaymentTransactionStateWrapper transactionState;
-
-  /// The payment that is created and added to the payment queue which generated this transaction.
-  final SKPaymentWrapper payment;
-
-  /// The original Transaction, only available if the [transactionState] is [SKPaymentTransactionStateWrapper.restored].
-  ///
-  /// When the [transactionState] is [SKPaymentTransactionStateWrapper.restored], the current transaction object holds a new
-  /// [transactionIdentifier].
-  final SKPaymentTransactionWrapper originalTransaction;
-
-  /// The timestamp of the transaction.
-  ///
-  /// Milliseconds since epoch.
-  /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased] or [SKPaymentTransactionStateWrapper.restored].
-  final double transactionTimeStamp;
-
-  /// The unique string identifer of the transaction.
-  ///
-  /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased] or [SKPaymentTransactionStateWrapper.restored].
-  /// You may wish to record this string as part of an audit trail for App Store purchases.
-  /// The value of this string corresponds to the same property in the receipt.
-  final String transactionIdentifier;
-
-  /// An array of the [SKDownloadWrapper] object of this transaction.
-  ///
-  /// Only available if the transaction contains downloadable contents.
-  ///
-  /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased].
-  /// Must be used to download the transaction's content before the transaction is finished.
-  final List<SKDownloadWrapper> downloads;
-
-  /// The error object, only available if the [transactionState] is [SKPaymentTransactionStateWrapper.failed].
-  final SKError error;
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(other, this)) {
-      return true;
-    }
-    if (other.runtimeType != runtimeType) {
-      return false;
-    }
-    final SKPaymentTransactionWrapper typedOther = other;
-    return typedOther.payment == payment &&
-        typedOther.transactionState == transactionState &&
-        typedOther.originalTransaction == originalTransaction &&
-        typedOther.transactionTimeStamp == transactionTimeStamp &&
-        typedOther.transactionIdentifier == transactionIdentifier &&
-        DeepCollectionEquality().equals(typedOther.downloads, downloads) &&
-        typedOther.error == error;
-  }
-}
-
-/// Dart wrapper around StoreKit's [SKDownloadState](https://developer.apple.com/documentation/storekit/skdownloadstate?language=objc).
-///
-/// The state a download operation that can be in.
-enum SKDownloadState {
-  /// Indicates that downloadable content is waiting to start.
-  @JsonValue(0)
-  waiting,
-
-  /// The downloadable content is currently being downloaded
-  @JsonValue(1)
-  active,
-
-  /// The app paused the download.
-  @JsonValue(2)
-  pause,
-
-  /// The content is successfully downloaded.
-  @JsonValue(3)
-  finished,
-
-  /// Indicates that some error occurred while the content was being downloaded.
-  @JsonValue(4)
-  failed,
-
-  /// The app canceled the download.
-  @JsonValue(5)
-  cancelled,
-}
-
-/// Dart wrapper around StoreKit's [SKDownload](https://developer.apple.com/documentation/storekit/skdownload?language=objc).
-///
-/// When a product is created in the App Store Connect, one or more download contents can be associated with it.
-/// When the product is purchased, a List of [SKDownloadWrapper] object will be present in an [SKPaymentTransactionWrapper] object.
-/// To download the content, add the [SKDownloadWrapper] objects to the payment queue and wait for the content to be downloaded.
-/// You can also read the [contentURL] to get the URL of the downloaded content after the download completes.
-/// Note that all downloaded files must be processed before the completion of the [SKPaymentTransactionWrapper]([SKPaymentQueueWrapper.finishTransaction] is called).
-/// After the transaction is complete, any [SKDownloadWrapper] object in the transaction will not be able to be added to the payment queue
-/// and the [contentURL ]of the [SKDownloadWrapper] object will be invalid.
-@JsonSerializable(nullable: true)
-class SKDownloadWrapper {
-  SKDownloadWrapper({
-    @required this.contentIdentifier,
-    @required this.state,
-    @required this.contentLength,
-    @required this.contentURL,
-    @required this.contentVersion,
-    @required this.transactionID,
-    @required this.progress,
-    @required this.timeRemaining,
-    @required this.downloadTimeUnknown,
-    @required this.error,
-  });
-
-  /// Constructs an instance of this from a key value map of data.
-  ///
-  /// The map needs to have named string keys with values matching the names and
-  /// types of all of the members on this class.
-  /// The `map` parameter must not be null.
-  @visibleForTesting
-  factory SKDownloadWrapper.fromJson(Map map) {
-    assert(map != null);
-    return _$SKDownloadWrapperFromJson(map);
-  }
-
-  /// Identifies the downloadable content.
-  ///
-  /// It is specified in the App Store Connect when the downloadable content is created.
-  final String contentIdentifier;
-
-  /// The current download state.
-  ///
-  /// When the state changes, one of the [SKTransactionObserverWrapper] subclasses' observing methods should be triggered.
-  /// The developer should properly handle the downloadable content based on the state.
-  final SKDownloadState state;
-
-  /// Length of the content in bytes.
-  final int contentLength;
-
-  /// The URL string of the content.
-  final String contentURL;
-
-  /// Version of the content formatted as a series of dot-separated integers.
-  final String contentVersion;
-
-  /// The transaction ID of the transaction that is associated with the downloadable content.
-  final String transactionID;
-
-  /// The download progress, between 0.0 to 1.0.
-  final double progress;
-
-  /// The estimated time remaining for the download; if no good estimate is able to be made,
-  /// [downloadTimeUnknown] will be set to true.
-  final double timeRemaining;
-
-  /// true if [timeRemaining] cannot be estimated.
-  final bool downloadTimeUnknown;
-
-  /// The error that prevented the downloading; only available if the [transactionState] is [SKPaymentTransactionStateWrapper.failed].
-  final SKError error;
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(other, this)) {
-      return true;
-    }
-    if (other.runtimeType != runtimeType) {
-      return false;
-    }
-    final SKDownloadWrapper typedOther = other;
-    return typedOther.contentIdentifier == contentIdentifier &&
-        typedOther.state == state &&
-        typedOther.contentLength == contentLength &&
-        typedOther.contentURL == contentURL &&
-        typedOther.contentVersion == contentVersion &&
-        typedOther.transactionID == transactionID &&
-        typedOther.progress == progress &&
-        typedOther.timeRemaining == timeRemaining &&
-        typedOther.downloadTimeUnknown == downloadTimeUnknown &&
-        typedOther.error == error;
-  }
-}
-
 /// Dart wrapper around StoreKit's [NSError](https://developer.apple.com/documentation/foundation/nserror?language=objc).
 @JsonSerializable(nullable: true)
 class SKError {
@@ -456,7 +190,6 @@ class SKError {
   /// The map needs to have named string keys with values matching the names and
   /// types of all of the members on this class.
   /// The `map` parameter must not be null.
-  @visibleForTesting
   factory SKError.fromJson(Map map) {
     assert(map != null);
     return _$SKErrorFromJson(map);
@@ -506,7 +239,6 @@ class SKPaymentWrapper {
   /// The map needs to have named string keys with values matching the names and
   /// types of all of the members on this class.
   /// The `map` parameter must not be null.
-  @visibleForTesting
   factory SKPaymentWrapper.fromJson(Map map) {
     assert(map != null);
     return _$SKPaymentWrapperFromJson(map);
@@ -564,4 +296,7 @@ class SKPaymentWrapper {
         typedOther.simulatesAskToBuyInSandbox == simulatesAskToBuyInSandbox &&
         typedOther.requestData == requestData;
   }
+
+  @override
+  String toString() => _$SKPaymentWrapperToJson(this).toString();
 }
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
index 6853e54a6be1..3452a5b6cc2a 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
@@ -6,89 +6,21 @@ part of 'sk_payment_queue_wrapper.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-SKPaymentTransactionWrapper _$SKPaymentTransactionWrapperFromJson(Map json) {
-  return SKPaymentTransactionWrapper(
-      payment: json['payment'] == null
-          ? null
-          : SKPaymentWrapper.fromJson(json['payment'] as Map),
-      transactionState: _$enumDecodeNullable(
-          _$SKPaymentTransactionStateWrapperEnumMap, json['transactionState']),
-      originalTransaction: json['originalTransaction'] == null
-          ? null
-          : SKPaymentTransactionWrapper.fromJson(
-              json['originalTransaction'] as Map),
-      transactionTimeStamp: (json['transactionTimeStamp'] as num)?.toDouble(),
-      transactionIdentifier: json['transactionIdentifier'] as String,
-      downloads: (json['downloads'] as List)
-          ?.map((e) => e == null ? null : SKDownloadWrapper.fromJson(e as Map))
-          ?.toList(),
-      error: json['error'] == null
-          ? null
-          : SKError.fromJson(json['error'] as Map));
-}
-
-T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
-  if (source == null) {
-    throw ArgumentError('A value must be provided. Supported values: '
-        '${enumValues.values.join(', ')}');
-  }
-  return enumValues.entries
-      .singleWhere((e) => e.value == source,
-          orElse: () => throw ArgumentError(
-              '`$source` is not one of the supported values: '
-              '${enumValues.values.join(', ')}'))
-      .key;
-}
-
-T _$enumDecodeNullable<T>(Map<T, dynamic> enumValues, dynamic source) {
-  if (source == null) {
-    return null;
-  }
-  return _$enumDecode<T>(enumValues, source);
-}
-
-const _$SKPaymentTransactionStateWrapperEnumMap =
-    <SKPaymentTransactionStateWrapper, dynamic>{
-  SKPaymentTransactionStateWrapper.purchasing: 0,
-  SKPaymentTransactionStateWrapper.purchased: 1,
-  SKPaymentTransactionStateWrapper.failed: 2,
-  SKPaymentTransactionStateWrapper.restored: 3,
-  SKPaymentTransactionStateWrapper.deferred: 4
-};
-
-SKDownloadWrapper _$SKDownloadWrapperFromJson(Map json) {
-  return SKDownloadWrapper(
-      contentIdentifier: json['contentIdentifier'] as String,
-      state: _$enumDecodeNullable(_$SKDownloadStateEnumMap, json['state']),
-      contentLength: json['contentLength'] as int,
-      contentURL: json['contentURL'] as String,
-      contentVersion: json['contentVersion'] as String,
-      transactionID: json['transactionID'] as String,
-      progress: (json['progress'] as num)?.toDouble(),
-      timeRemaining: (json['timeRemaining'] as num)?.toDouble(),
-      downloadTimeUnknown: json['downloadTimeUnknown'] as bool,
-      error: json['error'] == null
-          ? null
-          : SKError.fromJson(json['error'] as Map));
-}
-
-const _$SKDownloadStateEnumMap = <SKDownloadState, dynamic>{
-  SKDownloadState.waiting: 0,
-  SKDownloadState.active: 1,
-  SKDownloadState.pause: 2,
-  SKDownloadState.finished: 3,
-  SKDownloadState.failed: 4,
-  SKDownloadState.cancelled: 5
-};
-
 SKError _$SKErrorFromJson(Map json) {
   return SKError(
       code: json['code'] as int,
       domain: json['domain'] as String,
-      userInfo:
-          (json['userInfo'] as Map)?.map((k, e) => MapEntry(k as String, e)));
+      userInfo: (json['userInfo'] as Map)?.map(
+        (k, e) => MapEntry(k as String, e),
+      ));
 }
 
+Map<String, dynamic> _$SKErrorToJson(SKError instance) => <String, dynamic>{
+      'code': instance.code,
+      'domain': instance.domain,
+      'userInfo': instance.userInfo
+    };
+
 SKPaymentWrapper _$SKPaymentWrapperFromJson(Map json) {
   return SKPaymentWrapper(
       productIdentifier: json['productIdentifier'] as String,
@@ -97,3 +29,12 @@ SKPaymentWrapper _$SKPaymentWrapperFromJson(Map json) {
       quantity: json['quantity'] as int,
       simulatesAskToBuyInSandbox: json['simulatesAskToBuyInSandbox'] as bool);
 }
+
+Map<String, dynamic> _$SKPaymentWrapperToJson(SKPaymentWrapper instance) =>
+    <String, dynamic>{
+      'productIdentifier': instance.productIdentifier,
+      'applicationUsername': instance.applicationUsername,
+      'requestData': instance.requestData,
+      'quantity': instance.quantity,
+      'simulatesAskToBuyInSandbox': instance.simulatesAskToBuyInSandbox
+    };
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
new file mode 100644
index 000000000000..566eac32ed18
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
@@ -0,0 +1,160 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:collection/collection.dart';
+import 'package:flutter/foundation.dart';
+import 'package:json_annotation/json_annotation.dart';
+import 'sk_product_wrapper.dart';
+import 'sk_download_wrapper.dart';
+import 'sk_payment_queue_wrapper.dart';
+
+part 'sk_payment_transaction_wrappers.g.dart';
+
+/// This class is Dart wrapper around [SKTransactionObserver](https://developer.apple.com/documentation/storekit/skpaymenttransactionobserver?language=objc).
+///
+/// Must be subclassed. Must be instantiated and added to the [SKPaymentQueueWrapper] via [SKPaymentQueueWrapper.setTransactionObserver] at the app launch.
+abstract class SKTransactionObserverWrapper {
+  /// Triggered when any transactions are updated.
+  void updatedTransactions({List<SKPaymentTransactionWrapper> transactions});
+
+  /// Triggered when any transactions are removed from the payment queue.
+  void removedTransactions({List<SKPaymentTransactionWrapper> transactions});
+
+  /// Triggered when there is an error while restoring transactions.
+  void restoreCompletedTransactions({Error error});
+
+  /// Triggered when payment queue has finished sending restored transactions.
+  void paymentQueueRestoreCompletedTransactionsFinished();
+
+  /// Triggered when any download objects are updated.
+  void updatedDownloads({List<SKDownloadWrapper> downloads});
+
+  /// Triggered when a user initiated an in-app purchase from App Store.
+  ///
+  /// Return `true` to continue the transaction in your app. If you have multiple [SKTransactionObserverWrapper]s, the transaction
+  /// will continue if one [SKTransactionObserverWrapper] has [shouldAddStorePayment] returning `true`.
+  /// Return `false` to defer or cancel the transaction. For example, you may need to defer a transaction if the user is in the middle of onboarding.
+  /// You can also continue the transaction later by calling
+  /// [addPayment] with the [SKPaymentWrapper] object you get from this method.
+  bool shouldAddStorePayment(
+      {SKPaymentWrapper payment, SKProductWrapper product});
+}
+
+/// Dart wrapper around StoreKit's
+/// [SKPaymentTransactionState](https://developer.apple.com/documentation/storekit/skpaymenttransactionstate?language=objc).
+///
+/// Presents the state of a transaction. Used for handling a transaction based on different state.
+enum SKPaymentTransactionStateWrapper {
+  /// Indicates the transaction is being processed in App Store.
+  ///
+  /// You should update your UI to indicate the process and waiting for the transaction to update to the next state.
+  /// Never complete a transaction that is in purchasing state.
+  @JsonValue(0)
+  purchasing,
+
+  /// The payment is processed. You should provide the user the content they purchased.
+  @JsonValue(1)
+  purchased,
+
+  /// The transaction failed. Check the [SKPaymentTransactionWrapper.error] property from [SKPaymentTransactionWrapper] for details.
+  @JsonValue(2)
+  failed,
+
+  /// This transaction restores the content previously purchased by the user. The previous transaction information can be
+  /// obtained in [SKPaymentTransactionWrapper.originalTransaction] from [SKPaymentTransactionWrapper].
+  @JsonValue(3)
+  restored,
+
+  /// The transaction is in the queue but pending external action. Wait for another callback to get the final state.
+  ///
+  /// You should update your UI to indicate the process and waiting for the transaction to update to the next state.
+  @JsonValue(4)
+  deferred,
+}
+
+/// Dart wrapper around StoreKit's [SKPaymentTransaction](https://developer.apple.com/documentation/storekit/skpaymenttransaction?language=objc).
+///
+/// Created when a payment is added to the [SKPaymentQueueWrapper]. Transactions are delivered to your app when a payment is finished processing.
+/// Completed transactions provide a receipt and a transaction identifier that the app can use to save a permanent record of the processed payment.
+@JsonSerializable(nullable: true)
+class SKPaymentTransactionWrapper {
+  SKPaymentTransactionWrapper({
+    @required this.payment,
+    @required this.transactionState,
+    @required this.originalTransaction,
+    @required this.transactionTimeStamp,
+    @required this.transactionIdentifier,
+    @required this.downloads,
+    @required this.error,
+  });
+
+  /// Constructs an instance of this from a key value map of data.
+  ///
+  /// The map needs to have named string keys with values matching the names and
+  /// types of all of the members on this class.
+  /// The `map` parameter must not be null.
+  factory SKPaymentTransactionWrapper.fromJson(Map map) {
+    if (map == null) {
+      return null;
+    }
+    return _$SKPaymentTransactionWrapperFromJson(map);
+  }
+
+  /// Current transaction state.
+  final SKPaymentTransactionStateWrapper transactionState;
+
+  /// The payment that is created and added to the payment queue which generated this transaction.
+  final SKPaymentWrapper payment;
+
+  /// The original Transaction, only available if the [transactionState] is [SKPaymentTransactionStateWrapper.restored].
+  ///
+  /// When the [transactionState] is [SKPaymentTransactionStateWrapper.restored], the current transaction object holds a new
+  /// [transactionIdentifier].
+  final SKPaymentTransactionWrapper originalTransaction;
+
+  /// The timestamp of the transaction.
+  ///
+  /// Milliseconds since epoch.
+  /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased] or [SKPaymentTransactionStateWrapper.restored].
+  final double transactionTimeStamp;
+
+  /// The unique string identifer of the transaction.
+  ///
+  /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased] or [SKPaymentTransactionStateWrapper.restored].
+  /// You may wish to record this string as part of an audit trail for App Store purchases.
+  /// The value of this string corresponds to the same property in the receipt.
+  final String transactionIdentifier;
+
+  /// An array of the [SKDownloadWrapper] object of this transaction.
+  ///
+  /// Only available if the transaction contains downloadable contents.
+  ///
+  /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased].
+  /// Must be used to download the transaction's content before the transaction is finished.
+  final List<SKDownloadWrapper> downloads;
+
+  /// The error object, only available if the [transactionState] is [SKPaymentTransactionStateWrapper.failed].
+  final SKError error;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    final SKPaymentTransactionWrapper typedOther = other;
+    return typedOther.payment == payment &&
+        typedOther.transactionState == transactionState &&
+        typedOther.originalTransaction == originalTransaction &&
+        typedOther.transactionTimeStamp == transactionTimeStamp &&
+        typedOther.transactionIdentifier == transactionIdentifier &&
+        DeepCollectionEquality().equals(typedOther.downloads, downloads) &&
+        typedOther.error == error;
+  }
+
+  @override
+  String toString() => _$SKPaymentTransactionWrapperToJson(this).toString();
+}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.g.dart
new file mode 100644
index 000000000000..cbd72da1702e
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.g.dart
@@ -0,0 +1,70 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'sk_payment_transaction_wrappers.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SKPaymentTransactionWrapper _$SKPaymentTransactionWrapperFromJson(Map json) {
+  return SKPaymentTransactionWrapper(
+      payment: json['payment'] == null
+          ? null
+          : SKPaymentWrapper.fromJson(json['payment'] as Map),
+      transactionState: _$enumDecodeNullable(
+          _$SKPaymentTransactionStateWrapperEnumMap, json['transactionState']),
+      originalTransaction: json['originalTransaction'] == null
+          ? null
+          : SKPaymentTransactionWrapper.fromJson(
+              json['originalTransaction'] as Map),
+      transactionTimeStamp: (json['transactionTimeStamp'] as num)?.toDouble(),
+      transactionIdentifier: json['transactionIdentifier'] as String,
+      downloads: (json['downloads'] as List)
+          ?.map((e) => e == null ? null : SKDownloadWrapper.fromJson(e as Map))
+          ?.toList(),
+      error: json['error'] == null
+          ? null
+          : SKError.fromJson(json['error'] as Map));
+}
+
+Map<String, dynamic> _$SKPaymentTransactionWrapperToJson(
+        SKPaymentTransactionWrapper instance) =>
+    <String, dynamic>{
+      'transactionState':
+          _$SKPaymentTransactionStateWrapperEnumMap[instance.transactionState],
+      'payment': instance.payment,
+      'originalTransaction': instance.originalTransaction,
+      'transactionTimeStamp': instance.transactionTimeStamp,
+      'transactionIdentifier': instance.transactionIdentifier,
+      'downloads': instance.downloads,
+      'error': instance.error
+    };
+
+T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    throw ArgumentError('A value must be provided. Supported values: '
+        '${enumValues.values.join(', ')}');
+  }
+  return enumValues.entries
+      .singleWhere((e) => e.value == source,
+          orElse: () => throw ArgumentError(
+              '`$source` is not one of the supported values: '
+              '${enumValues.values.join(', ')}'))
+      .key;
+}
+
+T _$enumDecodeNullable<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    return null;
+  }
+  return _$enumDecode<T>(enumValues, source);
+}
+
+const _$SKPaymentTransactionStateWrapperEnumMap =
+    <SKPaymentTransactionStateWrapper, dynamic>{
+  SKPaymentTransactionStateWrapper.purchasing: 0,
+  SKPaymentTransactionStateWrapper.purchased: 1,
+  SKPaymentTransactionStateWrapper.failed: 2,
+  SKPaymentTransactionStateWrapper.restored: 3,
+  SKPaymentTransactionStateWrapper.deferred: 4
+};
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_wrapper.dart
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_wrapper.dart
@@ -0,0 +1 @@
+
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
index 633f6b4ba1b9..b748d483cee3 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
@@ -325,7 +325,7 @@ class SKPriceLocaleWrapper {
   /// The `map` parameter must not be null.
   factory SKPriceLocaleWrapper.fromJson(Map map) {
     assert(map != null, 'Map must not be null.');
-    return _$PriceLocaleWrapperFromJson(map);
+    return _$SKPriceLocaleWrapperFromJson(map);
   }
 
   ///The currency symbol for the locale, e.g. $ for US locale.
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
index 04895402730a..0efb2cd8ad13 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
@@ -16,14 +16,28 @@ SkProductResponseWrapper _$SkProductResponseWrapperFromJson(Map json) {
           .toList());
 }
 
+Map<String, dynamic> _$SkProductResponseWrapperToJson(
+        SkProductResponseWrapper instance) =>
+    <String, dynamic>{
+      'products': instance.products,
+      'invalidProductIdentifiers': instance.invalidProductIdentifiers
+    };
+
 SKProductSubscriptionPeriodWrapper _$SKProductSubscriptionPeriodWrapperFromJson(
     Map json) {
   return SKProductSubscriptionPeriodWrapper(
       numberOfUnits: json['numberOfUnits'] as int,
-      unit:
-          _$enumDecodeNullable(_$SubscriptionPeriodUnitEnumMap, json['unit']));
+      unit: _$enumDecodeNullable(
+          _$SKSubscriptionPeriodUnitEnumMap, json['unit']));
 }
 
+Map<String, dynamic> _$SKProductSubscriptionPeriodWrapperToJson(
+        SKProductSubscriptionPeriodWrapper instance) =>
+    <String, dynamic>{
+      'numberOfUnits': instance.numberOfUnits,
+      'unit': _$SKSubscriptionPeriodUnitEnumMap[instance.unit]
+    };
+
 T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
   if (source == null) {
     throw ArgumentError('A value must be provided. Supported values: '
@@ -44,7 +58,7 @@ T _$enumDecodeNullable<T>(Map<T, dynamic> enumValues, dynamic source) {
   return _$enumDecode<T>(enumValues, source);
 }
 
-const _$SubscriptionPeriodUnitEnumMap = <SKSubscriptionPeriodUnit, dynamic>{
+const _$SKSubscriptionPeriodUnitEnumMap = <SKSubscriptionPeriodUnit, dynamic>{
   SKSubscriptionPeriodUnit.day: 0,
   SKSubscriptionPeriodUnit.week: 1,
   SKSubscriptionPeriodUnit.month: 2,
@@ -59,14 +73,25 @@ SKProductDiscountWrapper _$SKProductDiscountWrapperFromJson(Map json) {
           : SKPriceLocaleWrapper.fromJson(json['priceLocale'] as Map),
       numberOfPeriods: json['numberOfPeriods'] as int,
       paymentMode: _$enumDecodeNullable(
-          _$ProductDiscountPaymentModeEnumMap, json['paymentMode']),
+          _$SKProductDiscountPaymentModeEnumMap, json['paymentMode']),
       subscriptionPeriod: json['subscriptionPeriod'] == null
           ? null
           : SKProductSubscriptionPeriodWrapper.fromJson(
               json['subscriptionPeriod'] as Map));
 }
 
-const _$ProductDiscountPaymentModeEnumMap =
+Map<String, dynamic> _$SKProductDiscountWrapperToJson(
+        SKProductDiscountWrapper instance) =>
+    <String, dynamic>{
+      'price': instance.price,
+      'priceLocale': instance.priceLocale,
+      'numberOfPeriods': instance.numberOfPeriods,
+      'paymentMode':
+          _$SKProductDiscountPaymentModeEnumMap[instance.paymentMode],
+      'subscriptionPeriod': instance.subscriptionPeriod
+    };
+
+const _$SKProductDiscountPaymentModeEnumMap =
     <SKProductDiscountPaymentMode, dynamic>{
   SKProductDiscountPaymentMode.payAsYouGo: 0,
   SKProductDiscountPaymentMode.payUpFront: 1,
@@ -99,6 +124,25 @@ SKProductWrapper _$SKProductWrapperFromJson(Map json) {
               json['introductoryPrice'] as Map));
 }
 
-SKPriceLocaleWrapper _$PriceLocaleWrapperFromJson(Map json) {
+Map<String, dynamic> _$SKProductWrapperToJson(SKProductWrapper instance) =>
+    <String, dynamic>{
+      'productIdentifier': instance.productIdentifier,
+      'localizedTitle': instance.localizedTitle,
+      'localizedDescription': instance.localizedDescription,
+      'priceLocale': instance.priceLocale,
+      'downloadContentVersion': instance.downloadContentVersion,
+      'subscriptionGroupIdentifier': instance.subscriptionGroupIdentifier,
+      'price': instance.price,
+      'downloadable': instance.downloadable,
+      'downloadContentLengths': instance.downloadContentLengths,
+      'subscriptionPeriod': instance.subscriptionPeriod,
+      'introductoryPrice': instance.introductoryPrice
+    };
+
+SKPriceLocaleWrapper _$SKPriceLocaleWrapperFromJson(Map json) {
   return SKPriceLocaleWrapper(currencySymbol: json['currencySymbol'] as String);
 }
+
+Map<String, dynamic> _$SKPriceLocaleWrapperToJson(
+        SKPriceLocaleWrapper instance) =>
+    <String, dynamic>{'currencySymbol': instance.currencySymbol};
diff --git a/packages/in_app_purchase/lib/store_kit_wrappers.dart b/packages/in_app_purchase/lib/store_kit_wrappers.dart
index c2a770e6ac8e..b5a21b5defb4 100644
--- a/packages/in_app_purchase/lib/store_kit_wrappers.dart
+++ b/packages/in_app_purchase/lib/store_kit_wrappers.dart
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+export 'src/store_kit_wrappers/sk_download_wrapper.dart';
 export 'src/store_kit_wrappers/sk_payment_queue_wrapper.dart';
+export 'src/store_kit_wrappers/sk_payment_transaction_wrappers.dart';
 export 'src/store_kit_wrappers/sk_product_wrapper.dart';
+export 'src/store_kit_wrappers/sk_receipt_manager.dart';
 export 'src/store_kit_wrappers/sk_request_maker.dart';
-export 'src/store_kit_wrappers//sk_receipt_manager.dart';

From 6ccd778f67fbe119194c6d7c37d998e1bb225bc3 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Fri, 22 Mar 2019 14:54:40 -0700
Subject: [PATCH 246/410] [webview_flutter] Create WebView client depending on
 version and hasDelegate (#1360)

---
 packages/webview_flutter/CHANGELOG.md         |  4 ++
 .../webviewflutter/FlutterWebView.java        | 10 ++-
 .../webviewflutter/FlutterWebViewClient.java  | 65 +++++++++++++++----
 packages/webview_flutter/pubspec.yaml         |  2 +-
 4 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 813ab33f426c..81801b80c969 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.5+2
+
+* Fix crash from `NavigationDelegate` on later versions of Android.
+
 ## 0.3.5+1
 
 * Fix a bug where updates to onPageFinished were ignored.
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index 070ba74a9669..9db7d5ef41da 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -10,6 +10,7 @@
 import android.view.View;
 import android.webkit.WebStorage;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
@@ -41,8 +42,6 @@ public class FlutterWebView implements PlatformView, MethodCallHandler {
       registerJavaScriptChannelNames((List<String>) params.get(JS_CHANNEL_NAMES_FIELD));
     }
 
-    webView.setWebViewClient(flutterWebViewClient);
-
     if (params.containsKey("initialUrl")) {
       String url = (String) params.get("initialUrl");
       webView.loadUrl(url);
@@ -186,7 +185,12 @@ private void applySettings(Map<String, Object> settings) {
           updateJsMode((Integer) settings.get(key));
           break;
         case "hasNavigationDelegate":
-          flutterWebViewClient.setHasNavigationDelegate((boolean) settings.get(key));
+          final boolean hasNavigationDelegate = (boolean) settings.get(key);
+
+          final WebViewClient webViewClient =
+              flutterWebViewClient.createWebViewClient(hasNavigationDelegate);
+
+          webView.setWebViewClient(webViewClient);
           break;
         default:
           throw new IllegalArgumentException("Unknown WebView setting: " + key);
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java
index fef2258d5dd8..e7b10ce2257b 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java
@@ -9,6 +9,8 @@
 import android.util.Log;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import androidx.annotation.NonNull;
 import androidx.webkit.WebViewClientCompat;
 import io.flutter.plugin.common.MethodChannel;
 import java.util.HashMap;
@@ -18,7 +20,7 @@
 // shouldOverrideUrlLoading(WebView view, WebResourceRequest request)
 // invoked by the webview on older Android devices, without it pages that use iframes will
 // be broken when a navigationDelegate is set on Android version earlier than N.
-class FlutterWebViewClient extends WebViewClientCompat {
+class FlutterWebViewClient {
   private static final String TAG = "FlutterWebViewClient";
   private final MethodChannel methodChannel;
   private boolean hasNavigationDelegate;
@@ -27,13 +29,8 @@ class FlutterWebViewClient extends WebViewClientCompat {
     this.methodChannel = methodChannel;
   }
 
-  void setHasNavigationDelegate(boolean hasNavigationDelegate) {
-    this.hasNavigationDelegate = hasNavigationDelegate;
-  }
-
   @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-  @Override
-  public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+  private boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
     if (!hasNavigationDelegate) {
       return false;
     }
@@ -53,8 +50,7 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
     return request.isForMainFrame();
   }
 
-  @Override
-  public boolean shouldOverrideUrlLoading(WebView view, String url) {
+  private boolean shouldOverrideUrlLoading(WebView view, String url) {
     if (!hasNavigationDelegate) {
       return false;
     }
@@ -70,8 +66,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
     return true;
   }
 
-  @Override
-  public void onPageFinished(WebView view, String url) {
+  private void onPageFinished(WebView view, String url) {
     Map<String, Object> args = new HashMap<>();
     args.put("url", url);
     methodChannel.invokeMethod("onPageFinished", args);
@@ -90,6 +85,54 @@ private void notifyOnNavigationRequest(
     }
   }
 
+  // This method attempts to avoid using WebViewClientCompat due to bug
+  // https://bugs.chromium.org/p/chromium/issues/detail?id=925887. Also, see
+  // https://github.com/flutter/flutter/issues/29446.
+  WebViewClient createWebViewClient(boolean hasNavigationDelegate) {
+    this.hasNavigationDelegate = hasNavigationDelegate;
+
+    if (!hasNavigationDelegate || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+      return internalCreateWebViewClient();
+    }
+
+    return internalCreateWebViewClientCompat();
+  }
+
+  private WebViewClient internalCreateWebViewClient() {
+    return new WebViewClient() {
+      @TargetApi(Build.VERSION_CODES.N)
+      @Override
+      public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+        return FlutterWebViewClient.this.shouldOverrideUrlLoading(view, request);
+      }
+
+      @Override
+      public void onPageFinished(WebView view, String url) {
+        FlutterWebViewClient.this.onPageFinished(view, url);
+      }
+    };
+  }
+
+  private WebViewClientCompat internalCreateWebViewClientCompat() {
+    return new WebViewClientCompat() {
+      @Override
+      public boolean shouldOverrideUrlLoading(
+          @NonNull WebView view, @NonNull WebResourceRequest request) {
+        return FlutterWebViewClient.this.shouldOverrideUrlLoading(view, request);
+      }
+
+      @Override
+      public boolean shouldOverrideUrlLoading(WebView view, String url) {
+        return FlutterWebViewClient.this.shouldOverrideUrlLoading(view, url);
+      }
+
+      @Override
+      public void onPageFinished(WebView view, String url) {
+        FlutterWebViewClient.this.onPageFinished(view, url);
+      }
+    };
+  }
+
   private static class OnNavigationRequestResult implements MethodChannel.Result {
     private final String url;
     private final Map<String, String> headers;
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index e21da558eb95..bf707a876f9c 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.5+1
+version: 0.3.5+2
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From 04033879181f284cf7511db6067048e08a792e3e Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 22 Mar 2019 15:26:11 -0700
Subject: [PATCH 247/410] remove white spaces to make git happy (#1385)

---
 packages/firebase_crashlytics/example/README.md                | 2 +-
 packages/firebase_crashlytics/ios/firebase_crashlytics.podspec | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/firebase_crashlytics/example/README.md b/packages/firebase_crashlytics/example/README.md
index 5e2d12023ec4..6b284ab319b7 100644
--- a/packages/firebase_crashlytics/example/README.md
+++ b/packages/firebase_crashlytics/example/README.md
@@ -10,7 +10,7 @@ This example initially uses a default project for CI purposes. You must
 replace the default project with your own so that you can review the error
 reports submitted to the Firebase console.
 
-See [docs](https://firebase.google.com/docs/flutter/setup) for how to add 
+See [docs](https://firebase.google.com/docs/flutter/setup) for how to add
 Firebase to a Flutter project.
 
 For further help getting started with Flutter, view our online
diff --git a/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec b/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec
index 0cecb9fccaa6..d52b05ca9b32 100644
--- a/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec
+++ b/packages/firebase_crashlytics/ios/firebase_crashlytics.podspec
@@ -21,4 +21,3 @@ A new flutter plugin project.
   s.dependency 'Crashlytics'
   s.dependency 'Firebase/Core'
 end
-

From f67e09d4e52ea73c046915175cf638c5a2762207 Mon Sep 17 00:00:00 2001
From: Ben Konyi <bkonyi@google.com>
Date: Mon, 25 Mar 2019 09:30:24 -0700
Subject: [PATCH 248/410] Send success result for `AlarmService.initialized`
 method call (#1384)

---
 .../plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
index 594ac35908c7..30c69334bb10 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
@@ -53,6 +53,7 @@ public void onMethodCall(MethodCall call, Result result) {
         result.success(true);
       } else if (method.equals("AlarmService.initialized")) {
         AlarmService.onInitialized();
+        result.success(true);
       } else if (method.equals("Alarm.periodic")) {
         periodic((JSONArray) arguments);
         result.success(true);

From fa7d5c83487c911c972494483295bc501b44e9ca Mon Sep 17 00:00:00 2001
From: Arthur Thompson <arthur.thompson.jr@gmail.com>
Date: Mon, 25 Mar 2019 18:13:24 -0700
Subject: [PATCH 249/410] Add Crashlytics plugin to FlutterFire docs (#1394)

* Add Crashlytics plugin to FlutterFire docs
---
 FlutterFire.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/FlutterFire.md b/FlutterFire.md
index 387ad5de0e27..aaff76251097 100644
--- a/FlutterFire.md
+++ b/FlutterFire.md
@@ -20,6 +20,7 @@ The plugins are still under development, and some APIs might not be available ye
 | [firebase_analytics][analytics_pub] | ![pub package][analytics_badge] | [Firebase Analytics][analytics_product] | [`packages/firebase_analytics`][analytics_code] |
 | [firebase_auth][auth_pub] | ![pub package][auth_badge] | [Firebase Authentication][auth_product] | [`packages/firebase_auth`][auth_code] |
 | [firebase_core][core_pub] | ![pub package][core_badge] | [Firebase Core][core_product] | [`packages/firebase_core`][core_code] |
+| [firebase_crashlytics][crash_pub] | ![pub package][crash_badge] | [Firebase Crashlytics][crash_product] | [`packages/firebase_crashlytics`][crash_code] |
 | [firebase_database][database_pub] | ![pub package][database_badge] | [Firebase Realtime Database][database_product] | [`packages/firebase_database`][database_code] |
 | [firebase_dynamic_links][dynamic_links_pub] | ![pub package][dynamic_links_badge] | [Firebase Dynamic Links][dynamic_links_product] | [`packages/firebase_dynamic_links`][dynamic_links_code] |
 | [firebase_messaging][messaging_pub] | ![pub package][messaging_badge] | [Firebase Cloud Messaging][messaging_product] | [`packages/firebase_messaging`][messaging_code] |
@@ -48,6 +49,11 @@ The plugins are still under development, and some APIs might not be available ye
 [core_code]: https://github.com/flutter/plugins/tree/master/packages/firebase_core
 [core_badge]: https://img.shields.io/pub/v/firebase_core.svg
 
+[crash_pub]: https://pub.dartlang.org/packages/firebase_crashlytics
+[crash_product]: https://firebase.google.com/products/crashlytics/
+[crash_code]: https://github.com/flutter/plugins/tree/master/packages/firebase_crashlytics
+[crash_badge]: https://img.shields.io/pub/v/firebase_crashlytics.svg
+
 [database_pub]: https://pub.dartlang.org/packages/firebase_database
 [database_product]: https://firebase.google.com/products/database/
 [database_code]: https://github.com/flutter/plugins/tree/master/packages/firebase_database

From 5d2b94e5e2a89cf703c10565feab4af5f52b2519 Mon Sep 17 00:00:00 2001
From: Arthur Thompson <arthur.thompson.jr@gmail.com>
Date: Mon, 25 Mar 2019 18:18:36 -0700
Subject: [PATCH 250/410] Add Crashlytics plugin to opensource list (#1395)

---
 .opensource/project.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.opensource/project.json b/.opensource/project.json
index e171f0b3042a..19da74a6cafd 100644
--- a/.opensource/project.json
+++ b/.opensource/project.json
@@ -12,6 +12,7 @@
     "packages/firebase_analytics/README.md": "Analytics",
     "packages/firebase_auth/README.md": "Authentication",
     "packages/firebase_core/README.md": "Core",
+    "packages/firebase_crashlytics/README.md": "Crashlytics",
     "packages/firebase_database/README.md": "Realtime Database",
     "packages/firebase_dynamic_links/README.md": "Dynamic Links",
     "packages/firebase_messaging/README.md": "Cloud Messaging",

From 5e794c87df7ffbd3e30419fb8b16c8d9d2010641 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirha@google.com>
Date: Fri, 22 Mar 2019 22:51:16 -0700
Subject: [PATCH 251/410] add failing test verifying that only changed markers
 are updated

---
 .../test/marker_updates_test.dart             | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/google_maps_flutter/test/marker_updates_test.dart b/packages/google_maps_flutter/test/marker_updates_test.dart
index e9c099082607..995a77e75963 100644
--- a/packages/google_maps_flutter/test/marker_updates_test.dart
+++ b/packages/google_maps_flutter/test/marker_updates_test.dart
@@ -172,4 +172,32 @@ void main() {
     expect(platformGoogleMap.markersToAdd.first, equals(m1));
     expect(platformGoogleMap.markerIdsToRemove.first, equals(m3.markerId));
   });
+
+  testWidgets(
+    "Partial Update",
+    (WidgetTester tester) async {
+      Marker m1 = Marker(markerId: MarkerId("marker_1"));
+      Marker m2 = Marker(markerId: MarkerId("marker_2"));
+      final Set<Marker> prev = _toSet(m1: m1, m2: m2);
+      m2 = Marker(markerId: MarkerId("marker_2"), draggable: true);
+      final Set<Marker> cur = _toSet(m1: m1, m2: m2);
+
+      await tester.pumpWidget(_mapWithMarkers(prev));
+      await tester.pumpWidget(_mapWithMarkers(cur));
+
+      final FakePlatformGoogleMap platformGoogleMap =
+          fakePlatformViewsController.lastCreatedView;
+
+      expect(platformGoogleMap.markersToChange,
+        <Marker>[m2].toSet()
+      );
+      expect(platformGoogleMap.markerIdsToRemove.isEmpty, true);
+      expect(platformGoogleMap.markersToAdd.isEmpty, true);
+    },
+    // The test is currently broken due to a bug (we're updating all markers
+    // instead of just the ones that were changed):
+    // https://github.com/flutter/flutter/issues/27823
+    // TODO(amirh): enable this test when the issue is fixed.
+    skip: true,
+  );
 }

From 2c6349dab5297c88f9329e3edfdd77590b375dbd Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirha@google.com>
Date: Tue, 26 Mar 2019 09:07:02 -0700
Subject: [PATCH 252/410] fix analyzer warnings

---
 packages/google_maps_flutter/test/marker_updates_test.dart | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/google_maps_flutter/test/marker_updates_test.dart b/packages/google_maps_flutter/test/marker_updates_test.dart
index 995a77e75963..f43fcfa52408 100644
--- a/packages/google_maps_flutter/test/marker_updates_test.dart
+++ b/packages/google_maps_flutter/test/marker_updates_test.dart
@@ -176,7 +176,7 @@ void main() {
   testWidgets(
     "Partial Update",
     (WidgetTester tester) async {
-      Marker m1 = Marker(markerId: MarkerId("marker_1"));
+      final Marker m1 = Marker(markerId: MarkerId("marker_1"));
       Marker m2 = Marker(markerId: MarkerId("marker_2"));
       final Set<Marker> prev = _toSet(m1: m1, m2: m2);
       m2 = Marker(markerId: MarkerId("marker_2"), draggable: true);
@@ -188,9 +188,7 @@ void main() {
       final FakePlatformGoogleMap platformGoogleMap =
           fakePlatformViewsController.lastCreatedView;
 
-      expect(platformGoogleMap.markersToChange,
-        <Marker>[m2].toSet()
-      );
+      expect(platformGoogleMap.markersToChange, _toSet(m2: m2));
       expect(platformGoogleMap.markerIdsToRemove.isEmpty, true);
       expect(platformGoogleMap.markersToAdd.isEmpty, true);
     },

From 393a8d2a5712f59da6db9d275b99813123b30595 Mon Sep 17 00:00:00 2001
From: Ben Konyi <bkonyi@google.com>
Date: Tue, 26 Mar 2019 15:29:30 -0700
Subject: [PATCH 253/410] [android_alarm_manager] Improve error message seen
 when an alarm fires and `AlarmService.setPluginRegistrant` has not been
 called. (#1337)

* Improve error message seen when an alarm fires and `AlarmService.setPluginRegistrant` has not been called.
* Added `PluginRegistrantException`
* Updated README warning that `AlarmService.setPluginRegistrant` must be
  called.
* Bumped version to 0.4.1+4
---
 packages/android_alarm_manager/CHANGELOG.md         |  4 ++++
 packages/android_alarm_manager/README.md            |  3 +++
 .../plugins/androidalarmmanager/AlarmService.java   |  3 +++
 .../AndroidAlarmManagerPlugin.java                  |  2 ++
 .../PluginRegistrantException.java                  | 13 +++++++++++++
 5 files changed, 25 insertions(+)
 create mode 100644 packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/PluginRegistrantException.java

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index 3ddcca9a3c91..31f257c02cb1 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## 0.4.1+4
 
+* Update AlarmService to throw a `PluginRegistrantException` if
+  `AlarmService.setPluginRegistrant` has not been called to set a
+  PluginRegistrantCallback. This improves the error message seen when the
+  `AlarmService.setPluginRegistrant` call is omitted.
 * Updated example to remove dependency on Firebase.
 
 ## 0.4.1+3
diff --git a/packages/android_alarm_manager/README.md b/packages/android_alarm_manager/README.md
index 35a0787c6ab9..75a1e944aed0 100644
--- a/packages/android_alarm_manager/README.md
+++ b/packages/android_alarm_manager/README.md
@@ -89,6 +89,9 @@ Which must be reflected in the application's `AndroidManifest.xml`. E.g.:
         ...
 ```
 
+**Note:** Not calling `AlarmService.setPluginRegistrant` will result in an exception being
+thrown when an alarm eventually fires.
+
 For help getting started with Flutter, view our online
 [documentation](http://flutter.io/).
 
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
index 6d1d3a7b6086..19507c9ddf9e 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
@@ -102,6 +102,9 @@ public static void startAlarmService(Context context, long callbackHandle) {
     // as a background view and does not create a drawing surface.
     sBackgroundFlutterView = new FlutterNativeView(context, true);
     if (mAppBundlePath != null && !sStarted.get()) {
+      if (sPluginRegistrantCallback == null) {
+        throw new PluginRegistrantException();
+      }
       Log.i(TAG, "Starting AlarmService...");
       FlutterRunArguments args = new FlutterRunArguments();
       args.bundlePath = mAppBundlePath;
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
index 30c69334bb10..07825faab197 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
@@ -68,6 +68,8 @@ public void onMethodCall(MethodCall call, Result result) {
       }
     } catch (JSONException e) {
       result.error("error", "JSON error: " + e.getMessage(), null);
+    } catch (PluginRegistrantException e) {
+      result.error("error", "AlarmManager error: " + e.getMessage(), null);
     }
   }
 
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/PluginRegistrantException.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/PluginRegistrantException.java
new file mode 100644
index 000000000000..debcd7ee7529
--- /dev/null
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/PluginRegistrantException.java
@@ -0,0 +1,13 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.androidalarmmanager;
+
+class PluginRegistrantException extends RuntimeException {
+  public PluginRegistrantException() {
+    super(
+        "PluginRegistrantCallback is not set. Did you forget to call "
+            + "AlarmService.setPluginRegistrant? See the README for instructions.");
+  }
+}

From f1174498189ea7a8f6752c567c99dc21585dd415 Mon Sep 17 00:00:00 2001
From: Ben Konyi <bkonyi@google.com>
Date: Tue, 26 Mar 2019 15:34:52 -0700
Subject: [PATCH 254/410] Bump version to 0.4.1+5 (#1404)

---
 packages/android_alarm_manager/CHANGELOG.md | 5 ++++-
 packages/android_alarm_manager/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index 31f257c02cb1..ed05dca60192 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,9 +1,12 @@
-## 0.4.1+4
+## 0.4.1+5
 
 * Update AlarmService to throw a `PluginRegistrantException` if
   `AlarmService.setPluginRegistrant` has not been called to set a
   PluginRegistrantCallback. This improves the error message seen when the
   `AlarmService.setPluginRegistrant` call is omitted.
+
+## 0.4.1+4
+
 * Updated example to remove dependency on Firebase.
 
 ## 0.4.1+3
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index 6e5dc009798f..d637ec17f4bd 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -1,7 +1,7 @@
 name: android_alarm_manager
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.4.1+4
+version: 0.4.1+5
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 

From 4b6f55701778408eafc1f2170822cad516f157b1 Mon Sep 17 00:00:00 2001
From: koji ishii <ko2ic.dev@gmail.com>
Date: Wed, 27 Mar 2019 09:11:56 +0900
Subject: [PATCH 255/410] [firebase_dynamic_links] sometimes got error
 NSPOSIXErrorDomain Code=53 in ios (#1182)

---
 packages/firebase_dynamic_links/CHANGELOG.md        |  4 ++++
 .../FirebaseDynamicLinksPlugin.java                 |  8 ++++++++
 .../ios/Classes/FirebaseDynamicLinksPlugin.m        | 13 ++++++++++++-
 packages/firebase_dynamic_links/pubspec.yaml        |  2 +-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_dynamic_links/CHANGELOG.md b/packages/firebase_dynamic_links/CHANGELOG.md
index 5df11e804c8f..3172546c7f09 100644
--- a/packages/firebase_dynamic_links/CHANGELOG.md
+++ b/packages/firebase_dynamic_links/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.1
+
+* Throw `PlatformException` if there is an error retrieving dynamic link.
+
 ## 0.2.0+4
 
 * Fix crash when receiving `ShortDynamicLink` warnings.
diff --git a/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java b/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
index 6116abd401e6..4d41ad11305c 100644
--- a/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
+++ b/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
@@ -3,6 +3,7 @@
 import android.net.Uri;
 import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.dynamiclinks.DynamicLink;
 import com.google.firebase.dynamiclinks.FirebaseDynamicLinks;
@@ -84,6 +85,13 @@ public void onComplete(@NonNull Task<PendingDynamicLinkData> task) {
                 }
                 result.success(null);
               }
+            })
+        .addOnFailureListener(
+            new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception e) {
+                result.error(e.getClass().getSimpleName(), e.getMessage(), null);
+              }
             });
   }
 
diff --git a/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m b/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
index a1f09beb0881..f9e78f59ab5f 100644
--- a/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
+++ b/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
@@ -10,6 +10,7 @@
 
 @interface FLTFirebaseDynamicLinksPlugin ()
 @property(nonatomic, retain) FIRDynamicLink *dynamicLink;
+@property(nonatomic, retain) FlutterError *flutterError;
 @end
 
 @implementation FLTFirebaseDynamicLinksPlugin
@@ -48,7 +49,13 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
                                  options:options
                               completion:[self createShortLinkCompletion:result]];
   } else if ([@"FirebaseDynamicLinks#retrieveDynamicLink" isEqualToString:call.method]) {
-    result([self retrieveDynamicLink]);
+    NSMutableDictionary *dict = [self retrieveDynamicLink];
+    if (dict == nil && self.flutterError) {
+      result(self.flutterError);
+      self.flutterError = nil;
+    } else {
+      result(dict);
+    }
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -96,9 +103,13 @@ - (BOOL)checkForDynamicLink:(NSURL *)url {
 - (BOOL)application:(UIApplication *)application
     continueUserActivity:(NSUserActivity *)userActivity
       restorationHandler:(void (^)(NSArray *))restorationHandler {
+  usleep(50000);
   BOOL handled = [[FIRDynamicLinks dynamicLinks]
       handleUniversalLink:userActivity.webpageURL
                completion:^(FIRDynamicLink *_Nullable dynamicLink, NSError *_Nullable error) {
+                 if (error) {
+                   self.flutterError = getFlutterError(error);
+                 }
                  self.dynamicLink = dynamicLink;
                }];
   return handled;
diff --git a/packages/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/pubspec.yaml
index 8896dd18c419..e66b1b04c381 100644
--- a/packages/firebase_dynamic_links/pubspec.yaml
+++ b/packages/firebase_dynamic_links/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_dynamic_links
 description: Flutter plugin for Google Dynamic Links for Firebase, an app solution for creating
   and handling links across multiple platforms.
-version: 0.2.0+4
+version: 0.2.1
 
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_dynamic_links

From aaf05ec0175ae1ba7e6b4c5d8646509a6c4a6315 Mon Sep 17 00:00:00 2001
From: Gayan Pathirage <gayanpathirage@gmail.com>
Date: Thu, 28 Mar 2019 03:00:51 +0530
Subject: [PATCH 256/410] [firebase_auth]Fix PhoneCodeAuthRetrievalTimeout
 callback never called (#1398)

---
 packages/firebase_auth/CHANGELOG.md               | 4 ++++
 packages/firebase_auth/lib/src/firebase_auth.dart | 2 +-
 packages/firebase_auth/pubspec.yaml               | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index 83e7fa7111e6..63ad30cfba68 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.2+1
+
+* Fixed bug where `PhoneCodeAutoRetrievalTimeout` callback was never called.g
+
 ## 0.8.2
 
  * Fixed `linkWithCredential` on Android.
diff --git a/packages/firebase_auth/lib/src/firebase_auth.dart b/packages/firebase_auth/lib/src/firebase_auth.dart
index b47556b84241..98b7720ba01d 100644
--- a/packages/firebase_auth/lib/src/firebase_auth.dart
+++ b/packages/firebase_auth/lib/src/firebase_auth.dart
@@ -429,7 +429,7 @@ class FirebaseAuth {
       case 'phoneCodeAutoRetrievalTimeout':
         final int handle = call.arguments['handle'];
         final PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout =
-            _phoneAuthCallbacks[handle]['PhoneCodeAutoRetrievealTimeout'];
+            _phoneAuthCallbacks[handle]['PhoneCodeAuthRetrievalTimeout'];
         final String verificationId = call.arguments['verificationId'];
         codeAutoRetrievalTimeout(verificationId);
         break;
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 19438d63b132..cb8eaff02495 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.2"
+version: 0.8.2+1
 
 flutter:
   plugin:

From ee9939efa33e597e36cfe37b7e06560df1e3a844 Mon Sep 17 00:00:00 2001
From: FD <ninnepinne@gmail.com>
Date: Wed, 27 Mar 2019 22:32:48 +0100
Subject: [PATCH 257/410] [firebase_crashlytics] Update README code example
 (#1407)

---
 packages/firebase_crashlytics/CHANGELOG.md | 4 ++++
 packages/firebase_crashlytics/README.md    | 4 ++--
 packages/firebase_crashlytics/pubspec.yaml | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/firebase_crashlytics/CHANGELOG.md b/packages/firebase_crashlytics/CHANGELOG.md
index 57ac2b58d9d8..11cecdc6e57a 100644
--- a/packages/firebase_crashlytics/CHANGELOG.md
+++ b/packages/firebase_crashlytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.2+1
+
+* Update variable name `enableInDevMode` in README.
+
 ## 0.0.2
 
 * Updated the iOS podspec to a static framework to support compatibility with Swift plugins.
diff --git a/packages/firebase_crashlytics/README.md b/packages/firebase_crashlytics/README.md
index 858f8b77dad5..71161efa99db 100644
--- a/packages/firebase_crashlytics/README.md
+++ b/packages/firebase_crashlytics/README.md
@@ -83,7 +83,7 @@ void main() {
   // This is only to be used for confirming that reports are being
   // submitted as expected. It is not intended to be used for everyday
   // development.
-  Crashlytics.instance.reportInDevMode = true;
+  Crashlytics.instance.enableInDevMode = true;
 
   // Pass all uncaught errors to Crashlytics.
   FlutterError.onError = (FlutterErrorDetails details) {
@@ -101,4 +101,4 @@ for a complete sample app using the Firebase Crashlytics.
 ## Issues and feedback
 
 Please file [issues](https://github.com/flutter/flutter/issues/new)
-to send feedback or report a bug. Thank you!
\ No newline at end of file
+to send feedback or report a bug. Thank you!
diff --git a/packages/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/pubspec.yaml
index d19c114fba83..6ad71000ac94 100644
--- a/packages/firebase_crashlytics/pubspec.yaml
+++ b/packages/firebase_crashlytics/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_crashlytics
 description: Flutter plugin for Firebase Crashlytics. It reports uncaught errors to the
   Firebase console.
-version: 0.0.2
+version: 0.0.2+1
 author: Flutter Team <flutter-dev@google.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_crashlytics
 

From 5d9801d556c13c7179ca027cb009ad4b11e99ea3 Mon Sep 17 00:00:00 2001
From: Kush Vatsa <kushvatsa793@gmail.com>
Date: Thu, 28 Mar 2019 03:14:07 +0530
Subject: [PATCH 258/410] Added firebase_crashlytics for Readme. (#1388)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 8cb4e83395aa..4d401a7df395 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,7 @@ These are the available plugins in this repository.
 | [firebase_analytics](./packages/firebase_analytics/) | [![pub package](https://img.shields.io/pub/v/firebase_analytics.svg)](https://pub.dartlang.org/packages/firebase_analytics) |
 | [firebase_auth](./packages/firebase_auth/) | [![pub package](https://img.shields.io/pub/v/firebase_auth.svg)](https://pub.dartlang.org/packages/firebase_auth) |
 | [firebase_core](./packages/firebase_core/) | [![pub package](https://img.shields.io/pub/v/firebase_core.svg)](https://pub.dartlang.org/packages/firebase_core) |
+| [firebase_crashlytics](./packages/firebase_crashlytics/) | [![pub package](https://img.shields.io/pub/v/firebase_crashlytics.svg)](https://pub.dartlang.org/packages/firebase_crashlytics) |
 | [firebase_database](./packages/firebase_database/) | [![pub package](https://img.shields.io/pub/v/firebase_database.svg)](https://pub.dartlang.org/packages/firebase_database) |
 | [firebase_dynamic_links](./packages/firebase_dynamic_links/) | [![pub package](https://img.shields.io/pub/v/firebase_dynamic_links.svg)](https://pub.dartlang.org/packages/firebase_dynamic_links) |
 | [firebase_messaging](./packages/firebase_messaging/) | [![pub package](https://img.shields.io/pub/v/firebase_messaging.svg)](https://pub.dartlang.org/packages/firebase_messaging) |

From 5cceb553925a2acd5ab7add651bf55dbc4cf1a72 Mon Sep 17 00:00:00 2001
From: Ali EP <p30arena@gmail.com>
Date: Thu, 28 Mar 2019 02:51:09 +0430
Subject: [PATCH 259/410] [camera] Fixes (#29925) (#1393)

---
 packages/camera/CHANGELOG.md                           |  4 ++++
 .../java/io/flutter/plugins/camera/CameraPlugin.java   | 10 ++++++----
 packages/camera/pubspec.yaml                           |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 346afa736fc4..933d24cb6100 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.3+1
+
+* Catch additional `Exception`s from Android and throw as `CameraException`s.
+
 ## 0.4.3
 
 * Add capability to prepare the capture session for video recording on iOS.
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index a204c1749264..2fafb7d5c3a1 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -689,8 +689,10 @@ public void onConfigured(@NonNull CameraCaptureSession cameraCaptureSession) {
                       captureRequestBuilder.build(), null, null);
                   mediaRecorder.start();
                   result.success(null);
-                } catch (CameraAccessException e) {
-                  result.error("cameraAccess", e.getMessage(), null);
+                } catch (CameraAccessException
+                    | IllegalStateException
+                    | IllegalArgumentException e) {
+                  result.error("cameraException", e.getMessage(), null);
                 }
               }
 
@@ -752,7 +754,7 @@ public void onConfigured(@NonNull CameraCaptureSession session) {
                 captureRequestBuilder.set(
                     CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO);
                 cameraCaptureSession.setRepeatingRequest(captureRequestBuilder.build(), null, null);
-              } catch (CameraAccessException e) {
+              } catch (CameraAccessException | IllegalStateException | IllegalArgumentException e) {
                 sendErrorEvent(e.getMessage());
               }
             }
@@ -797,7 +799,7 @@ public void onConfigured(@NonNull CameraCaptureSession session) {
                 captureRequestBuilder.set(
                     CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO);
                 cameraCaptureSession.setRepeatingRequest(captureRequestBuilder.build(), null, null);
-              } catch (CameraAccessException e) {
+              } catch (CameraAccessException | IllegalStateException | IllegalArgumentException e) {
                 sendErrorEvent(e.getMessage());
               }
             }
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index d3ecc1bc5eeb..a323aa94ad6d 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.4.3
+version: 0.4.3+1
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From 8bf52f4a7afa2ce8b348aa450ebf1cedc86941be Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirha@google.com>
Date: Tue, 26 Mar 2019 21:51:26 -0700
Subject: [PATCH 260/410] [webview_flutter] Add initial e2e tests

---
 packages/webview_flutter/example/pubspec.yaml |  2 +
 .../example/test_driver/webview.dart          | 59 +++++++++++++++++++
 .../example/test_driver/webview_test.dart     | 13 ++++
 3 files changed, 74 insertions(+)
 create mode 100644 packages/webview_flutter/example/test_driver/webview.dart
 create mode 100644 packages/webview_flutter/example/test_driver/webview_test.dart

diff --git a/packages/webview_flutter/example/pubspec.yaml b/packages/webview_flutter/example/pubspec.yaml
index 633a03ac18f5..6ec8a1ddd0ea 100644
--- a/packages/webview_flutter/example/pubspec.yaml
+++ b/packages/webview_flutter/example/pubspec.yaml
@@ -15,6 +15,8 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_driver:
+    sdk: flutter
 
 flutter:
   uses-material-design: true
diff --git a/packages/webview_flutter/example/test_driver/webview.dart b/packages/webview_flutter/example/test_driver/webview.dart
new file mode 100644
index 000000000000..19f4b6fa9f3f
--- /dev/null
+++ b/packages/webview_flutter/example/test_driver/webview.dart
@@ -0,0 +1,59 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter/widgets.dart';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+
+void main() {
+  final Completer<String> allTestsCompleter = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => allTestsCompleter.future);
+  tearDownAll(() => allTestsCompleter.complete(null));
+
+  group('$WebView', () {
+    test('initalUrl', () async {
+      final Completer<WebViewController> controllerCompleter =
+          Completer<WebViewController>();
+      runApp(
+        Directionality(
+          textDirection: TextDirection.ltr,
+          child: WebView(
+            key: GlobalKey(),
+            initialUrl: 'https://flutter.dev/',
+            onWebViewCreated: (WebViewController controller) {
+              controllerCompleter.complete(controller);
+            },
+          ),
+        ),
+      );
+      final WebViewController controller = await controllerCompleter.future;
+      final String currentUrl = await controller.currentUrl();
+      expect(currentUrl, 'https://flutter.dev/');
+    });
+
+    test('loadUrl', () async {
+      final Completer<WebViewController> controllerCompleter =
+          Completer<WebViewController>();
+      runApp(
+        Directionality(
+          textDirection: TextDirection.ltr,
+          child: WebView(
+            key: GlobalKey(),
+            initialUrl: 'https://flutter.dev/',
+            onWebViewCreated: (WebViewController controller) {
+              controllerCompleter.complete(controller);
+            },
+          ),
+        ),
+      );
+      final WebViewController controller = await controllerCompleter.future;
+      await controller.loadUrl('https://www.google.com/');
+      final String currentUrl = await controller.currentUrl();
+      expect(currentUrl, 'https://www.google.com/');
+    });
+  });
+}
diff --git a/packages/webview_flutter/example/test_driver/webview_test.dart b/packages/webview_flutter/example/test_driver/webview_test.dart
new file mode 100644
index 000000000000..b0d3305cd652
--- /dev/null
+++ b/packages/webview_flutter/example/test_driver/webview_test.dart
@@ -0,0 +1,13 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter_driver/flutter_driver.dart';
+
+Future<void> main() async {
+  final FlutterDriver driver = await FlutterDriver.connect();
+  await driver.requestData(null, timeout: const Duration(minutes: 1));
+  driver.close();
+}

From 316cd283bb270c8496739a964d81f4ebba59b70b Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirha@google.com>
Date: Tue, 26 Mar 2019 22:59:06 -0700
Subject: [PATCH 261/410] remove test group

---
 .../example/test_driver/webview.dart          | 74 +++++++++----------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/packages/webview_flutter/example/test_driver/webview.dart b/packages/webview_flutter/example/test_driver/webview.dart
index 19f4b6fa9f3f..9bb70d9d1e37 100644
--- a/packages/webview_flutter/example/test_driver/webview.dart
+++ b/packages/webview_flutter/example/test_driver/webview.dart
@@ -14,46 +14,44 @@ void main() {
   enableFlutterDriverExtension(handler: (_) => allTestsCompleter.future);
   tearDownAll(() => allTestsCompleter.complete(null));
 
-  group('$WebView', () {
-    test('initalUrl', () async {
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
-      runApp(
-        Directionality(
-          textDirection: TextDirection.ltr,
-          child: WebView(
-            key: GlobalKey(),
-            initialUrl: 'https://flutter.dev/',
-            onWebViewCreated: (WebViewController controller) {
-              controllerCompleter.complete(controller);
-            },
-          ),
+  test('initalUrl', () async {
+    final Completer<WebViewController> controllerCompleter =
+        Completer<WebViewController>();
+    runApp(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: WebView(
+          key: GlobalKey(),
+          initialUrl: 'https://flutter.dev/',
+          onWebViewCreated: (WebViewController controller) {
+            controllerCompleter.complete(controller);
+          },
         ),
-      );
-      final WebViewController controller = await controllerCompleter.future;
-      final String currentUrl = await controller.currentUrl();
-      expect(currentUrl, 'https://flutter.dev/');
-    });
+      ),
+    );
+    final WebViewController controller = await controllerCompleter.future;
+    final String currentUrl = await controller.currentUrl();
+    expect(currentUrl, 'https://flutter.dev/');
+  });
 
-    test('loadUrl', () async {
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
-      runApp(
-        Directionality(
-          textDirection: TextDirection.ltr,
-          child: WebView(
-            key: GlobalKey(),
-            initialUrl: 'https://flutter.dev/',
-            onWebViewCreated: (WebViewController controller) {
-              controllerCompleter.complete(controller);
-            },
-          ),
+  test('loadUrl', () async {
+    final Completer<WebViewController> controllerCompleter =
+        Completer<WebViewController>();
+    runApp(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: WebView(
+          key: GlobalKey(),
+          initialUrl: 'https://flutter.dev/',
+          onWebViewCreated: (WebViewController controller) {
+            controllerCompleter.complete(controller);
+          },
         ),
-      );
-      final WebViewController controller = await controllerCompleter.future;
-      await controller.loadUrl('https://www.google.com/');
-      final String currentUrl = await controller.currentUrl();
-      expect(currentUrl, 'https://www.google.com/');
-    });
+      ),
+    );
+    final WebViewController controller = await controllerCompleter.future;
+    await controller.loadUrl('https://www.google.com/');
+    final String currentUrl = await controller.currentUrl();
+    expect(currentUrl, 'https://www.google.com/');
   });
 }

From e93bf4f800ddefb5555728d720fb642134cc005e Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirha@google.com>
Date: Wed, 27 Mar 2019 10:02:09 -0700
Subject: [PATCH 262/410] add driver as a dependency in the root pubspec

---
 packages/webview_flutter/pubspec.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index bf707a876f9c..db694ed4697e 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -15,6 +15,8 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_driver:
+    sdk: flutter
 
 flutter:
   plugin:

From a3a277a3fd8d384bf7544a595130d49f23581f14 Mon Sep 17 00:00:00 2001
From: Katarina Sheremet <ksheremet@users.noreply.github.com>
Date: Thu, 28 Mar 2019 02:14:34 +0100
Subject: [PATCH 263/410] [firebase_analytics] Add 'loginMethod' parameter to
 logLogin() (#1008)

* Add 'loginMethod' parameter to logLogin()
---
 AUTHORS                                            |  1 +
 packages/firebase_analytics/CHANGELOG.md           |  4 ++++
 .../firebase_analytics/lib/firebase_analytics.dart | 14 +++++++++-----
 packages/firebase_analytics/pubspec.yaml           |  2 +-
 .../test/firebase_analytics_test.dart              | 12 ++++++++----
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 7d26d11e1d4c..8602e9060e44 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,3 +26,4 @@ Sarthak Verma <sarthak@artiosys.com>
 Mike Diarmid <mike@invertase.io>
 Invertase <oss@invertase.io>
 Elliot Hesp <elliot@invertase.io>
+Katarina Sheremet <katarina@sheremet.ch>
diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index b13e21e93f5f..db657f83efa4 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.0
+
+* Add Login event support
+
 ## 2.0.3
 
 * Add resetAnalyticsData method
diff --git a/packages/firebase_analytics/lib/firebase_analytics.dart b/packages/firebase_analytics/lib/firebase_analytics.dart
index 02e4dc5c4cda..7d7379b2ac42 100755
--- a/packages/firebase_analytics/lib/firebase_analytics.dart
+++ b/packages/firebase_analytics/lib/firebase_analytics.dart
@@ -4,10 +4,9 @@
 
 import 'dart:async';
 
-import 'package:meta/meta.dart';
-
-import 'package:flutter/services.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+import 'package:meta/meta.dart';
 
 /// Firebase Analytics API.
 class FirebaseAnalytics {
@@ -471,8 +470,13 @@ class FirebaseAnalytics {
   /// has logged in.
   ///
   /// See: https://firebase.google.com/docs/reference/android/com/google/firebase/analytics/FirebaseAnalytics.Event.html#LOGIN
-  Future<void> logLogin() {
-    return logEvent(name: 'login');
+  Future<void> logLogin({String loginMethod}) {
+    return logEvent(
+      name: 'login',
+      parameters: filterOutNulls(<String, dynamic>{
+        _METHOD: loginMethod,
+      }),
+    );
   }
 
   /// Logs the standard `post_score` event.
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index 852f88e02d87..9fe68292360a 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 2.0.3
+version: 2.1.0
 
 flutter:
   plugin:
diff --git a/packages/firebase_analytics/test/firebase_analytics_test.dart b/packages/firebase_analytics/test/firebase_analytics_test.dart
index 13c731421662..a6880fe7e62a 100755
--- a/packages/firebase_analytics/test/firebase_analytics_test.dart
+++ b/packages/firebase_analytics/test/firebase_analytics_test.dart
@@ -4,13 +4,11 @@
 
 import 'dart:async';
 
+import 'package:firebase_analytics/firebase_analytics.dart';
+import 'package:flutter/services.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 
-import 'package:flutter/services.dart';
-
-import 'package:firebase_analytics/firebase_analytics.dart';
-
 void main() {
   group('filterOutNulls', () {
     test('filters out null values', () {
@@ -233,6 +231,12 @@ void main() {
 
     smokeTest('login', () => analytics.logLogin());
 
+    smokeTest(
+        'login',
+        () => analytics.logLogin(
+              loginMethod: 'email',
+            ));
+
     smokeTest(
         'post_score',
         () => analytics.logPostScore(

From 5fba4906250082c0ec89ade148bdadcaf3144ca3 Mon Sep 17 00:00:00 2001
From: Artem Sheremet <dot.doom@gmail.com>
Date: Thu, 28 Mar 2019 02:15:13 +0100
Subject: [PATCH 264/410] [firebase_auth] Make providerId 'const String' for
 easier use in switch statements (#1292)

* Make providerId 'const String' to use in "case"
---
 packages/firebase_auth/CHANGELOG.md                       | 8 ++++++--
 .../lib/src/auth_provider/email_auth_provider.dart        | 2 +-
 .../lib/src/auth_provider/facebook_auth_provider.dart     | 2 +-
 .../lib/src/auth_provider/github_auth_provider.dart       | 2 +-
 .../lib/src/auth_provider/google_auth_provider.dart       | 2 +-
 .../lib/src/auth_provider/phone_auth_provider.dart        | 2 +-
 .../lib/src/auth_provider/twitter_auth_provider.dart      | 2 +-
 packages/firebase_auth/pubspec.yaml                       | 2 +-
 8 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index 63ad30cfba68..eb751dee4dda 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,10 +1,14 @@
+## 0.8.3
+
+* Make providerId 'const String' to use in 'case' statement.
+
 ## 0.8.2+1
 
-* Fixed bug where `PhoneCodeAutoRetrievalTimeout` callback was never called.g
+* Fixed bug where `PhoneCodeAutoRetrievalTimeout` callback was never called.
 
 ## 0.8.2
 
- * Fixed `linkWithCredential` on Android.
+* Fixed `linkWithCredential` on Android.
 
 ## 0.8.1+5
 
diff --git a/packages/firebase_auth/lib/src/auth_provider/email_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/email_auth_provider.dart
index b458c7ae7d93..6150f0043f44 100644
--- a/packages/firebase_auth/lib/src/auth_provider/email_auth_provider.dart
+++ b/packages/firebase_auth/lib/src/auth_provider/email_auth_provider.dart
@@ -5,7 +5,7 @@
 part of firebase_auth;
 
 class EmailAuthProvider {
-  static final String providerId = 'password';
+  static const String providerId = 'password';
 
   static AuthCredential getCredential({
     String email,
diff --git a/packages/firebase_auth/lib/src/auth_provider/facebook_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/facebook_auth_provider.dart
index eb23403a13c6..e52233e1ff0b 100644
--- a/packages/firebase_auth/lib/src/auth_provider/facebook_auth_provider.dart
+++ b/packages/firebase_auth/lib/src/auth_provider/facebook_auth_provider.dart
@@ -5,7 +5,7 @@
 part of firebase_auth;
 
 class FacebookAuthProvider {
-  static final String providerId = 'facebook.com';
+  static const String providerId = 'facebook.com';
 
   static AuthCredential getCredential({String accessToken}) {
     return AuthCredential._(
diff --git a/packages/firebase_auth/lib/src/auth_provider/github_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/github_auth_provider.dart
index 73e09d93d57c..418f6f646544 100644
--- a/packages/firebase_auth/lib/src/auth_provider/github_auth_provider.dart
+++ b/packages/firebase_auth/lib/src/auth_provider/github_auth_provider.dart
@@ -5,7 +5,7 @@
 part of firebase_auth;
 
 class GithubAuthProvider {
-  static final String providerId = 'github.com';
+  static const String providerId = 'github.com';
 
   static AuthCredential getCredential({@required String token}) {
     return AuthCredential._(providerId, <String, String>{'token': token});
diff --git a/packages/firebase_auth/lib/src/auth_provider/google_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/google_auth_provider.dart
index b61e04eb72de..891bbeb46e5a 100644
--- a/packages/firebase_auth/lib/src/auth_provider/google_auth_provider.dart
+++ b/packages/firebase_auth/lib/src/auth_provider/google_auth_provider.dart
@@ -5,7 +5,7 @@
 part of firebase_auth;
 
 class GoogleAuthProvider {
-  static final String providerId = 'google.com';
+  static const String providerId = 'google.com';
 
   static AuthCredential getCredential({
     @required String idToken,
diff --git a/packages/firebase_auth/lib/src/auth_provider/phone_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/phone_auth_provider.dart
index 91e5bd2291a8..9ff5d94eacf4 100644
--- a/packages/firebase_auth/lib/src/auth_provider/phone_auth_provider.dart
+++ b/packages/firebase_auth/lib/src/auth_provider/phone_auth_provider.dart
@@ -5,7 +5,7 @@
 part of firebase_auth;
 
 class PhoneAuthProvider {
-  static final String providerId = 'phone';
+  static const String providerId = 'phone';
 
   static AuthCredential getCredential({
     @required String verificationId,
diff --git a/packages/firebase_auth/lib/src/auth_provider/twitter_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/twitter_auth_provider.dart
index a565a1e8bee6..7a9656e33116 100644
--- a/packages/firebase_auth/lib/src/auth_provider/twitter_auth_provider.dart
+++ b/packages/firebase_auth/lib/src/auth_provider/twitter_auth_provider.dart
@@ -5,7 +5,7 @@
 part of firebase_auth;
 
 class TwitterAuthProvider {
-  static final String providerId = 'twitter.com';
+  static const String providerId = 'twitter.com';
 
   static AuthCredential getCredential({
     @required String authToken,
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index cb8eaff02495..aa9953f60837 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: 0.8.2+1
+version: "0.8.3"
 
 flutter:
   plugin:

From d4fd64f5409c74ebc7f00141c1330c71e17e5036 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 29 Mar 2019 09:47:43 -0700
Subject: [PATCH 265/410] [Cloud_firestore]add type params for invokeMethod
 calls. (#1414)

Bump min flutter version to 1.2.0.
Add template type parameter for invokeMethod calls.
Updated invokeMethod and invokeMethod to using invokeListMethod and invokeMapMethod if any.

flutter/flutter#26431
---
 packages/cloud_firestore/CHANGELOG.md         |  5 +++
 .../lib/src/document_reference.dart           | 31 +++++--------------
 .../cloud_firestore/lib/src/firestore.dart    | 21 +++++--------
 packages/cloud_firestore/lib/src/query.dart   | 16 +++-------
 .../cloud_firestore/lib/src/transaction.dart  | 23 ++++----------
 .../cloud_firestore/lib/src/write_batch.dart  | 25 +++------------
 packages/cloud_firestore/pubspec.yaml         |  4 +--
 7 files changed, 36 insertions(+), 89 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 09a5cd81433b..9229b38d8f8d 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.9.7+2
+
+* Bump the minimum Flutter version to 1.2.0.
+* Add template type parameter to `invokeMethod` calls.
+
 ## 0.9.7+1
 
 * Update README with example of getting a document.
diff --git a/packages/cloud_firestore/lib/src/document_reference.dart b/packages/cloud_firestore/lib/src/document_reference.dart
index 62f95252af7d..7f103d3fd769 100644
--- a/packages/cloud_firestore/lib/src/document_reference.dart
+++ b/packages/cloud_firestore/lib/src/document_reference.dart
@@ -40,10 +40,7 @@ class DocumentReference {
   /// If [merge] is true, the provided data will be merged into an
   /// existing document instead of overwriting.
   Future<void> setData(Map<String, dynamic> data, {bool merge = false}) {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    return Firestore.channel.invokeMethod(
+    return Firestore.channel.invokeMethod<void>(
       'DocumentReference#setData',
       <String, dynamic>{
         'app': firestore.app.name,
@@ -61,10 +58,7 @@ class DocumentReference {
   ///
   /// If no document exists yet, the update will fail.
   Future<void> updateData(Map<String, dynamic> data) {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    return Firestore.channel.invokeMethod(
+    return Firestore.channel.invokeMethod<void>(
       'DocumentReference#updateData',
       <String, dynamic>{
         'app': firestore.app.name,
@@ -78,10 +72,8 @@ class DocumentReference {
   ///
   /// If no document exists, the read will return null.
   Future<DocumentSnapshot> get() async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    final Map<dynamic, dynamic> data = await Firestore.channel.invokeMethod(
+    final Map<String, dynamic> data =
+        await Firestore.channel.invokeMapMethod<String, dynamic>(
       'DocumentReference#get',
       <String, dynamic>{'app': firestore.app.name, 'path': path},
     );
@@ -94,10 +86,7 @@ class DocumentReference {
 
   /// Deletes the document referred to by this [DocumentReference].
   Future<void> delete() {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    return Firestore.channel.invokeMethod(
+    return Firestore.channel.invokeMethod<void>(
       'DocumentReference#delete',
       <String, dynamic>{'app': firestore.app.name, 'path': path},
     );
@@ -120,10 +109,7 @@ class DocumentReference {
     StreamController<DocumentSnapshot> controller; // ignore: close_sinks
     controller = StreamController<DocumentSnapshot>.broadcast(
       onListen: () {
-        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-        // https://github.com/flutter/flutter/issues/26431
-        // ignore: strong_mode_implicit_dynamic_method
-        _handle = Firestore.channel.invokeMethod(
+        _handle = Firestore.channel.invokeMethod<int>(
           'Query#addDocumentListener',
           <String, dynamic>{
             'app': firestore.app.name,
@@ -136,10 +122,7 @@ class DocumentReference {
       },
       onCancel: () {
         _handle.then((int handle) async {
-          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-          // https://github.com/flutter/flutter/issues/26431
-          // ignore: strong_mode_implicit_dynamic_method
-          await Firestore.channel.invokeMethod(
+          await Firestore.channel.invokeMethod<void>(
             'Query#removeListener',
             <String, dynamic>{'handle': handle},
           );
diff --git a/packages/cloud_firestore/lib/src/firestore.dart b/packages/cloud_firestore/lib/src/firestore.dart
index 42639d140bfe..27c90ff599e8 100644
--- a/packages/cloud_firestore/lib/src/firestore.dart
+++ b/packages/cloud_firestore/lib/src/firestore.dart
@@ -110,25 +110,21 @@ class Firestore {
         'Transaction timeout must be more than 0 milliseconds');
     final int transactionId = _transactionHandlerId++;
     _transactionHandlers[transactionId] = transactionHandler;
-    final Map<dynamic, dynamic> result = await channel
-        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-        // https://github.com/flutter/flutter/issues/26431
-        // ignore: strong_mode_implicit_dynamic_method
-        .invokeMethod('Firestore#runTransaction', <String, dynamic>{
+    final Map<String, dynamic> result = await channel
+        .invokeMapMethod<String, dynamic>(
+            'Firestore#runTransaction', <String, dynamic>{
       'app': app.name,
       'transactionId': transactionId,
       'transactionTimeout': timeout.inMilliseconds
     });
-    return result?.cast<String, dynamic>() ?? <String, dynamic>{};
+    return result ?? <String, dynamic>{};
   }
 
   @deprecated
   Future<void> enablePersistence(bool enable) async {
     assert(enable != null);
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    await channel.invokeMethod('Firestore#enablePersistence', <String, dynamic>{
+    await channel
+        .invokeMethod<void>('Firestore#enablePersistence', <String, dynamic>{
       'app': app.name,
       'enable': enable,
     });
@@ -139,10 +135,7 @@ class Firestore {
       String host,
       bool sslEnabled,
       bool timestampsInSnapshotsEnabled}) async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    await channel.invokeMethod('Firestore#settings', <String, dynamic>{
+    await channel.invokeMethod<void>('Firestore#settings', <String, dynamic>{
       'app': app.name,
       'persistenceEnabled': persistenceEnabled,
       'host': host,
diff --git a/packages/cloud_firestore/lib/src/query.dart b/packages/cloud_firestore/lib/src/query.dart
index a23809852a86..dc35082a87fc 100644
--- a/packages/cloud_firestore/lib/src/query.dart
+++ b/packages/cloud_firestore/lib/src/query.dart
@@ -53,10 +53,7 @@ class Query {
     StreamController<QuerySnapshot> controller; // ignore: close_sinks
     controller = StreamController<QuerySnapshot>.broadcast(
       onListen: () {
-        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-        // https://github.com/flutter/flutter/issues/26431
-        // ignore: strong_mode_implicit_dynamic_method
-        _handle = Firestore.channel.invokeMethod(
+        _handle = Firestore.channel.invokeMethod<int>(
           'Query#addSnapshotListener',
           <String, dynamic>{
             'app': firestore.app.name,
@@ -70,10 +67,7 @@ class Query {
       },
       onCancel: () {
         _handle.then((int handle) async {
-          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-          // https://github.com/flutter/flutter/issues/26431
-          // ignore: strong_mode_implicit_dynamic_method
-          await Firestore.channel.invokeMethod(
+          await Firestore.channel.invokeMethod<void>(
             'Query#removeListener',
             <String, dynamic>{'handle': handle},
           );
@@ -86,10 +80,8 @@ class Query {
 
   /// Fetch the documents for this query
   Future<QuerySnapshot> getDocuments() async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    final Map<dynamic, dynamic> data = await Firestore.channel.invokeMethod(
+    final Map<String, dynamic> data =
+        await Firestore.channel.invokeMapMethod<String, dynamic>(
       'Query#getDocuments',
       <String, dynamic>{
         'app': firestore.app.name,
diff --git a/packages/cloud_firestore/lib/src/transaction.dart b/packages/cloud_firestore/lib/src/transaction.dart
index 734c942f53fe..f6f80c6b2d71 100644
--- a/packages/cloud_firestore/lib/src/transaction.dart
+++ b/packages/cloud_firestore/lib/src/transaction.dart
@@ -14,11 +14,8 @@ class Transaction {
   Firestore _firestore;
 
   Future<DocumentSnapshot> get(DocumentReference documentReference) async {
-    final dynamic result = await Firestore.channel
-        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-        // https://github.com/flutter/flutter/issues/26431
-        // ignore: strong_mode_implicit_dynamic_method
-        .invokeMethod('Transaction#get', <String, dynamic>{
+    final Map<String, dynamic> result = await Firestore.channel
+        .invokeMapMethod<String, dynamic>('Transaction#get', <String, dynamic>{
       'app': _firestore.app.name,
       'transactionId': _transactionId,
       'path': documentReference.path,
@@ -33,10 +30,7 @@ class Transaction {
 
   Future<void> delete(DocumentReference documentReference) async {
     return Firestore.channel
-        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-        // https://github.com/flutter/flutter/issues/26431
-        // ignore: strong_mode_implicit_dynamic_method
-        .invokeMethod('Transaction#delete', <String, dynamic>{
+        .invokeMethod<void>('Transaction#delete', <String, dynamic>{
       'app': _firestore.app.name,
       'transactionId': _transactionId,
       'path': documentReference.path,
@@ -46,10 +40,7 @@ class Transaction {
   Future<void> update(
       DocumentReference documentReference, Map<String, dynamic> data) async {
     return Firestore.channel
-        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-        // https://github.com/flutter/flutter/issues/26431
-        // ignore: strong_mode_implicit_dynamic_method
-        .invokeMethod('Transaction#update', <String, dynamic>{
+        .invokeMethod<void>('Transaction#update', <String, dynamic>{
       'app': _firestore.app.name,
       'transactionId': _transactionId,
       'path': documentReference.path,
@@ -59,10 +50,8 @@ class Transaction {
 
   Future<void> set(
       DocumentReference documentReference, Map<String, dynamic> data) async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    return Firestore.channel.invokeMethod('Transaction#set', <String, dynamic>{
+    return Firestore.channel
+        .invokeMethod<void>('Transaction#set', <String, dynamic>{
       'app': _firestore.app.name,
       'transactionId': _transactionId,
       'path': documentReference.path,
diff --git a/packages/cloud_firestore/lib/src/write_batch.dart b/packages/cloud_firestore/lib/src/write_batch.dart
index cfa5e5253357..6a41ee7bfec3 100644
--- a/packages/cloud_firestore/lib/src/write_batch.dart
+++ b/packages/cloud_firestore/lib/src/write_batch.dart
@@ -12,10 +12,7 @@ part of cloud_firestore;
 /// nor can it be committed again.
 class WriteBatch {
   WriteBatch._(this._firestore)
-      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-      // https://github.com/flutter/flutter/issues/26431
-      // ignore: strong_mode_implicit_dynamic_method
-      : _handle = Firestore.channel.invokeMethod(
+      : _handle = Firestore.channel.invokeMethod<dynamic>(
             'WriteBatch#create', <String, dynamic>{'app': _firestore.app.name});
 
   final Firestore _firestore;
@@ -32,10 +29,7 @@ class WriteBatch {
     if (!_committed) {
       _committed = true;
       await Future.wait<dynamic>(_actions);
-      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-      // https://github.com/flutter/flutter/issues/26431
-      // ignore: strong_mode_implicit_dynamic_method
-      await Firestore.channel.invokeMethod(
+      await Firestore.channel.invokeMethod<void>(
           'WriteBatch#commit', <String, dynamic>{'handle': await _handle});
     } else {
       throw StateError("This batch has already been committed.");
@@ -47,10 +41,7 @@ class WriteBatch {
     if (!_committed) {
       _handle.then((dynamic handle) {
         _actions.add(
-          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-          // https://github.com/flutter/flutter/issues/26431
-          // ignore: strong_mode_implicit_dynamic_method
-          Firestore.channel.invokeMethod(
+          Firestore.channel.invokeMethod<void>(
             'WriteBatch#delete',
             <String, dynamic>{
               'app': _firestore.app.name,
@@ -77,10 +68,7 @@ class WriteBatch {
     if (!_committed) {
       _handle.then((dynamic handle) {
         _actions.add(
-          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-          // https://github.com/flutter/flutter/issues/26431
-          // ignore: strong_mode_implicit_dynamic_method
-          Firestore.channel.invokeMethod(
+          Firestore.channel.invokeMethod<void>(
             'WriteBatch#setData',
             <String, dynamic>{
               'app': _firestore.app.name,
@@ -105,10 +93,7 @@ class WriteBatch {
     if (!_committed) {
       _handle.then((dynamic handle) {
         _actions.add(
-          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-          // https://github.com/flutter/flutter/issues/26431
-          // ignore: strong_mode_implicit_dynamic_method
-          Firestore.channel.invokeMethod(
+          Firestore.channel.invokeMethod<void>(
             'WriteBatch#updateData',
             <String, dynamic>{
               'app': _firestore.app.name,
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 1e3c4d6a00b4..1781a59dddb3 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.7+1
+version: 0.9.7+2
 
 flutter:
   plugin:
@@ -27,4 +27,4 @@ dev_dependencies:
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
-  flutter: ">=0.2.4 <2.0.0"
+  flutter: ">=1.2.0 <2.0.0"

From abb77340fcff49cffd1e48985e87fd7b4eaf5b84 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Fri, 29 Mar 2019 13:22:06 -0700
Subject: [PATCH 266/410] [google_maps] Add initial google_maps tests (#1409)

---
 .cirrus.yml                                   |  2 +
 .../googlemaps/GoogleMapController.java       |  6 ++
 .../example/android/app/build.gradle          |  4 ++
 .../android/app/src/main/AndroidManifest.xml  |  3 +-
 .../example/ios/Runner/AppDelegate.m          | 10 +++-
 .../google_maps_flutter/example/pubspec.yaml  |  6 +-
 .../test_driver/google_map_inspector.dart     | 20 +++++++
 .../example/test_driver/google_maps.dart      | 60 +++++++++++++++++++
 .../example/test_driver/google_maps_test.dart | 13 ++++
 .../example/test_driver/test_widgets.dart     | 12 ++++
 .../ios/Classes/GoogleMapController.m         |  3 +
 .../lib/src/controller.dart                   | 18 +++---
 packages/google_maps_flutter/pubspec.yaml     |  6 ++
 13 files changed, 147 insertions(+), 16 deletions(-)
 create mode 100644 packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
 create mode 100644 packages/google_maps_flutter/example/test_driver/google_maps.dart
 create mode 100644 packages/google_maps_flutter/example/test_driver/google_maps_test.dart
 create mode 100644 packages/google_maps_flutter/example/test_driver/test_widgets.dart

diff --git a/.cirrus.yml b/.cirrus.yml
index 668287bdf6ca..fe80a0109b9e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -27,6 +27,7 @@ task:
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
+        MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       create_device_script:
         echo no | avdmanager -v create avd -n test -k "system-images;android-21;default;armeabi-v7a"
       start_emulator_background_script:
@@ -63,6 +64,7 @@ task:
       PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
       PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
       PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
+    SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
   setup_script:
     - brew update
     - brew install libimobiledevice
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index e7fba92887d2..99aa11a5dd5f 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -199,6 +199,12 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
           markersController.changeMarkers((List<Object>) markersToChange);
           Object markerIdsToRemove = call.argument("markerIdsToRemove");
           markersController.removeMarkers((List<Object>) markerIdsToRemove);
+          result.success(null);
+          break;
+        }
+      case "map#isCompassEnabled":
+        {
+          result.success(googleMap.getUiSettings().isCompassEnabled());
           break;
         }
       default:
diff --git a/packages/google_maps_flutter/example/android/app/build.gradle b/packages/google_maps_flutter/example/android/app/build.gradle
index 0e30acb1d954..16e93d936838 100644
--- a/packages/google_maps_flutter/example/android/app/build.gradle
+++ b/packages/google_maps_flutter/example/android/app/build.gradle
@@ -40,6 +40,10 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    defaultConfig {
+        manifestPlaceholders = [mapsApiKey: "$System.env.MAPS_API_KEY"]
+    }
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
diff --git a/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
index 9e8b95998598..1e20d08125a0 100644
--- a/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
@@ -11,9 +11,10 @@
       <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
+        <!-- Update this value to your google maps api key. -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="YOUR KEY HERE" />
+            android:value="${mapsApiKey}" />
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
diff --git a/packages/google_maps_flutter/example/ios/Runner/AppDelegate.m b/packages/google_maps_flutter/example/ios/Runner/AppDelegate.m
index 28b6216c2245..893deae584b0 100644
--- a/packages/google_maps_flutter/example/ios/Runner/AppDelegate.m
+++ b/packages/google_maps_flutter/example/ios/Runner/AppDelegate.m
@@ -4,10 +4,14 @@
 
 @implementation AppDelegate
 
-- (BOOL)application:(UIApplication *)application
-    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+- (BOOL)application:(UIApplication*)application
+    didFinishLaunchingWithOptions:(NSDictionary*)launchOptions {
   // Provide the GoogleMaps API key.
-  [GMSServices provideAPIKey:@"YOUR KEY HERE"];
+  NSString* mapsApiKey = [[NSProcessInfo processInfo] environment][@"MAPS_API_KEY"];
+  if ([mapsApiKey length] == 0) {
+    mapsApiKey = @"YOUR KEY HERE";
+  }
+  [GMSServices provideAPIKey:mapsApiKey];
 
   // Register Flutter plugins.
   [GeneratedPluginRegistrant registerWithRegistry:self];
diff --git a/packages/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/example/pubspec.yaml
index f0f7e8b8e266..2f49ef6470d2 100644
--- a/packages/google_maps_flutter/example/pubspec.yaml
+++ b/packages/google_maps_flutter/example/pubspec.yaml
@@ -10,11 +10,11 @@ dependencies:
   cupertino_icons: ^0.1.0
 
 dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
   google_maps_flutter:
     path: ../
+  flutter_driver:
+    sdk: flutter
+  test: ^1.6.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec
diff --git a/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart b/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
new file mode 100644
index 000000000000..299e0eebc563
--- /dev/null
+++ b/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
@@ -0,0 +1,20 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:flutter/services.dart';
+
+/// Inspect Google Maps state using the platform SDK.
+///
+/// This class is primarily used for testing. The methods on this
+/// class should call "getters" on the GoogleMap object or equivalent
+/// on the platform side.
+class GoogleMapInspector {
+  GoogleMapInspector(this._channel);
+
+  final MethodChannel _channel;
+
+  Future<bool> isCompassEnabled() async {
+    return await _channel.invokeMethod<bool>('map#isCompassEnabled');
+  }
+}
diff --git a/packages/google_maps_flutter/example/test_driver/google_maps.dart b/packages/google_maps_flutter/example/test_driver/google_maps.dart
new file mode 100644
index 000000000000..864685ad2058
--- /dev/null
+++ b/packages/google_maps_flutter/example/test_driver/google_maps.dart
@@ -0,0 +1,60 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter/widgets.dart';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+
+import 'google_map_inspector.dart';
+import 'test_widgets.dart';
+
+const CameraPosition _kInitialCameraPosition =
+    CameraPosition(target: LatLng(0, 0));
+
+void main() {
+  final Completer<String> allTestsCompleter = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => allTestsCompleter.future);
+
+  tearDownAll(() => allTestsCompleter.complete(null));
+
+  test('testCompassToggle', () async {
+    final Completer<GoogleMapInspector> inspectorCompleter =
+        Completer<GoogleMapInspector>();
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        initialCameraPosition: _kInitialCameraPosition,
+        compassEnabled: false,
+        onMapCreated: (GoogleMapController controller) {
+          final GoogleMapInspector inspector =
+              // ignore: invalid_use_of_visible_for_testing_member
+              GoogleMapInspector(controller.channel);
+          inspectorCompleter.complete(inspector);
+        },
+      ),
+    ));
+
+    final GoogleMapInspector inspector = await inspectorCompleter.future;
+    bool compassEnabled = await inspector.isCompassEnabled();
+    expect(compassEnabled, false);
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        initialCameraPosition: _kInitialCameraPosition,
+        compassEnabled: true,
+        onMapCreated: (GoogleMapController controller) {
+          fail("OnMapCreated should get called only once.");
+        },
+      ),
+    ));
+
+    compassEnabled = await inspector.isCompassEnabled();
+    expect(compassEnabled, true);
+  });
+}
diff --git a/packages/google_maps_flutter/example/test_driver/google_maps_test.dart b/packages/google_maps_flutter/example/test_driver/google_maps_test.dart
new file mode 100644
index 000000000000..b0d3305cd652
--- /dev/null
+++ b/packages/google_maps_flutter/example/test_driver/google_maps_test.dart
@@ -0,0 +1,13 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter_driver/flutter_driver.dart';
+
+Future<void> main() async {
+  final FlutterDriver driver = await FlutterDriver.connect();
+  await driver.requestData(null, timeout: const Duration(minutes: 1));
+  driver.close();
+}
diff --git a/packages/google_maps_flutter/example/test_driver/test_widgets.dart b/packages/google_maps_flutter/example/test_driver/test_widgets.dart
new file mode 100644
index 000000000000..5656c9f5610c
--- /dev/null
+++ b/packages/google_maps_flutter/example/test_driver/test_widgets.dart
@@ -0,0 +1,12 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter/widgets.dart';
+
+Future<void> pumpWidget(Widget widget) {
+  runApp(widget);
+  return WidgetsBinding.instance.endOfFrame;
+}
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index 1783bded7f6d..da755393be70 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -125,6 +125,9 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
       [_markersController removeMarkerIds:markerIdsToRemove];
     }
     result(nil);
+  } else if ([call.method isEqualToString:@"map#isCompassEnabled"]) {
+    NSNumber* isCompassEnabled = @(_mapView.settings.compassButton);
+    result(isCompassEnabled);
   } else {
     result(FlutterMethodNotImplemented);
   }
diff --git a/packages/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/lib/src/controller.dart
index 3d5640083698..bb8b4888eb54 100644
--- a/packages/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/lib/src/controller.dart
@@ -7,12 +7,11 @@ part of google_maps_flutter;
 /// Controller for a single GoogleMap instance running on the host platform.
 class GoogleMapController {
   GoogleMapController._(
-    MethodChannel channel,
+    this.channel,
     CameraPosition initialCameraPosition,
     this._googleMapState,
-  )   : assert(channel != null),
-        _channel = channel {
-    _channel.setMethodCallHandler(_handleMethodCall);
+  ) : assert(channel != null) {
+    channel.setMethodCallHandler(_handleMethodCall);
   }
 
   static Future<GoogleMapController> init(
@@ -34,7 +33,8 @@ class GoogleMapController {
     );
   }
 
-  final MethodChannel _channel;
+  @visibleForTesting
+  final MethodChannel channel;
 
   final _GoogleMapState _googleMapState;
 
@@ -79,7 +79,7 @@ class GoogleMapController {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
-    await _channel.invokeMethod(
+    await channel.invokeMethod(
       'map#update',
       <String, dynamic>{
         'options': optionsUpdate,
@@ -98,7 +98,7 @@ class GoogleMapController {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
-    await _channel.invokeMethod(
+    await channel.invokeMethod(
       'markers#update',
       markerUpdates._toMap(),
     );
@@ -112,7 +112,7 @@ class GoogleMapController {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
-    await _channel.invokeMethod('camera#animate', <String, dynamic>{
+    await channel.invokeMethod('camera#animate', <String, dynamic>{
       'cameraUpdate': cameraUpdate._toJson(),
     });
   }
@@ -125,7 +125,7 @@ class GoogleMapController {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
-    await _channel.invokeMethod('camera#move', <String, dynamic>{
+    await channel.invokeMethod('camera#move', <String, dynamic>{
       'cameraUpdate': cameraUpdate._toJson(),
     });
   }
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 81169e44ff68..2db4b2e3aa79 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -12,6 +12,12 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
 
+  # TODO(iskakaushik): The following dependencies can be removed once
+  # https://github.com/dart-lang/pub/issues/2101 is resolved.
+  flutter_driver:
+    sdk: flutter
+  test: ^1.6.0
+
 flutter:
   plugin:
     androidPackage: io.flutter.plugins.googlemaps

From 87959bbb12c6240e255a3ef0a892c962851f87e1 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirha@google.com>
Date: Fri, 29 Mar 2019 10:48:37 -0700
Subject: [PATCH 267/410] [webview_flutter] use a pumpWidget utility in e2e
 tests

---
 .../webview_flutter/example/test_driver/webview.dart     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/webview_flutter/example/test_driver/webview.dart b/packages/webview_flutter/example/test_driver/webview.dart
index 9bb70d9d1e37..03de96703669 100644
--- a/packages/webview_flutter/example/test_driver/webview.dart
+++ b/packages/webview_flutter/example/test_driver/webview.dart
@@ -17,7 +17,7 @@ void main() {
   test('initalUrl', () async {
     final Completer<WebViewController> controllerCompleter =
         Completer<WebViewController>();
-    runApp(
+    await pumpWidget(
       Directionality(
         textDirection: TextDirection.ltr,
         child: WebView(
@@ -37,7 +37,7 @@ void main() {
   test('loadUrl', () async {
     final Completer<WebViewController> controllerCompleter =
         Completer<WebViewController>();
-    runApp(
+    await pumpWidget(
       Directionality(
         textDirection: TextDirection.ltr,
         child: WebView(
@@ -55,3 +55,8 @@ void main() {
     expect(currentUrl, 'https://www.google.com/');
   });
 }
+
+Future<void> pumpWidget(Widget widget) {
+  runApp(widget);
+  return WidgetsBinding.instance.endOfFrame;
+}

From 2acf6b2af36b6f07aab363fca8d933d998c74cdb Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 29 Mar 2019 14:43:04 -0700
Subject: [PATCH 268/410] [Camera]add type params for invokeMethod calls.
 (#1413)

Bump min flutter version to 1.2.0.
Add template type parameter for invokeMethod calls.
Updated invokeMethod and invokeMethod to using invokeListMethod and invokeMapMethod if any.
flutter/flutter#26431
---
 packages/camera/CHANGELOG.md    |  5 ++++
 packages/camera/lib/camera.dart | 50 ++++++++-------------------------
 packages/camera/pubspec.yaml    |  4 +--
 3 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 933d24cb6100..4f4f160cf85a 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.3+2
+
+* Bump the minimum Flutter version to 1.2.0.
+* Add template type parameter to `invokeMethod` calls.
+
 ## 0.4.3+1
 
 * Catch additional `Exception`s from Android and throw as `CameraException`s.
diff --git a/packages/camera/lib/camera.dart b/packages/camera/lib/camera.dart
index 8edbb8c59658..2db347092f53 100644
--- a/packages/camera/lib/camera.dart
+++ b/packages/camera/lib/camera.dart
@@ -49,12 +49,9 @@ CameraLensDirection _parseCameraLensDirection(String string) {
 /// May throw a [CameraException].
 Future<List<CameraDescription>> availableCameras() async {
   try {
-    final List<dynamic> cameras =
-        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-        // https://github.com/flutter/flutter/issues/26431
-        // ignore: strong_mode_implicit_dynamic_method
-        await _channel.invokeMethod('availableCameras');
-    return cameras.map((dynamic camera) {
+    final List<Map<dynamic, dynamic>> cameras = await _channel
+        .invokeListMethod<Map<dynamic, dynamic>>('availableCameras');
+    return cameras.map((Map<dynamic, dynamic> camera) {
       return CameraDescription(
         name: camera['name'],
         lensDirection: _parseCameraLensDirection(camera['lensFacing']),
@@ -227,10 +224,8 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
     try {
       _creatingCompleter = Completer<void>();
-      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-      // https://github.com/flutter/flutter/issues/26431
-      // ignore: strong_mode_implicit_dynamic_method
-      final Map<dynamic, dynamic> reply = await _channel.invokeMethod(
+      final Map<String, dynamic> reply =
+          await _channel.invokeMapMethod<String, dynamic>(
         'initialize',
         <String, dynamic>{
           'cameraName': description.name,
@@ -268,10 +263,7 @@ class CameraController extends ValueNotifier<CameraValue> {
   ///
   /// Throws a [CameraException] if the prepare fails.
   Future<void> prepareForVideoRecording() async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    await _channel.invokeMethod('prepareForVideoRecording');
+    await _channel.invokeMethod<void>('prepareForVideoRecording');
   }
 
   /// Listen to events from the native plugins.
@@ -317,10 +309,7 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
     try {
       value = value.copyWith(isTakingPicture: true);
-      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-      // https://github.com/flutter/flutter/issues/26431
-      // ignore: strong_mode_implicit_dynamic_method
-      await _channel.invokeMethod(
+      await _channel.invokeMethod<void>(
         'takePicture',
         <String, dynamic>{'textureId': _textureId, 'path': path},
       );
@@ -365,10 +354,7 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
 
     try {
-      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-      // https://github.com/flutter/flutter/issues/26431
-      // ignore: strong_mode_implicit_dynamic_method
-      await _channel.invokeMethod('startImageStream');
+      await _channel.invokeMethod<void>('startImageStream');
       value = value.copyWith(isStreamingImages: true);
     } on PlatformException catch (e) {
       throw CameraException(e.code, e.message);
@@ -409,10 +395,7 @@ class CameraController extends ValueNotifier<CameraValue> {
 
     try {
       value = value.copyWith(isStreamingImages: false);
-      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-      // https://github.com/flutter/flutter/issues/26431
-      // ignore: strong_mode_implicit_dynamic_method
-      await _channel.invokeMethod('stopImageStream');
+      await _channel.invokeMethod<void>('stopImageStream');
     } on PlatformException catch (e) {
       throw CameraException(e.code, e.message);
     }
@@ -452,10 +435,7 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
 
     try {
-      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-      // https://github.com/flutter/flutter/issues/26431
-      // ignore: strong_mode_implicit_dynamic_method
-      await _channel.invokeMethod(
+      await _channel.invokeMethod<void>(
         'startVideoRecording',
         <String, dynamic>{'textureId': _textureId, 'filePath': filePath},
       );
@@ -481,10 +461,7 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
     try {
       value = value.copyWith(isRecordingVideo: false);
-      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-      // https://github.com/flutter/flutter/issues/26431
-      // ignore: strong_mode_implicit_dynamic_method
-      await _channel.invokeMethod(
+      await _channel.invokeMethod<void>(
         'stopVideoRecording',
         <String, dynamic>{'textureId': _textureId},
       );
@@ -503,10 +480,7 @@ class CameraController extends ValueNotifier<CameraValue> {
     super.dispose();
     if (_creatingCompleter != null) {
       await _creatingCompleter.future;
-      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-      // https://github.com/flutter/flutter/issues/26431
-      // ignore: strong_mode_implicit_dynamic_method
-      await _channel.invokeMethod(
+      await _channel.invokeMethod<void>(
         'dispose',
         <String, dynamic>{'textureId': _textureId},
       );
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index a323aa94ad6d..4649e80bb429 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.4.3+1
+version: 0.4.3+2
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>
@@ -27,4 +27,4 @@ flutter:
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
-  flutter: ">=0.1.4 <2.0.0"
+  flutter: ">=1.2.0 <2.0.0"

From 6926dc47b948249a078b3f51d6948d83a939e950 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 29 Mar 2019 15:50:42 -0700
Subject: [PATCH 269/410] [android_alarm_manager] add type params for
 invokeMethod calls. (#1410)

Bump min flutter version to 1.2.0.
Add template type parameter for invokeMethod calls.
Updated invokeMethod and invokeMethod to using invokeListMethod and invokeMapMethod if any.
flutter/flutter#26431
---
 packages/android_alarm_manager/CHANGELOG.md   |  5 ++++
 .../lib/android_alarm_manager.dart            | 30 +++++--------------
 packages/android_alarm_manager/pubspec.yaml   |  4 +--
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index ed05dca60192..24c11e15a1e7 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.1+6
+
+* Bump the minimum Flutter version to 1.2.0.
+* Add template type parameter to `invokeMethod` calls.
+
 ## 0.4.1+5
 
 * Update AlarmService to throw a `PluginRegistrantException` if
diff --git a/packages/android_alarm_manager/lib/android_alarm_manager.dart b/packages/android_alarm_manager/lib/android_alarm_manager.dart
index 9354a1b34840..da633bbcc08e 100644
--- a/packages/android_alarm_manager/lib/android_alarm_manager.dart
+++ b/packages/android_alarm_manager/lib/android_alarm_manager.dart
@@ -43,10 +43,7 @@ void _alarmManagerCallbackDispatcher() {
 
   // Once we've finished initializing, let the native portion of the plugin
   // know that it can start scheduling alarms.
-  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-  // https://github.com/flutter/flutter/issues/26431
-  // ignore: strong_mode_implicit_dynamic_method
-  _channel.invokeMethod('AlarmService.initialized');
+  _channel.invokeMethod<void>('AlarmService.initialized');
 }
 
 /// A Flutter plugin for registering Dart callbacks with the Android
@@ -69,11 +66,8 @@ class AndroidAlarmManager {
     if (handle == null) {
       return false;
     }
-    final dynamic r = await _channel
-        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-        // https://github.com/flutter/flutter/issues/26431
-        // ignore: strong_mode_implicit_dynamic_method
-        .invokeMethod('AlarmService.start', <dynamic>[handle.toRawHandle()]);
+    final bool r = await _channel.invokeMethod<bool>(
+        'AlarmService.start', <dynamic>[handle.toRawHandle()]);
     return r ?? false;
   }
 
@@ -117,10 +111,7 @@ class AndroidAlarmManager {
     if (handle == null) {
       return false;
     }
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    final dynamic r = await _channel.invokeMethod('Alarm.oneShot', <dynamic>[
+    final bool r = await _channel.invokeMethod<bool>('Alarm.oneShot', <dynamic>[
       id,
       exact,
       wakeup,
@@ -172,10 +163,8 @@ class AndroidAlarmManager {
     if (handle == null) {
       return false;
     }
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    final dynamic r = await _channel.invokeMethod('Alarm.periodic', <dynamic>[
+    final bool r = await _channel.invokeMethod<bool>(
+        'Alarm.periodic', <dynamic>[
       id,
       exact,
       wakeup,
@@ -195,11 +184,8 @@ class AndroidAlarmManager {
   /// Returns a [Future] that resolves to `true` on success and `false` on
   /// failure.
   static Future<bool> cancel(int id) async {
-    final dynamic r =
-        // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-        // https://github.com/flutter/flutter/issues/26431
-        // ignore: strong_mode_implicit_dynamic_method
-        await _channel.invokeMethod('Alarm.cancel', <dynamic>[id]);
+    final bool r =
+        await _channel.invokeMethod<bool>('Alarm.cancel', <dynamic>[id]);
     return (r == null) ? false : r;
   }
 }
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index d637ec17f4bd..1cb0aeb8892e 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -1,7 +1,7 @@
 name: android_alarm_manager
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.4.1+5
+version: 0.4.1+6
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 
@@ -17,4 +17,4 @@ flutter:
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
-  flutter: ">=0.1.4 <2.0.0"
+  flutter: ">=1.2.0 <2.0.0"

From e8c6a8602f647929ca5504cde056315dabf62a41 Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Fri, 29 Mar 2019 20:07:48 -0700
Subject: [PATCH 270/410] [google_maps_flutter] Add a key parameter to the
 GoogleMap widget (#1424)

---
 packages/google_maps_flutter/CHANGELOG.md            | 4 ++++
 packages/google_maps_flutter/lib/src/google_map.dart | 4 +++-
 packages/google_maps_flutter/pubspec.yaml            | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index f02bb0961266..07f1c103792d 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.0
+
+* Add a key parameter to the GoogleMap widget.
+
 ## 0.4.0
 
 * Change events are call backs on GoogleMap widget.
diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/lib/src/google_map.dart
index 9f609c131d13..794935c21ed7 100644
--- a/packages/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/lib/src/google_map.dart
@@ -16,6 +16,7 @@ typedef void CameraPositionCallback(CameraPosition position);
 
 class GoogleMap extends StatefulWidget {
   const GoogleMap({
+    Key key,
     @required this.initialCameraPosition,
     this.onMapCreated,
     this.gestureRecognizers,
@@ -32,7 +33,8 @@ class GoogleMap extends StatefulWidget {
     this.onCameraMoveStarted,
     this.onCameraMove,
     this.onCameraIdle,
-  }) : assert(initialCameraPosition != null);
+  })  : assert(initialCameraPosition != null),
+        super(key: key);
 
   final MapCreatedCallback onMapCreated;
 
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 2db4b2e3aa79..4617ab648a41 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.4.0
+version: 0.5.0
 
 dependencies:
   flutter:

From 01bce6a0c08d3c061e37c8d6d5a421c9b0ec899b Mon Sep 17 00:00:00 2001
From: tsuba3 <tsubasa.afe@gmail.com>
Date: Wed, 3 Apr 2019 04:35:21 +0900
Subject: [PATCH 271/410] [cloud_firestore] Add metadata field to
 DocumentSnapshot (#1387)

Add metadata field to DocumentSnapshot
---
 packages/cloud_firestore/CHANGELOG.md         |  4 +++
 .../cloudfirestore/CloudFirestorePlugin.java  | 24 +++++++++++++++++
 .../ios/Classes/CloudFirestorePlugin.m        | 27 +++++++++++++++++--
 .../lib/src/document_change.dart              |  2 ++
 .../lib/src/document_reference.dart           |  2 ++
 .../lib/src/document_snapshot.dart            |  6 ++++-
 .../cloud_firestore/lib/src/firestore.dart    |  2 ++
 .../lib/src/query_snapshot.dart               |  4 +++
 .../cloud_firestore/lib/src/transaction.dart  |  8 ++++--
 packages/cloud_firestore/pubspec.yaml         |  2 +-
 .../test/cloud_firestore_test.dart            | 27 ++++++++++++++++---
 11 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 9229b38d8f8d..3c1eed0d25e6 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.8
+
+* Add metadata field to DocumentSnapshot.
+
 ## 0.9.7+2
 
 * Bump the minimum Flutter version to 1.2.0.
diff --git a/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
index c2451817546b..0a85894dbcb2 100644
--- a/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
+++ b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
@@ -97,12 +97,18 @@ private Map<String, Object> parseQuerySnapshot(QuerySnapshot querySnapshot) {
     Map<String, Object> data = new HashMap<>();
     List<String> paths = new ArrayList<>();
     List<Map<String, Object>> documents = new ArrayList<>();
+    List<Map<String, Object>> metadatas = new ArrayList<>();
     for (DocumentSnapshot document : querySnapshot.getDocuments()) {
       paths.add(document.getReference().getPath());
       documents.add(document.getData());
+      Map<String, Object> metadata = new HashMap<String, Object>();
+      metadata.put("hasPendingWrites", document.getMetadata().hasPendingWrites());
+      metadata.put("isFromCache", document.getMetadata().isFromCache());
+      metadatas.add(metadata);
     }
     data.put("paths", paths);
     data.put("documents", documents);
+    data.put("metadatas", metadatas);
 
     List<Map<String, Object>> documentChanges = new ArrayList<>();
     for (DocumentChange documentChange : querySnapshot.getDocumentChanges()) {
@@ -124,6 +130,11 @@ private Map<String, Object> parseQuerySnapshot(QuerySnapshot querySnapshot) {
       change.put("newIndex", documentChange.getNewIndex());
       change.put("document", documentChange.getDocument().getData());
       change.put("path", documentChange.getDocument().getReference().getPath());
+      Map<String, Object> metadata = new HashMap();
+      metadata.put(
+          "hasPendingWrites", documentChange.getDocument().getMetadata().hasPendingWrites());
+      metadata.put("isFromCache", documentChange.getDocument().getMetadata().isFromCache());
+      change.put("metadata", metadata);
       documentChanges.add(change);
     }
     data.put("documentChanges", documentChanges);
@@ -205,7 +216,11 @@ public void onEvent(DocumentSnapshot documentSnapshot, FirebaseFirestoreExceptio
         return;
       }
       Map<String, Object> arguments = new HashMap<>();
+      Map<String, Object> metadata = new HashMap<>();
       arguments.put("handle", handle);
+      metadata.put("hasPendingWrites", documentSnapshot.getMetadata().hasPendingWrites());
+      metadata.put("isFromCache", documentSnapshot.getMetadata().isFromCache());
+      arguments.put("metadata", metadata);
       if (documentSnapshot.exists()) {
         arguments.put("data", documentSnapshot.getData());
         arguments.put("path", documentSnapshot.getReference().getPath());
@@ -340,6 +355,10 @@ protected Void doInBackground(Void... voids) {
                 } else {
                   snapshotMap.put("data", null);
                 }
+                Map<String, Object> metadata = new HashMap();
+                metadata.put("hasPendingWrites", documentSnapshot.getMetadata().hasPendingWrites());
+                metadata.put("isFromCache", documentSnapshot.getMetadata().isFromCache());
+                snapshotMap.put("metadata", metadata);
                 result.success(snapshotMap);
               } catch (FirebaseFirestoreException e) {
                 result.error("Error performing Transaction#get", e.getMessage(), null);
@@ -545,6 +564,11 @@ public void onFailure(@NonNull Exception e) {
                     @Override
                     public void onSuccess(DocumentSnapshot documentSnapshot) {
                       Map<String, Object> snapshotMap = new HashMap<>();
+                      Map<String, Object> metadata = new HashMap<>();
+                      metadata.put(
+                          "hasPendingWrites", documentSnapshot.getMetadata().hasPendingWrites());
+                      metadata.put("isFromCache", documentSnapshot.getMetadata().isFromCache());
+                      snapshotMap.put("metadata", metadata);
                       snapshotMap.put("path", documentSnapshot.getReference().getPath());
                       if (documentSnapshot.exists()) {
                         snapshotMap.put("data", documentSnapshot.getData());
diff --git a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
index 22cd18a08d13..a272904274bb 100644
--- a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
@@ -88,9 +88,14 @@
 NSDictionary *parseQuerySnapshot(FIRQuerySnapshot *snapshot) {
   NSMutableArray *paths = [NSMutableArray array];
   NSMutableArray *documents = [NSMutableArray array];
+  NSMutableArray *metadatas = [NSMutableArray array];
   for (FIRDocumentSnapshot *document in snapshot.documents) {
     [paths addObject:document.reference.path];
     [documents addObject:document.data];
+    [metadatas addObject:@{
+      @"hasPendingWrites" : @(document.metadata.hasPendingWrites),
+      @"isFromCache" : @(document.metadata.isFromCache),
+    }];
   }
   NSMutableArray *documentChanges = [NSMutableArray array];
   for (FIRDocumentChange *documentChange in snapshot.documentChanges) {
@@ -112,12 +117,17 @@
       @"path" : documentChange.document.reference.path,
       @"oldIndex" : [NSNumber numberWithUnsignedInteger:documentChange.oldIndex],
       @"newIndex" : [NSNumber numberWithUnsignedInteger:documentChange.newIndex],
+      @"metadata" : @{
+        @"hasPendingWrites" : @(documentChange.document.metadata.hasPendingWrites),
+        @"isFromCache" : @(documentChange.document.metadata.isFromCache),
+      },
     }];
   }
   return @{
     @"paths" : paths,
     @"documentChanges" : documentChanges,
     @"documents" : documents,
+    @"metadatas" : metadatas,
   };
 }
 
@@ -338,7 +348,11 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
       } else if (snapshot != nil) {
         result(@{
           @"path" : snapshot.reference.path,
-          @"data" : snapshot.exists ? snapshot.data : [NSNull null]
+          @"data" : snapshot.exists ? snapshot.data : [NSNull null],
+          @"metadata" : @{
+            @"hasPendingWrites" : @(snapshot.metadata.hasPendingWrites),
+            @"isFromCache" : @(snapshot.metadata.isFromCache),
+          },
         });
       } else {
         result(nil);
@@ -395,7 +409,11 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
       } else {
         result(@{
           @"path" : snapshot.reference.path,
-          @"data" : snapshot.exists ? snapshot.data : [NSNull null]
+          @"data" : snapshot.exists ? snapshot.data : [NSNull null],
+          @"metadata" : @{
+            @"hasPendingWrites" : @(snapshot.metadata.hasPendingWrites),
+            @"isFromCache" : @(snapshot.metadata.isFromCache),
+          },
         });
       }
     }];
@@ -435,6 +453,11 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
                              @"handle" : handle,
                              @"path" : snapshot ? snapshot.reference.path : [NSNull null],
                              @"data" : snapshot && snapshot.exists ? snapshot.data : [NSNull null],
+                             @"metadata" : snapshot ? @{
+                               @"hasPendingWrites" : @(snapshot.metadata.hasPendingWrites),
+                               @"isFromCache" : @(snapshot.metadata.isFromCache),
+                             }
+                                                    : [NSNull null],
                            }];
         }];
     _listeners[handle] = listener;
diff --git a/packages/cloud_firestore/lib/src/document_change.dart b/packages/cloud_firestore/lib/src/document_change.dart
index 869d4c1cede8..8409d512a43e 100644
--- a/packages/cloud_firestore/lib/src/document_change.dart
+++ b/packages/cloud_firestore/lib/src/document_change.dart
@@ -29,6 +29,8 @@ class DocumentChange {
         document = DocumentSnapshot._(
           data['path'],
           _asStringKeyedMap(data['document']),
+          SnapshotMetadata._(data["metadata"]["hasPendingWrites"],
+              data["metadata"]["isFromCache"]),
           _firestore,
         ),
         type = DocumentChangeType.values.firstWhere((DocumentChangeType type) {
diff --git a/packages/cloud_firestore/lib/src/document_reference.dart b/packages/cloud_firestore/lib/src/document_reference.dart
index 7f103d3fd769..a1ad31ac5823 100644
--- a/packages/cloud_firestore/lib/src/document_reference.dart
+++ b/packages/cloud_firestore/lib/src/document_reference.dart
@@ -80,6 +80,8 @@ class DocumentReference {
     return DocumentSnapshot._(
       data['path'],
       _asStringKeyedMap(data['data']),
+      SnapshotMetadata._(data['metadata']['hasPendingWrites'],
+          data['metadata']['isFromCache']),
       firestore,
     );
   }
diff --git a/packages/cloud_firestore/lib/src/document_snapshot.dart b/packages/cloud_firestore/lib/src/document_snapshot.dart
index cfcf4a60879f..45508566674a 100644
--- a/packages/cloud_firestore/lib/src/document_snapshot.dart
+++ b/packages/cloud_firestore/lib/src/document_snapshot.dart
@@ -10,7 +10,7 @@ part of cloud_firestore;
 /// The data can be extracted with the data property or by using subscript
 /// syntax to access a specific field.
 class DocumentSnapshot {
-  DocumentSnapshot._(this._path, this.data, this._firestore);
+  DocumentSnapshot._(this._path, this.data, this.metadata, this._firestore);
 
   final String _path;
   final Firestore _firestore;
@@ -21,6 +21,10 @@ class DocumentSnapshot {
   /// Contains all the data of this snapshot
   final Map<String, dynamic> data;
 
+  /// Metadata about this snapshot concerning its source and if it has local
+  /// modifications.
+  final SnapshotMetadata metadata;
+
   /// Reads individual values from the snapshot
   dynamic operator [](String key) => data[key];
 
diff --git a/packages/cloud_firestore/lib/src/firestore.dart b/packages/cloud_firestore/lib/src/firestore.dart
index 27c90ff599e8..1b5eac33588b 100644
--- a/packages/cloud_firestore/lib/src/firestore.dart
+++ b/packages/cloud_firestore/lib/src/firestore.dart
@@ -18,6 +18,8 @@ class Firestore {
         final DocumentSnapshot snapshot = DocumentSnapshot._(
           call.arguments['path'],
           _asStringKeyedMap(call.arguments['data']),
+          SnapshotMetadata._(call.arguments['metadata']['hasPendingWrites'],
+              call.arguments['metadata']['isFromCache']),
           this,
         );
         _documentObservers[call.arguments['handle']].add(snapshot);
diff --git a/packages/cloud_firestore/lib/src/query_snapshot.dart b/packages/cloud_firestore/lib/src/query_snapshot.dart
index 0ec667fbd0ec..4cc85403e19f 100644
--- a/packages/cloud_firestore/lib/src/query_snapshot.dart
+++ b/packages/cloud_firestore/lib/src/query_snapshot.dart
@@ -12,6 +12,10 @@ class QuerySnapshot {
           return DocumentSnapshot._(
             data['paths'][index],
             _asStringKeyedMap(data['documents'][index]),
+            SnapshotMetadata._(
+              data['metadatas'][index]['hasPendingWrites'],
+              data['metadatas'][index]['isFromCache'],
+            ),
             _firestore,
           );
         }),
diff --git a/packages/cloud_firestore/lib/src/transaction.dart b/packages/cloud_firestore/lib/src/transaction.dart
index f6f80c6b2d71..d42c89d9d59e 100644
--- a/packages/cloud_firestore/lib/src/transaction.dart
+++ b/packages/cloud_firestore/lib/src/transaction.dart
@@ -21,8 +21,12 @@ class Transaction {
       'path': documentReference.path,
     });
     if (result != null) {
-      return DocumentSnapshot._(documentReference.path,
-          result['data']?.cast<String, dynamic>(), _firestore);
+      return DocumentSnapshot._(
+          documentReference.path,
+          result['data']?.cast<String, dynamic>(),
+          SnapshotMetadata._(result['metadata']['hasPendingWrites'],
+              result['metadata']['isFromCache']),
+          _firestore);
     } else {
       return null;
     }
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 1781a59dddb3..23d6277411ac 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.7+2
+version: 0.9.8
 
 flutter:
   plugin:
diff --git a/packages/cloud_firestore/test/cloud_firestore_test.dart b/packages/cloud_firestore/test/cloud_firestore_test.dart
index 0f6040bc0c8a..c925d5f0c062 100755
--- a/packages/cloud_firestore/test/cloud_firestore_test.dart
+++ b/packages/cloud_firestore/test/cloud_firestore_test.dart
@@ -21,6 +21,10 @@ void main() {
     const Map<String, dynamic> kMockDocumentSnapshotData = <String, dynamic>{
       '1': 2
     };
+    const Map<String, dynamic> kMockSnapshotMetadata = <String, dynamic>{
+      "hasPendingWrites": false,
+      "isFromCache": false,
+    };
 
     setUp(() async {
       mockHandleId = 0;
@@ -54,12 +58,14 @@ void main() {
                     'handle': handle,
                     'paths': <String>["${methodCall.arguments['path']}/0"],
                     'documents': <dynamic>[kMockDocumentSnapshotData],
+                    'metadatas': <Map<String, dynamic>>[kMockSnapshotMetadata],
                     'documentChanges': <dynamic>[
                       <String, dynamic>{
                         'oldIndex': -1,
                         'newIndex': 0,
                         'type': 'DocumentChangeType.added',
                         'document': kMockDocumentSnapshotData,
+                        'metadata': kMockSnapshotMetadata,
                       },
                     ],
                   }),
@@ -80,6 +86,7 @@ void main() {
                     'handle': handle,
                     'path': methodCall.arguments['path'],
                     'data': kMockDocumentSnapshotData,
+                    'metadata': kMockSnapshotMetadata,
                   }),
                 ),
                 (_) {},
@@ -90,12 +97,14 @@ void main() {
             return <String, dynamic>{
               'paths': <String>["${methodCall.arguments['path']}/0"],
               'documents': <dynamic>[kMockDocumentSnapshotData],
+              'metadatas': <Map<String, dynamic>>[kMockSnapshotMetadata],
               'documentChanges': <dynamic>[
                 <String, dynamic>{
                   'oldIndex': -1,
                   'newIndex': 0,
                   'type': 'DocumentChangeType.added',
                   'document': kMockDocumentSnapshotData,
+                  'metadata': kMockSnapshotMetadata,
                 },
               ],
             };
@@ -105,10 +114,15 @@ void main() {
             if (methodCall.arguments['path'] == 'foo/bar') {
               return <String, dynamic>{
                 'path': 'foo/bar',
-                'data': <String, dynamic>{'key1': 'val1'}
+                'data': <String, dynamic>{'key1': 'val1'},
+                'metadata': kMockSnapshotMetadata,
               };
             } else if (methodCall.arguments['path'] == 'foo/notExists') {
-              return <String, dynamic>{'path': 'foo/notExists', 'data': null};
+              return <String, dynamic>{
+                'path': 'foo/notExists',
+                'data': null,
+                'metadata': kMockSnapshotMetadata,
+              };
             }
             throw PlatformException(code: 'UNKNOWN_PATH');
           case 'Firestore#runTransaction':
@@ -117,10 +131,15 @@ void main() {
             if (methodCall.arguments['path'] == 'foo/bar') {
               return <String, dynamic>{
                 'path': 'foo/bar',
-                'data': <String, dynamic>{'key1': 'val1'}
+                'data': <String, dynamic>{'key1': 'val1'},
+                'metadata': kMockSnapshotMetadata,
               };
             } else if (methodCall.arguments['path'] == 'foo/notExists') {
-              return <String, dynamic>{'path': 'foo/notExists', 'data': null};
+              return <String, dynamic>{
+                'path': 'foo/notExists',
+                'data': null,
+                'metadata': kMockSnapshotMetadata,
+              };
             }
             throw PlatformException(code: 'UNKNOWN_PATH');
           case 'Transaction#set':

From 37c00537abb10a15e9cffc024763f238f0689f5c Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Tue, 2 Apr 2019 14:43:55 -0700
Subject: [PATCH 272/410] [android_intent] add type params for invokeMethod
 calls. (#1411)

Bump min flutter version to 1.2.0.
Add template type parameter for invokeMethod calls.
Updated invokeMethod and invokeMethod to using invokeListMethod and invokeMapMethod if any.
---
 packages/android_intent/CHANGELOG.md            | 5 +++++
 packages/android_intent/lib/android_intent.dart | 5 +----
 packages/android_intent/pubspec.yaml            | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md
index d9932e048a3a..24cf79757ac0 100644
--- a/packages/android_intent/CHANGELOG.md
+++ b/packages/android_intent/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.0+2
+
+* Bump the minimum Flutter version to 1.2.0.
+* Add template type parameter to `invokeMethod` calls.
+
 ## 0.3.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/android_intent/lib/android_intent.dart b/packages/android_intent/lib/android_intent.dart
index 8b0acc90fbdd..9e2bc9e0826c 100644
--- a/packages/android_intent/lib/android_intent.dart
+++ b/packages/android_intent/lib/android_intent.dart
@@ -57,9 +57,6 @@ class AndroidIntent {
     if (package != null) {
       args['package'] = package;
     }
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    await _channel.invokeMethod('launch', args);
+    await _channel.invokeMethod<void>('launch', args);
   }
 }
diff --git a/packages/android_intent/pubspec.yaml b/packages/android_intent/pubspec.yaml
index 44e468d60e1e..561a804d4e46 100644
--- a/packages/android_intent/pubspec.yaml
+++ b/packages/android_intent/pubspec.yaml
@@ -2,7 +2,7 @@ name: android_intent
 description: Flutter plugin for launching Android Intents. Not supported on iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent
-version: 0.3.0+1
+version: 0.3.0+2
 
 flutter:
   plugin:
@@ -18,4 +18,4 @@ dependencies:
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
-  flutter: ">=0.1.4 <2.0.0"
+  flutter: ">=1.2.0 <2.0.0"

From d48da0357fdc0395494f3e72786862c04f846a3e Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Tue, 2 Apr 2019 14:50:22 -0700
Subject: [PATCH 273/410] [Connectivity]add type params for invokeMethod calls.
 (#1416)

Bump min flutter version to 1.2.0.
Add template type parameter for invokeMethod calls.
Updated invokeMethod and invokeMethod to using invokeListMethod and invokeMapMethod if any.
---
 packages/connectivity/CHANGELOG.md          |  5 +++++
 packages/connectivity/lib/connectivity.dart | 12 +++---------
 packages/connectivity/pubspec.yaml          |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md
index 350889e2b9c4..1295b57346f0 100644
--- a/packages/connectivity/CHANGELOG.md
+++ b/packages/connectivity/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.2+1
+
+* Bump the minimum Flutter version to 1.2.0.
+* Add template type parameter to `invokeMethod` calls.
+
 ## 0.4.2
 
 * Adding getWifiIP() to obtain current wifi network's IP.
diff --git a/packages/connectivity/lib/connectivity.dart b/packages/connectivity/lib/connectivity.dart
index fd444b008d97..8726278426ac 100644
--- a/packages/connectivity/lib/connectivity.dart
+++ b/packages/connectivity/lib/connectivity.dart
@@ -61,10 +61,7 @@ class Connectivity {
   ///
   /// Instead listen for connectivity changes via [onConnectivityChanged] stream.
   Future<ConnectivityResult> checkConnectivity() async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    final String result = await methodChannel.invokeMethod('check');
+    final String result = await methodChannel.invokeMethod<String>('check');
     return _parseConnectivityResult(result);
   }
 
@@ -75,10 +72,7 @@ class Connectivity {
   /// From android 8.0 onwards the GPS must be ON (high accuracy)
   /// in order to be able to obtain the SSID.
   Future<String> getWifiName() async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    String wifiName = await methodChannel.invokeMethod('wifiName');
+    String wifiName = await methodChannel.invokeMethod<String>('wifiName');
     // as Android might return <unknown ssid>, uniforming result
     // our iOS implementation will return null
     if (wifiName == '<unknown ssid>') wifiName = null;
@@ -87,7 +81,7 @@ class Connectivity {
 
   /// Obtains the IP address of the connected wifi network
   Future<String> getWifiIP() async {
-    return await methodChannel.invokeMethod('wifiIPAddress');
+    return await methodChannel.invokeMethod<String>('wifiIPAddress');
   }
 }
 
diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml
index 4840b5d50ed3..eb2dbb6b3a9f 100644
--- a/packages/connectivity/pubspec.yaml
+++ b/packages/connectivity/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi &
   mobile/cellular) connectivity on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
-version: 0.4.2
+version: 0.4.2+1
 
 flutter:
   plugin:
@@ -22,4 +22,4 @@ dev_dependencies:
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
-  flutter: ">=0.1.4 <2.0.0"
+  flutter: ">=1.2.0 <2.0.0"

From 9c2a4c1a7da2154391adf6411462bf7edec66cb9 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Tue, 2 Apr 2019 14:52:22 -0700
Subject: [PATCH 274/410] [Battery]add type params for invokeMethod calls.
 (#1412)

Bump min flutter version to 1.2.0.
Add template type parameter for invokeMethod calls.
Updated invokeMethod and invokeMethod to using invokeListMethod and invokeMapMethod if any.
---
 packages/battery/CHANGELOG.md           | 5 +++++
 packages/battery/lib/battery.dart       | 5 +----
 packages/battery/pubspec.yaml           | 4 ++--
 packages/battery/test/battery_test.dart | 5 +----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/battery/CHANGELOG.md b/packages/battery/CHANGELOG.md
index abb56c56aa6d..d70b0d6071a6 100644
--- a/packages/battery/CHANGELOG.md
+++ b/packages/battery/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.0+2
+
+* Bump the minimum Flutter version to 1.2.0.
+* Add template type parameter to `invokeMethod` calls.
+
 ## 0.3.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/battery/lib/battery.dart b/packages/battery/lib/battery.dart
index 2a0cf2f56b63..96f470e5bbb5 100644
--- a/packages/battery/lib/battery.dart
+++ b/packages/battery/lib/battery.dart
@@ -33,10 +33,7 @@ class Battery {
 
   /// Returns the current battery level in percent.
   Future<int> get batteryLevel => _methodChannel
-      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-      // https://github.com/flutter/flutter/issues/26431
-      // ignore: strong_mode_implicit_dynamic_method
-      .invokeMethod('getBatteryLevel')
+      .invokeMethod<int>('getBatteryLevel')
       .then<int>((dynamic result) => result);
 
   /// Fires whenever the battery state changes.
diff --git a/packages/battery/pubspec.yaml b/packages/battery/pubspec.yaml
index 51b4d5aebb79..6d9af34e8b57 100644
--- a/packages/battery/pubspec.yaml
+++ b/packages/battery/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for accessing information about the battery state
   (full, charging, discharging) on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/battery
-version: 0.3.0+1
+version: 0.3.0+2
 
 flutter:
   plugin:
@@ -25,4 +25,4 @@ dev_dependencies:
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
-  flutter: ">=0.1.4 <2.0.0"
+  flutter: ">=1.2.0 <2.0.0"
diff --git a/packages/battery/test/battery_test.dart b/packages/battery/test/battery_test.dart
index c16bf7f4ecbd..93d69604c83a 100644
--- a/packages/battery/test/battery_test.dart
+++ b/packages/battery/test/battery_test.dart
@@ -22,10 +22,7 @@ void main() {
   });
 
   test('batteryLevel', () async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    when(methodChannel.invokeMethod('getBatteryLevel'))
+    when(methodChannel.invokeMethod<int>('getBatteryLevel'))
         .thenAnswer((Invocation invoke) => Future<int>.value(42));
     expect(await battery.batteryLevel, 42);
   });

From 84c0ba5e033d352a65a4fe3be8eee45510546e2b Mon Sep 17 00:00:00 2001
From: Amir Hardon <amirh@users.noreply.github.com>
Date: Tue, 2 Apr 2019 15:47:44 -0700
Subject: [PATCH 275/410] Make sure to post javascript channel messages from
 the platform thread. (#1429)

The Android's webview's JavascriptInterface doesn't promise to invoke
the interface's Java method on the main thread, since postMessage is
sending a message over the platform channel we need to make sure it's
doing so from the platform thread.
---
 packages/webview_flutter/CHANGELOG.md         |  4 +++
 .../webviewflutter/FlutterWebView.java        |  5 +++-
 .../webviewflutter/JavaScriptChannel.java     | 28 +++++++++++++++----
 packages/webview_flutter/pubspec.yaml         |  2 +-
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 81801b80c969..fc34c1cc50bb 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.5+3
+
+* Make sure to post javascript channel messages from the platform thread.
+
 ## 0.3.5+2
 
 * Fix crash from `NavigationDelegate` on later versions of Android.
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index 9db7d5ef41da..21720cf6b4a2 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -7,6 +7,7 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
+import android.os.Handler;
 import android.view.View;
 import android.webkit.WebStorage;
 import android.webkit.WebView;
@@ -25,10 +26,12 @@ public class FlutterWebView implements PlatformView, MethodCallHandler {
   private final WebView webView;
   private final MethodChannel methodChannel;
   private final FlutterWebViewClient flutterWebViewClient;
+  private final Handler platformThreadHandler;
 
   @SuppressWarnings("unchecked")
   FlutterWebView(Context context, BinaryMessenger messenger, int id, Map<String, Object> params) {
     webView = new WebView(context);
+    platformThreadHandler = new Handler(context.getMainLooper());
     // Allow local storage.
     webView.getSettings().setDomStorageEnabled(true);
 
@@ -214,7 +217,7 @@ private void updateJsMode(int mode) {
   private void registerJavaScriptChannelNames(List<String> channelNames) {
     for (String channelName : channelNames) {
       webView.addJavascriptInterface(
-          new JavaScriptChannel(methodChannel, channelName), channelName);
+          new JavaScriptChannel(methodChannel, channelName, platformThreadHandler), channelName);
     }
   }
 
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java
index e7e76b2fa7f0..180ca4f1da75 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/JavaScriptChannel.java
@@ -4,6 +4,8 @@
 
 package io.flutter.plugins.webviewflutter;
 
+import android.os.Handler;
+import android.os.Looper;
 import android.webkit.JavascriptInterface;
 import io.flutter.plugin.common.MethodChannel;
 import java.util.HashMap;
@@ -18,6 +20,7 @@
 class JavaScriptChannel {
   private final MethodChannel methodChannel;
   private final String javaScriptChannelName;
+  private final Handler platformThreadHandler;
 
   /**
    * @param methodChannel the Flutter WebView method channel to which JS messages are sent
@@ -25,18 +28,31 @@ class JavaScriptChannel {
    *     channel with each message to let the Dart code know which JavaScript channel the message
    *     was sent through
    */
-  JavaScriptChannel(MethodChannel methodChannel, String javaScriptChannelName) {
+  JavaScriptChannel(
+      MethodChannel methodChannel, String javaScriptChannelName, Handler platformThreadHandler) {
     this.methodChannel = methodChannel;
     this.javaScriptChannelName = javaScriptChannelName;
+    this.platformThreadHandler = platformThreadHandler;
   }
 
   // Suppressing unused warning as this is invoked from JavaScript.
   @SuppressWarnings("unused")
   @JavascriptInterface
-  public void postMessage(String message) {
-    HashMap<String, String> arguments = new HashMap<>();
-    arguments.put("channel", javaScriptChannelName);
-    arguments.put("message", message);
-    methodChannel.invokeMethod("javascriptChannelMessage", arguments);
+  public void postMessage(final String message) {
+    Runnable postMessageRunnable =
+        new Runnable() {
+          @Override
+          public void run() {
+            HashMap<String, String> arguments = new HashMap<>();
+            arguments.put("channel", javaScriptChannelName);
+            arguments.put("message", message);
+            methodChannel.invokeMethod("javascriptChannelMessage", arguments);
+          }
+        };
+    if (platformThreadHandler.getLooper() == Looper.getMainLooper()) {
+      postMessageRunnable.run();
+    } else {
+      platformThreadHandler.post(postMessageRunnable);
+    }
   }
 }
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index db694ed4697e..77c0ce90a707 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.5+2
+version: 0.3.5+3
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From 1ba00aaea80f5eeaf3123cad2e86032aa4eb548f Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Tue, 2 Apr 2019 16:41:02 -0700
Subject: [PATCH 276/410] [google_maps] Maps zoom level tests (#1430)

* Everything except ios imple

* add ios impl

* add keys to tests

* use global keyus
---
 .../googlemaps/GoogleMapController.java       |  8 ++++
 .../test_driver/google_map_inspector.dart     |  8 ++++
 .../example/test_driver/google_maps.dart      | 46 +++++++++++++++++++
 .../ios/Classes/GoogleMapController.m         |  3 ++
 4 files changed, 65 insertions(+)

diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index 99aa11a5dd5f..e47a9f88538d 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -32,6 +32,7 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
 import io.flutter.plugin.platform.PlatformView;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -207,6 +208,13 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
           result.success(googleMap.getUiSettings().isCompassEnabled());
           break;
         }
+      case "map#getMinMaxZoomLevels":
+        {
+          List<Float> zoomLevels = new ArrayList<>(2);
+          zoomLevels.add(googleMap.getMinZoomLevel());
+          zoomLevels.add(googleMap.getMaxZoomLevel());
+          result.success(zoomLevels);
+        }
       default:
         result.notImplemented();
     }
diff --git a/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart b/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
index 299e0eebc563..81815c30d40f 100644
--- a/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
+++ b/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:flutter/services.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
 
 /// Inspect Google Maps state using the platform SDK.
 ///
@@ -17,4 +18,11 @@ class GoogleMapInspector {
   Future<bool> isCompassEnabled() async {
     return await _channel.invokeMethod<bool>('map#isCompassEnabled');
   }
+
+  Future<MinMaxZoomPreference> getMinMaxZoomLevels() async {
+    final List<double> zoomLevels =
+        (await _channel.invokeMethod<List<dynamic>>('map#getMinMaxZoomLevels'))
+            .cast<double>();
+    return MinMaxZoomPreference(zoomLevels[0], zoomLevels[1]);
+  }
 }
diff --git a/packages/google_maps_flutter/example/test_driver/google_maps.dart b/packages/google_maps_flutter/example/test_driver/google_maps.dart
index 864685ad2058..da8f0a2a4ff1 100644
--- a/packages/google_maps_flutter/example/test_driver/google_maps.dart
+++ b/packages/google_maps_flutter/example/test_driver/google_maps.dart
@@ -22,12 +22,14 @@ void main() {
   tearDownAll(() => allTestsCompleter.complete(null));
 
   test('testCompassToggle', () async {
+    final Key key = GlobalKey();
     final Completer<GoogleMapInspector> inspectorCompleter =
         Completer<GoogleMapInspector>();
 
     await pumpWidget(Directionality(
       textDirection: TextDirection.ltr,
       child: GoogleMap(
+        key: key,
         initialCameraPosition: _kInitialCameraPosition,
         compassEnabled: false,
         onMapCreated: (GoogleMapController controller) {
@@ -46,6 +48,7 @@ void main() {
     await pumpWidget(Directionality(
       textDirection: TextDirection.ltr,
       child: GoogleMap(
+        key: key,
         initialCameraPosition: _kInitialCameraPosition,
         compassEnabled: true,
         onMapCreated: (GoogleMapController controller) {
@@ -57,4 +60,47 @@ void main() {
     compassEnabled = await inspector.isCompassEnabled();
     expect(compassEnabled, true);
   });
+
+  test('updateMinMaxZoomLevels', () async {
+    final Key key = GlobalKey();
+    final Completer<GoogleMapInspector> inspectorCompleter =
+        Completer<GoogleMapInspector>();
+
+    const MinMaxZoomPreference initialZoomLevel = MinMaxZoomPreference(2, 4);
+    const MinMaxZoomPreference finalZoomLevel = MinMaxZoomPreference(3, 8);
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        minMaxZoomPreference: initialZoomLevel,
+        onMapCreated: (GoogleMapController controller) {
+          final GoogleMapInspector inspector =
+              // ignore: invalid_use_of_visible_for_testing_member
+              GoogleMapInspector(controller.channel);
+          inspectorCompleter.complete(inspector);
+        },
+      ),
+    ));
+
+    final GoogleMapInspector inspector = await inspectorCompleter.future;
+    MinMaxZoomPreference zoomLevel = await inspector.getMinMaxZoomLevels();
+    expect(zoomLevel, equals(initialZoomLevel));
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        minMaxZoomPreference: finalZoomLevel,
+        onMapCreated: (GoogleMapController controller) {
+          fail("OnMapCreated should get called only once.");
+        },
+      ),
+    ));
+
+    zoomLevel = await inspector.getMinMaxZoomLevels();
+    expect(zoomLevel, equals(finalZoomLevel));
+  });
 }
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index da755393be70..48f68ffc6f6a 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -128,6 +128,9 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   } else if ([call.method isEqualToString:@"map#isCompassEnabled"]) {
     NSNumber* isCompassEnabled = @(_mapView.settings.compassButton);
     result(isCompassEnabled);
+  } else if ([call.method isEqualToString:@"map#getMinMaxZoomLevels"]) {
+    NSArray* zoomLevels = @[ @(_mapView.minZoom), @(_mapView.maxZoom) ];
+    result(zoomLevels);
   } else {
     result(FlutterMethodNotImplemented);
   }

From 87372ace3332b2c91858c4e20d68ac33187a6979 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.stockx@gmail.com>
Date: Wed, 3 Apr 2019 02:01:58 +0200
Subject: [PATCH 277/410] [firebase_analytics] Added Navigator.pushReplacement
 screen tracking (#1428)

* Track Navigator.pushReplacement screen changes

Currently only standard push and pops were automatically logged to Firebase. However, this resulted in missing screen_view events for apps with more complex navigation.

* Added test for pushReplacement
---
 AUTHORS                                             |  1 +
 packages/firebase_analytics/CHANGELOG.md            |  4 ++++
 packages/firebase_analytics/lib/observer.dart       | 12 ++++++++++++
 packages/firebase_analytics/pubspec.yaml            |  2 +-
 packages/firebase_analytics/test/observer_test.dart | 10 ++++++++++
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 8602e9060e44..0bcd6a07881c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,3 +27,4 @@ Mike Diarmid <mike@invertase.io>
 Invertase <oss@invertase.io>
 Elliot Hesp <elliot@invertase.io>
 Katarina Sheremet <katarina@sheremet.ch>
+Thomas Stockx <thomas@stockxit.com>
\ No newline at end of file
diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index db657f83efa4..47e65a44c8b7 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.1
+
+* Added screen_view tracking of Navigator.pushReplacement
+
 ## 2.1.0
 
 * Add Login event support
diff --git a/packages/firebase_analytics/lib/observer.dart b/packages/firebase_analytics/lib/observer.dart
index f55c6cb3e8d5..fc16030f17f1 100644
--- a/packages/firebase_analytics/lib/observer.dart
+++ b/packages/firebase_analytics/lib/observer.dart
@@ -32,6 +32,10 @@ String defaultNameExtractor(RouteSettings settings) => settings.name;
 ///   settings: RouteSettings(name: '/contact/123',
 ///   builder: ContactDetail(123)))),
 ///
+/// Navigator.pushReplacement(context, MaterialPageRoute(
+///   settings: RouteSettings(name: '/contact/123',
+///   builder: ContactDetail(123)))),
+///
 /// Navigator.pop(context);
 /// ```
 ///
@@ -94,6 +98,14 @@ class FirebaseAnalyticsObserver extends RouteObserver<PageRoute<dynamic>> {
     }
   }
 
+  @override
+  void didReplace({Route<dynamic> newRoute, Route<dynamic> oldRoute}) {
+    super.didReplace(newRoute: newRoute, oldRoute: oldRoute);
+    if (newRoute is PageRoute) {
+      _sendScreenView(newRoute);
+    }
+  }
+
   @override
   void didPop(Route<dynamic> route, Route<dynamic> previousRoute) {
     super.didPop(route, previousRoute);
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index 9fe68292360a..5dfe71db6477 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 2.1.0
+version: 2.1.1
 
 flutter:
   plugin:
diff --git a/packages/firebase_analytics/test/observer_test.dart b/packages/firebase_analytics/test/observer_test.dart
index e91d0786c7c6..96521d300fe3 100644
--- a/packages/firebase_analytics/test/observer_test.dart
+++ b/packages/firebase_analytics/test/observer_test.dart
@@ -57,6 +57,16 @@ void main() {
       verify(analytics.setCurrentScreen(screenName: 'route')).called(1);
     });
 
+    test('setCurrentScreen on route pushReplacement', () {
+      final PageRoute<dynamic> route = MockPageRoute();
+      final PageRoute<dynamic> previousRoute = MockPageRoute();
+      when(route.settings).thenReturn(const RouteSettings(name: 'route'));
+
+      observer.didReplace(newRoute: route, oldRoute: previousRoute);
+
+      verify(analytics.setCurrentScreen(screenName: 'route')).called(1);
+    });
+
     test('uses nameExtractor', () {
       observer = FirebaseAnalyticsObserver(
         analytics: analytics,

From d8a9bd6c1c686af54313843d4840f7da90304fa3 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Tue, 2 Apr 2019 17:56:49 -0700
Subject: [PATCH 278/410] [cloud_firestore] Remove usage of `invokeMapMethod`
 (#1435)

`invokeMapMethod` and `invokeListMethod`  currently crashes if the return value from methodChannel is null. Remove usages of these 2 methods to prevent crashes.
---
 packages/cloud_firestore/CHANGELOG.md             | 4 ++++
 packages/cloud_firestore/lib/src/firestore.dart   | 6 +++---
 packages/cloud_firestore/lib/src/transaction.dart | 5 +++--
 packages/cloud_firestore/pubspec.yaml             | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 3c1eed0d25e6..58e5ff5177d5 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.9
+
+* Remove `invokeMapMethod` calls to prevent crash.
+
 ## 0.9.8
 
 * Add metadata field to DocumentSnapshot.
diff --git a/packages/cloud_firestore/lib/src/firestore.dart b/packages/cloud_firestore/lib/src/firestore.dart
index 1b5eac33588b..94e62553c2a9 100644
--- a/packages/cloud_firestore/lib/src/firestore.dart
+++ b/packages/cloud_firestore/lib/src/firestore.dart
@@ -112,14 +112,14 @@ class Firestore {
         'Transaction timeout must be more than 0 milliseconds');
     final int transactionId = _transactionHandlerId++;
     _transactionHandlers[transactionId] = transactionHandler;
-    final Map<String, dynamic> result = await channel
-        .invokeMapMethod<String, dynamic>(
+    final Map<dynamic, dynamic> result = await channel
+        .invokeMethod<Map<dynamic, dynamic>>(
             'Firestore#runTransaction', <String, dynamic>{
       'app': app.name,
       'transactionId': transactionId,
       'transactionTimeout': timeout.inMilliseconds
     });
-    return result ?? <String, dynamic>{};
+    return result?.cast<String, dynamic>() ?? <String, dynamic>{};
   }
 
   @deprecated
diff --git a/packages/cloud_firestore/lib/src/transaction.dart b/packages/cloud_firestore/lib/src/transaction.dart
index d42c89d9d59e..bacc5a01237f 100644
--- a/packages/cloud_firestore/lib/src/transaction.dart
+++ b/packages/cloud_firestore/lib/src/transaction.dart
@@ -14,8 +14,9 @@ class Transaction {
   Firestore _firestore;
 
   Future<DocumentSnapshot> get(DocumentReference documentReference) async {
-    final Map<String, dynamic> result = await Firestore.channel
-        .invokeMapMethod<String, dynamic>('Transaction#get', <String, dynamic>{
+    final Map<dynamic, dynamic> result = await Firestore.channel
+        .invokeMethod<Map<dynamic, dynamic>>(
+            'Transaction#get', <String, dynamic>{
       'app': _firestore.app.name,
       'transactionId': _transactionId,
       'path': documentReference.path,
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 23d6277411ac..454151fea517 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.8
+version: 0.9.9
 
 flutter:
   plugin:

From 9d30a57e73fa8dea278ab0756809f0bde0d3bb77 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Tue, 2 Apr 2019 21:59:36 -0700
Subject: [PATCH 279/410] Test zoom gestures enabled (#1434)

---
 .../googlemaps/GoogleMapController.java       |  6 +++
 .../test_driver/google_map_inspector.dart     |  4 ++
 .../example/test_driver/google_maps.dart      | 40 +++++++++++++++++++
 .../ios/Classes/GoogleMapController.m         |  3 ++
 4 files changed, 53 insertions(+)

diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index e47a9f88538d..e765306333c4 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -214,6 +214,12 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
           zoomLevels.add(googleMap.getMinZoomLevel());
           zoomLevels.add(googleMap.getMaxZoomLevel());
           result.success(zoomLevels);
+          break;
+        }
+      case "map#isZoomGesturesEnabled":
+        {
+          result.success(googleMap.getUiSettings().isZoomGesturesEnabled());
+          break;
         }
       default:
         result.notImplemented();
diff --git a/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart b/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
index 81815c30d40f..3f22a6ed32df 100644
--- a/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
+++ b/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
@@ -25,4 +25,8 @@ class GoogleMapInspector {
             .cast<double>();
     return MinMaxZoomPreference(zoomLevels[0], zoomLevels[1]);
   }
+
+  Future<bool> isZoomGesturesEnabled() async {
+    return await _channel.invokeMethod<bool>('map#isZoomGesturesEnabled');
+  }
 }
diff --git a/packages/google_maps_flutter/example/test_driver/google_maps.dart b/packages/google_maps_flutter/example/test_driver/google_maps.dart
index da8f0a2a4ff1..63e5f776d10d 100644
--- a/packages/google_maps_flutter/example/test_driver/google_maps.dart
+++ b/packages/google_maps_flutter/example/test_driver/google_maps.dart
@@ -103,4 +103,44 @@ void main() {
     zoomLevel = await inspector.getMinMaxZoomLevels();
     expect(zoomLevel, equals(finalZoomLevel));
   });
+
+  test('testZoomGesturesEnabled', () async {
+    final Key key = GlobalKey();
+    final Completer<GoogleMapInspector> inspectorCompleter =
+        Completer<GoogleMapInspector>();
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        zoomGesturesEnabled: false,
+        onMapCreated: (GoogleMapController controller) {
+          final GoogleMapInspector inspector =
+              // ignore: invalid_use_of_visible_for_testing_member
+              GoogleMapInspector(controller.channel);
+          inspectorCompleter.complete(inspector);
+        },
+      ),
+    ));
+
+    final GoogleMapInspector inspector = await inspectorCompleter.future;
+    bool zoomGesturesEnabled = await inspector.isZoomGesturesEnabled();
+    expect(zoomGesturesEnabled, false);
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        zoomGesturesEnabled: true,
+        onMapCreated: (GoogleMapController controller) {
+          fail("OnMapCreated should get called only once.");
+        },
+      ),
+    ));
+
+    zoomGesturesEnabled = await inspector.isZoomGesturesEnabled();
+    expect(zoomGesturesEnabled, true);
+  });
 }
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index 48f68ffc6f6a..1151179fd7c9 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -131,6 +131,9 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   } else if ([call.method isEqualToString:@"map#getMinMaxZoomLevels"]) {
     NSArray* zoomLevels = @[ @(_mapView.minZoom), @(_mapView.maxZoom) ];
     result(zoomLevels);
+  } else if ([call.method isEqualToString:@"map#isZoomGesturesEnabled"]) {
+    NSNumber* isZoomGesturesEnabled = @(_mapView.settings.zoomGestures);
+    result(isZoomGesturesEnabled);
   } else {
     result(FlutterMethodNotImplemented);
   }

From fbab80f8ae0f6b531f5431950524e237502e53d3 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Tue, 2 Apr 2019 22:00:44 -0700
Subject: [PATCH 280/410] fix formatting (#1436)

---
 packages/firebase_database/example/lib/main.dart  | 2 +-
 packages/firebase_storage/example/lib/main.dart   | 4 ++--
 packages/google_sign_in/example/lib/main.dart     | 2 +-
 packages/shared_preferences/example/lib/main.dart | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/firebase_database/example/lib/main.dart b/packages/firebase_database/example/lib/main.dart
index 0430e66434b7..96673e566a91 100755
--- a/packages/firebase_database/example/lib/main.dart
+++ b/packages/firebase_database/example/lib/main.dart
@@ -125,7 +125,7 @@ class _MyHomePageState extends State<MyHomePage> {
               child: _error == null
                   ? Text(
                       'Button tapped $_counter time${_counter == 1 ? '' : 's'}.\n\n'
-                          'This includes all devices, ever.',
+                      'This includes all devices, ever.',
                     )
                   : Text(
                       'Error retrieving button tap count:\n${_error.message}',
diff --git a/packages/firebase_storage/example/lib/main.dart b/packages/firebase_storage/example/lib/main.dart
index 553ee8301642..f388435938c2 100755
--- a/packages/firebase_storage/example/lib/main.dart
+++ b/packages/firebase_storage/example/lib/main.dart
@@ -100,8 +100,8 @@ class _MyHomePageState extends State<MyHomePage> {
     _scaffoldKey.currentState.showSnackBar(SnackBar(
       content: Text(
         'Success!\n Downloaded $name \n from url: $url @ bucket: $bucket\n '
-            'at path: $path \n\nFile contents: "$fileContents" \n'
-            'Wrote "$tempFileContents" to tmp.txt',
+        'at path: $path \n\nFile contents: "$fileContents" \n'
+        'Wrote "$tempFileContents" to tmp.txt',
         style: const TextStyle(color: Color.fromARGB(255, 0, 155, 0)),
       ),
     ));
diff --git a/packages/google_sign_in/example/lib/main.dart b/packages/google_sign_in/example/lib/main.dart
index 390bba367e02..32592baa7a33 100755
--- a/packages/google_sign_in/example/lib/main.dart
+++ b/packages/google_sign_in/example/lib/main.dart
@@ -54,7 +54,7 @@ class SignInDemoState extends State<SignInDemo> {
     });
     final http.Response response = await http.get(
       'https://people.googleapis.com/v1/people/me/connections'
-          '?requestMask.includeField=person.names',
+      '?requestMask.includeField=person.names',
       headers: await _currentUser.authHeaders,
     );
     if (response.statusCode != 200) {
diff --git a/packages/shared_preferences/example/lib/main.dart b/packages/shared_preferences/example/lib/main.dart
index 34347f89b844..0d93675bc84d 100644
--- a/packages/shared_preferences/example/lib/main.dart
+++ b/packages/shared_preferences/example/lib/main.dart
@@ -70,7 +70,7 @@ class SharedPreferencesDemoState extends State<SharedPreferencesDemo> {
                     else
                       return Text(
                         'Button tapped ${snapshot.data} time${snapshot.data == 1 ? '' : 's'}.\n\n'
-                            'This should persist across restarts.',
+                        'This should persist across restarts.',
                       );
                 }
               })),

From ef53e3f67e4f8b3c383d7248dc078f1d15ec1b11 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Wed, 3 Apr 2019 11:18:54 -0700
Subject: [PATCH 281/410] [google_maps] Add tests for rotate tilt and zoom
 gestures (#1442)

* Add platform impls for getters

* add real tests
---
 .../googlemaps/GoogleMapController.java       |  15 +++
 .../test_driver/google_map_inspector.dart     |  12 ++
 .../example/test_driver/google_maps.dart      | 120 ++++++++++++++++++
 .../ios/Classes/GoogleMapController.m         |   9 ++
 4 files changed, 156 insertions(+)

diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index e765306333c4..63f3cb2650f5 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -221,6 +221,21 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
           result.success(googleMap.getUiSettings().isZoomGesturesEnabled());
           break;
         }
+      case "map#isScrollGesturesEnabled":
+        {
+          result.success(googleMap.getUiSettings().isScrollGesturesEnabled());
+          break;
+        }
+      case "map#isTiltGesturesEnabled":
+        {
+          result.success(googleMap.getUiSettings().isTiltGesturesEnabled());
+          break;
+        }
+      case "map#isRotateGesturesEnabled":
+        {
+          result.success(googleMap.getUiSettings().isRotateGesturesEnabled());
+          break;
+        }
       default:
         result.notImplemented();
     }
diff --git a/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart b/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
index 3f22a6ed32df..2edf67f3e6ba 100644
--- a/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
+++ b/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
@@ -29,4 +29,16 @@ class GoogleMapInspector {
   Future<bool> isZoomGesturesEnabled() async {
     return await _channel.invokeMethod<bool>('map#isZoomGesturesEnabled');
   }
+
+  Future<bool> isRotateGesturesEnabled() async {
+    return await _channel.invokeMethod<bool>('map#isRotateGesturesEnabled');
+  }
+
+  Future<bool> isTiltGesturesEnabled() async {
+    return await _channel.invokeMethod<bool>('map#isTiltGesturesEnabled');
+  }
+
+  Future<bool> isScrollGesturesEnabled() async {
+    return await _channel.invokeMethod<bool>('map#isScrollGesturesEnabled');
+  }
 }
diff --git a/packages/google_maps_flutter/example/test_driver/google_maps.dart b/packages/google_maps_flutter/example/test_driver/google_maps.dart
index 63e5f776d10d..65235619db67 100644
--- a/packages/google_maps_flutter/example/test_driver/google_maps.dart
+++ b/packages/google_maps_flutter/example/test_driver/google_maps.dart
@@ -143,4 +143,124 @@ void main() {
     zoomGesturesEnabled = await inspector.isZoomGesturesEnabled();
     expect(zoomGesturesEnabled, true);
   });
+
+  test('testRotateGesturesEnabled', () async {
+    final Key key = GlobalKey();
+    final Completer<GoogleMapInspector> inspectorCompleter =
+        Completer<GoogleMapInspector>();
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        rotateGesturesEnabled: false,
+        onMapCreated: (GoogleMapController controller) {
+          final GoogleMapInspector inspector =
+              // ignore: invalid_use_of_visible_for_testing_member
+              GoogleMapInspector(controller.channel);
+          inspectorCompleter.complete(inspector);
+        },
+      ),
+    ));
+
+    final GoogleMapInspector inspector = await inspectorCompleter.future;
+    bool rotateGesturesEnabled = await inspector.isRotateGesturesEnabled();
+    expect(rotateGesturesEnabled, false);
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        rotateGesturesEnabled: true,
+        onMapCreated: (GoogleMapController controller) {
+          fail("OnMapCreated should get called only once.");
+        },
+      ),
+    ));
+
+    rotateGesturesEnabled = await inspector.isRotateGesturesEnabled();
+    expect(rotateGesturesEnabled, true);
+  });
+
+  test('testTiltGesturesEnabled', () async {
+    final Key key = GlobalKey();
+    final Completer<GoogleMapInspector> inspectorCompleter =
+        Completer<GoogleMapInspector>();
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        tiltGesturesEnabled: false,
+        onMapCreated: (GoogleMapController controller) {
+          final GoogleMapInspector inspector =
+              // ignore: invalid_use_of_visible_for_testing_member
+              GoogleMapInspector(controller.channel);
+          inspectorCompleter.complete(inspector);
+        },
+      ),
+    ));
+
+    final GoogleMapInspector inspector = await inspectorCompleter.future;
+    bool tiltGesturesEnabled = await inspector.isTiltGesturesEnabled();
+    expect(tiltGesturesEnabled, false);
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        tiltGesturesEnabled: true,
+        onMapCreated: (GoogleMapController controller) {
+          fail("OnMapCreated should get called only once.");
+        },
+      ),
+    ));
+
+    tiltGesturesEnabled = await inspector.isTiltGesturesEnabled();
+    expect(tiltGesturesEnabled, true);
+  });
+
+  test('testScrollGesturesEnabled', () async {
+    final Key key = GlobalKey();
+    final Completer<GoogleMapInspector> inspectorCompleter =
+        Completer<GoogleMapInspector>();
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        scrollGesturesEnabled: false,
+        onMapCreated: (GoogleMapController controller) {
+          final GoogleMapInspector inspector =
+              // ignore: invalid_use_of_visible_for_testing_member
+              GoogleMapInspector(controller.channel);
+          inspectorCompleter.complete(inspector);
+        },
+      ),
+    ));
+
+    final GoogleMapInspector inspector = await inspectorCompleter.future;
+    bool scrollGesturesEnabled = await inspector.isScrollGesturesEnabled();
+    expect(scrollGesturesEnabled, false);
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        scrollGesturesEnabled: true,
+        onMapCreated: (GoogleMapController controller) {
+          fail("OnMapCreated should get called only once.");
+        },
+      ),
+    ));
+
+    scrollGesturesEnabled = await inspector.isScrollGesturesEnabled();
+    expect(scrollGesturesEnabled, true);
+  });
 }
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index 1151179fd7c9..c5de740d82db 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -134,6 +134,15 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   } else if ([call.method isEqualToString:@"map#isZoomGesturesEnabled"]) {
     NSNumber* isZoomGesturesEnabled = @(_mapView.settings.zoomGestures);
     result(isZoomGesturesEnabled);
+  } else if ([call.method isEqualToString:@"map#isTiltGesturesEnabled"]) {
+    NSNumber* isTiltGesturesEnabled = @(_mapView.settings.tiltGestures);
+    result(isTiltGesturesEnabled);
+  } else if ([call.method isEqualToString:@"map#isRotateGesturesEnabled"]) {
+    NSNumber* isRotateGesturesEnabled = @(_mapView.settings.rotateGestures);
+    result(isRotateGesturesEnabled);
+  } else if ([call.method isEqualToString:@"map#isScrollGesturesEnabled"]) {
+    NSNumber* isScrollGesturesEnabled = @(_mapView.settings.scrollGestures);
+    result(isScrollGesturesEnabled);
   } else {
     result(FlutterMethodNotImplemented);
   }

From 763d60ea5563872b6a590ec973a3f72e7c227374 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Wed, 3 Apr 2019 14:28:55 -0700
Subject: [PATCH 282/410] [google_maps] Update android gradle version (#1441)

* Update the android gradle version

* Update CHANGELOG.md

capitalize Android
---
 packages/google_maps_flutter/CHANGELOG.md                 | 5 +++++
 packages/google_maps_flutter/android/build.gradle         | 2 +-
 packages/google_maps_flutter/example/android/build.gradle | 2 +-
 packages/google_maps_flutter/pubspec.yaml                 | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 07f1c103792d..6945ada986ea 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.5.1
+
+* Update Android gradle version.
+* Added infrastructure to write integration tests.
+
 ## 0.5.0
 
 * Add a key parameter to the GoogleMap widget.
diff --git a/packages/google_maps_flutter/android/build.gradle b/packages/google_maps_flutter/android/build.gradle
index 217099b45356..8992ab39e74c 100644
--- a/packages/google_maps_flutter/android/build.gradle
+++ b/packages/google_maps_flutter/android/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.2'
     }
 }
 
diff --git a/packages/google_maps_flutter/example/android/build.gradle b/packages/google_maps_flutter/example/android/build.gradle
index 541636cc492a..6e12e86d782e 100644
--- a/packages/google_maps_flutter/example/android/build.gradle
+++ b/packages/google_maps_flutter/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.2'
     }
 }
 
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 4617ab648a41..9999079032ac 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.0
+version: 0.5.1
 
 dependencies:
   flutter:

From d5bc271b9fe9150ede31641b34bee31be400a4a3 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alex@tekartik.com>
Date: Thu, 4 Apr 2019 01:34:40 +0200
Subject: [PATCH 283/410] [firebase_core] Fix firebase core registration and
 fix firestore document observer cleanup (#991)

* Support for cloud_firestore running in the background on Android.
* Fixed a bug in cleanup for DocumentReference.snapshots().
* Additional integration testing.
---
 packages/cloud_firestore/CHANGELOG.md             |  6 ++++++
 .../example/test_driver/cloud_firestore.dart      | 15 ++++++++++++---
 .../lib/src/document_reference.dart               |  2 +-
 packages/cloud_firestore/pubspec.yaml             |  2 +-
 .../plugins/firebase/core/FirebaseCorePlugin.java |  2 +-
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 58e5ff5177d5..8fb45c672450 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.9.10
+
+* Support for cloud_firestore running in the background on Android.
+* Fixed a bug in cleanup for DocumentReference.snapshots().
+* Additional integration testing.
+
 ## 0.9.9
 
 * Remove `invokeMapMethod` calls to prevent crash.
diff --git a/packages/cloud_firestore/example/test_driver/cloud_firestore.dart b/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
index c56444543d81..1a2ddc1fb6ed 100644
--- a/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
+++ b/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
@@ -26,9 +26,18 @@ void main() {
     });
 
     test('getDocuments', () async {
-      final CollectionReference reference = firestore.collection('messages');
-      final QuerySnapshot snapshot = await reference.getDocuments();
-      expect(snapshot.documents.length, isNonZero);
+      final Query query = firestore
+          .collection('messages')
+          .where('message', isEqualTo: 'Hello world!')
+          .limit(1);
+      final QuerySnapshot querySnapshot = await query.getDocuments();
+      expect(querySnapshot.documents.first['message'], 'Hello world!');
+      final DocumentReference firstDoc =
+          querySnapshot.documents.first.reference;
+      final DocumentSnapshot documentSnapshot = await firstDoc.get();
+      expect(documentSnapshot.data['message'], 'Hello world!');
+      final DocumentSnapshot snapshot = await firstDoc.snapshots().first;
+      expect(snapshot.data['message'], 'Hello world!');
     });
   });
 }
diff --git a/packages/cloud_firestore/lib/src/document_reference.dart b/packages/cloud_firestore/lib/src/document_reference.dart
index a1ad31ac5823..d9f753215765 100644
--- a/packages/cloud_firestore/lib/src/document_reference.dart
+++ b/packages/cloud_firestore/lib/src/document_reference.dart
@@ -128,7 +128,7 @@ class DocumentReference {
             'Query#removeListener',
             <String, dynamic>{'handle': handle},
           );
-          Firestore._queryObservers.remove(handle);
+          Firestore._documentObservers.remove(handle);
         });
       },
     );
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 454151fea517..3eeef0b1c946 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.9
+version: 0.9.10
 
 flutter:
   plugin:
diff --git a/packages/firebase_core/android/src/main/java/io/flutter/plugins/firebase/core/FirebaseCorePlugin.java b/packages/firebase_core/android/src/main/java/io/flutter/plugins/firebase/core/FirebaseCorePlugin.java
index 7d1c8f754240..3d60df1bfeb3 100644
--- a/packages/firebase_core/android/src/main/java/io/flutter/plugins/firebase/core/FirebaseCorePlugin.java
+++ b/packages/firebase_core/android/src/main/java/io/flutter/plugins/firebase/core/FirebaseCorePlugin.java
@@ -25,7 +25,7 @@ public class FirebaseCorePlugin implements MethodCallHandler {
   public static void registerWith(PluginRegistry.Registrar registrar) {
     final MethodChannel channel =
         new MethodChannel(registrar.messenger(), "plugins.flutter.io/firebase_core");
-    channel.setMethodCallHandler(new FirebaseCorePlugin(registrar.activity()));
+    channel.setMethodCallHandler(new FirebaseCorePlugin(registrar.context()));
   }
 
   private FirebaseCorePlugin(Context context) {

From 1a5a0718e0b9e4b00108673f18b0c2ab69b3dd14 Mon Sep 17 00:00:00 2001
From: Julius Marozas <marozas.julius@gmail.com>
Date: Thu, 4 Apr 2019 16:55:32 +0300
Subject: [PATCH 284/410] [cloud_firestore] Update firebase-firestore to 18.2.0
 (#1306)

---
 packages/cloud_firestore/CHANGELOG.md                     | 6 +++++-
 packages/cloud_firestore/android/build.gradle             | 2 +-
 packages/cloud_firestore/example/android/app/build.gradle | 1 +
 packages/cloud_firestore/pubspec.yaml                     | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 8fb45c672450..fb056969a2a1 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,4 +1,8 @@
-## 0.9.10
+## 0.9.11
+
+* Bump Android dependencies to latest.
+
+# 0.9.10
 
 * Support for cloud_firestore running in the background on Android.
 * Fixed a bug in cleanup for DocumentReference.snapshots().
diff --git a/packages/cloud_firestore/android/build.gradle b/packages/cloud_firestore/android/build.gradle
index 34b58bb46f72..c0283007130d 100755
--- a/packages/cloud_firestore/android/build.gradle
+++ b/packages/cloud_firestore/android/build.gradle
@@ -47,7 +47,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-firestore:17.1.1'
+        api 'com.google.firebase:firebase-firestore:18.2.0'
         implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/cloud_firestore/example/android/app/build.gradle b/packages/cloud_firestore/example/android/app/build.gradle
index f3327118cfa0..335003e1414f 100755
--- a/packages/cloud_firestore/example/android/app/build.gradle
+++ b/packages/cloud_firestore/example/android/app/build.gradle
@@ -38,6 +38,7 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
 
     buildTypes {
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 3eeef0b1c946..f77def0aa209 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.10
+version: 0.9.11
 
 flutter:
   plugin:

From 121bf082c976c1679418cc1ccc5fc0bfb83a4583 Mon Sep 17 00:00:00 2001
From: Dipansh Khandelwal <dipanshkhandelwal@gmail.com>
Date: Thu, 4 Apr 2019 21:46:34 +0530
Subject: [PATCH 285/410] [google_sign_in]  (#1438)

[google_sign_in] Handle `null` check in example app
---
 packages/google_sign_in/CHANGELOG.md          | 4 ++++
 packages/google_sign_in/example/lib/main.dart | 6 +++---
 packages/google_sign_in/pubspec.yaml          | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md
index 5b902dd33ca5..285f5959b436 100644
--- a/packages/google_sign_in/CHANGELOG.md
+++ b/packages/google_sign_in/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.1+3
+
+* Update example to gracefully handle null user information.
+
 ## 4.0.1+2
 
 * Fix README.md to correctly spell `GoogleService-Info.plist`.
diff --git a/packages/google_sign_in/example/lib/main.dart b/packages/google_sign_in/example/lib/main.dart
index 32592baa7a33..42a81b80841c 100755
--- a/packages/google_sign_in/example/lib/main.dart
+++ b/packages/google_sign_in/example/lib/main.dart
@@ -115,11 +115,11 @@ class SignInDemoState extends State<SignInDemo> {
             leading: GoogleUserCircleAvatar(
               identity: _currentUser,
             ),
-            title: Text(_currentUser.displayName),
-            subtitle: Text(_currentUser.email),
+            title: Text(_currentUser.displayName ?? ''),
+            subtitle: Text(_currentUser.email ?? ''),
           ),
           const Text("Signed in successfully."),
-          Text(_contactText),
+          Text(_contactText ?? ''),
           RaisedButton(
             child: const Text('SIGN OUT'),
             onPressed: _handleSignOut,
diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml
index 0f4db18f2b3a..12082e66b345 100755
--- a/packages/google_sign_in/pubspec.yaml
+++ b/packages/google_sign_in/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in
-version: 4.0.1+2
+version: 4.0.1+3
 
 flutter:
   plugin:

From 25a60b380034e022cf8911d1b3864255786b5574 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Thu, 4 Apr 2019 19:07:45 +0200
Subject: [PATCH 286/410] [firebase_crashlytics] Rely on firebase_core to set
 up Firebase Analytics dependency (#1418)

* Rely on firebase_core to set up Firebase Analytics dependency

Fixes flutter/flutter#30037
---
 packages/firebase_crashlytics/CHANGELOG.md         | 4 ++++
 packages/firebase_crashlytics/android/build.gradle | 1 -
 packages/firebase_crashlytics/pubspec.yaml         | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_crashlytics/CHANGELOG.md b/packages/firebase_crashlytics/CHANGELOG.md
index 11cecdc6e57a..c66c92b57a54 100644
--- a/packages/firebase_crashlytics/CHANGELOG.md
+++ b/packages/firebase_crashlytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.3
+
+* Rely on firebase_core to add the Android dependency on Firebase instead of hardcoding the version ourselves
+
 ## 0.0.2+1
 
 * Update variable name `enableInDevMode` in README.
diff --git a/packages/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/android/build.gradle
index fd3f9d8ee6d8..822e5e334d42 100644
--- a/packages/firebase_crashlytics/android/build.gradle
+++ b/packages/firebase_crashlytics/android/build.gradle
@@ -37,6 +37,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-core:16.0.8'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
 }
diff --git a/packages/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/pubspec.yaml
index 6ad71000ac94..bd7da5e6e05d 100644
--- a/packages/firebase_crashlytics/pubspec.yaml
+++ b/packages/firebase_crashlytics/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_crashlytics
 description: Flutter plugin for Firebase Crashlytics. It reports uncaught errors to the
   Firebase console.
-version: 0.0.2+1
+version: 0.0.3
 author: Flutter Team <flutter-dev@google.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_crashlytics
 

From 4fa349fb3fe79a22f9a8ea2dc22274bfa1f9fce6 Mon Sep 17 00:00:00 2001
From: Sigurd Meldgaard <sigurdm@google.com>
Date: Thu, 4 Apr 2019 19:36:10 +0200
Subject: [PATCH 287/410] [battery] Update example in README.md (#1439)

Update example in README.md `Battery.batteryLevel` returns a `Future`.
---
 packages/battery/CHANGELOG.md | 4 ++++
 packages/battery/README.md    | 2 +-
 packages/battery/pubspec.yaml | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/battery/CHANGELOG.md b/packages/battery/CHANGELOG.md
index d70b0d6071a6..64b78f76d6db 100644
--- a/packages/battery/CHANGELOG.md
+++ b/packages/battery/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.0+3
+
+* Fix `batteryLevel` usage example in README
+
 ## 0.3.0+2
 
 * Bump the minimum Flutter version to 1.2.0.
diff --git a/packages/battery/README.md b/packages/battery/README.md
index 2ed23eea3259..93f8330db0db 100644
--- a/packages/battery/README.md
+++ b/packages/battery/README.md
@@ -17,7 +17,7 @@ import 'package:battery/battery.dart';
 var battery = Battery();
 
 // Access current battery level
-print(battery.batteryLevel);
+print(await battery.batteryLevel);
 
 // Be informed when the state (full, charging, discharging) changes
 _battery.onBatteryStateChanged.listen((BatteryState state) {
diff --git a/packages/battery/pubspec.yaml b/packages/battery/pubspec.yaml
index 6d9af34e8b57..b9a9bcbde1b4 100644
--- a/packages/battery/pubspec.yaml
+++ b/packages/battery/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for accessing information about the battery state
   (full, charging, discharging) on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/battery
-version: 0.3.0+2
+version: 0.3.0+3
 
 flutter:
   plugin:

From 32c181ba5f023d5effdf2778fb9bda8433d2c64d Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Thu, 4 Apr 2019 11:39:15 -0700
Subject: [PATCH 288/410] [Image_picker]Android: fix original image deleted
 after scaling. (#1445)

On android, we delete the original image after scaling. It causes a fatal issue when user picks an image from gallery. We should never delete an image from user's gallery! This PR fixes the issue.
flutter/flutter#29594
---
 packages/image_picker/CHANGELOG.md                        | 4 ++++
 .../flutter/plugins/imagepicker/ImagePickerDelegate.java  | 8 ++++----
 packages/image_picker/pubspec.yaml                        | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index eee08ac35aca..1c4f0ce1bc28 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.1
+
+* Android: Do not delete original image after scaling if the image is from gallery.
+
 ## 0.5.0+9
 
 * Remove unnecessary temp video file path.
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
index eb1e990045c1..d6aa35533ea1 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
@@ -369,7 +369,7 @@ public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
   private void handleChooseImageResult(int resultCode, Intent data) {
     if (resultCode == Activity.RESULT_OK && data != null) {
       String path = fileUtils.getPathFromUri(activity, data.getData());
-      handleImageResult(path);
+      handleImageResult(path, false);
       return;
     }
 
@@ -395,7 +395,7 @@ private void handleCaptureImageResult(int resultCode) {
           new OnPathReadyListener() {
             @Override
             public void onPathReady(String path) {
-              handleImageResult(path);
+              handleImageResult(path, true);
             }
           });
       return;
@@ -422,7 +422,7 @@ public void onPathReady(String path) {
     finishWithSuccess(null);
   }
 
-  private void handleImageResult(String path) {
+  private void handleImageResult(String path, boolean shouldDeleteOriginalIfScaled) {
     if (pendingResult != null) {
       Double maxWidth = methodCall.argument("maxWidth");
       Double maxHeight = methodCall.argument("maxHeight");
@@ -431,7 +431,7 @@ private void handleImageResult(String path) {
       finishWithSuccess(finalImagePath);
 
       //delete original file if scaled
-      if (!finalImagePath.equals(path)) {
+      if (!finalImagePath.equals(path) && shouldDeleteOriginalIfScaled) {
         new File(path).delete();
       }
     } else {
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 9610abda2530..741777f3ebb6 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.0+9
+version: 0.5.1
 
 flutter:
   plugin:

From 18f2ce27d1fd3b4f9c365d49d1734714c4a3d029 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Thu, 4 Apr 2019 12:50:57 -0700
Subject: [PATCH 289/410] [firebase_ml_vision] Update ImageDetector for iOS
 (#1364)

---
 packages/firebase_ml_vision/CHANGELOG.md      |   9 +
 .../firebase_ml_vision/example/ios/Podfile    |  68 +++++++
 .../example/lib/detector_painters.dart        |   6 +-
 .../firebase_ml_vision/example/lib/main.dart  |  10 +-
 .../ios/Classes/CloudLabelDetector.m          |  51 ------
 .../ios/Classes/FirebaseMlVisionPlugin.h      |   5 +-
 .../ios/Classes/FirebaseMlVisionPlugin.m      |   6 +-
 .../ios/Classes/ImageLabeler.m                |  58 ++++++
 .../ios/Classes/LabelDetector.m               |  39 ----
 .../ios/firebase_ml_vision.podspec            |   3 +-
 .../lib/firebase_ml_vision.dart               |   3 +-
 .../lib/src/cloud_detector_options.dart       |  36 ----
 .../lib/src/firebase_vision.dart              |  21 ++-
 .../lib/src/image_labeler.dart                | 127 +++++++++++++
 .../lib/src/label_detector.dart               | 149 ---------------
 packages/firebase_ml_vision/pubspec.yaml      |   2 +-
 .../test/firebase_ml_vision_test.dart         | 173 ------------------
 .../test/image_labeler_test.dart              | 165 +++++++++++++++++
 18 files changed, 456 insertions(+), 475 deletions(-)
 create mode 100644 packages/firebase_ml_vision/example/ios/Podfile
 delete mode 100644 packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m
 create mode 100644 packages/firebase_ml_vision/ios/Classes/ImageLabeler.m
 delete mode 100644 packages/firebase_ml_vision/ios/Classes/LabelDetector.m
 delete mode 100644 packages/firebase_ml_vision/lib/src/cloud_detector_options.dart
 create mode 100644 packages/firebase_ml_vision/lib/src/image_labeler.dart
 delete mode 100644 packages/firebase_ml_vision/lib/src/label_detector.dart
 create mode 100644 packages/firebase_ml_vision/test/image_labeler_test.dart

diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 5fd15a48e2bb..66bd7d3525dd 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 0.7.0
+
+* **Breaking Change** Unified and enhanced on-device and cloud image-labeling API.
+  `iOS` now requires minimum deployment target of 9.0. Add `platform :ios, '9.0'` in your `Podfile`.
+  Updated to latest version of `Firebase/MLVision` on `iOS`. Please run `pod update` in directory containing your `iOS` project `Podfile`.
+  `Label` renamed to `ImageLabel`.
+  `LabelDetector` renamed to `ImageLabeler`.
+  Removed `CloudLabelDetector` and replaced it with a cloud `ImageLabeler`.
+
 ## 0.6.0+2
 
 * Update README.md
diff --git a/packages/firebase_ml_vision/example/ios/Podfile b/packages/firebase_ml_vision/example/ios/Podfile
new file mode 100644
index 000000000000..c84fa0cb6579
--- /dev/null
+++ b/packages/firebase_ml_vision/example/ios/Podfile
@@ -0,0 +1,68 @@
+# Uncomment this line to define a global platform for your project
+platform :ios, '9.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+def parse_KV_file(file, separator='=')
+  file_abs_path = File.expand_path(file)
+  if !File.exists? file_abs_path
+    return [];
+  end
+  pods_ary = []
+  skip_line_start_symbols = ["#", "/"]
+  File.foreach(file_abs_path) { |line|
+      next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
+      plugin = line.split(pattern=separator)
+      if plugin.length == 2
+        podname = plugin[0].strip()
+        path = plugin[1].strip()
+        podpath = File.expand_path("#{path}", file_abs_path)
+        pods_ary.push({:name => podname, :path => podpath});
+      else
+        puts "Invalid plugin specification: #{line}"
+      end
+  }
+  return pods_ary
+end
+
+target 'Runner' do
+  # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
+  # referring to absolute paths on developers' machines.
+  system('rm -rf .symlinks')
+  system('mkdir -p .symlinks/plugins')
+
+  # Flutter Pods
+  generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig')
+  if generated_xcode_build_settings.empty?
+    puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter packages get is executed first."
+  end
+  generated_xcode_build_settings.map { |p|
+    if p[:name] == 'FLUTTER_FRAMEWORK_DIR'
+      symlink = File.join('.symlinks', 'flutter')
+      File.symlink(File.dirname(p[:path]), symlink)
+      pod 'Flutter', :path => File.join(symlink, File.basename(p[:path]))
+    end
+  }
+
+  # Plugin Pods
+  plugin_pods = parse_KV_file('../.flutter-plugins')
+  plugin_pods.map { |p|
+    symlink = File.join('.symlinks', 'plugins', p[:name])
+    File.symlink(p[:path], symlink)
+    pod p[:name], :path => File.join(symlink, 'ios')
+  }
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['ENABLE_BITCODE'] = 'NO'
+    end
+  end
+end
+
+pod 'Firebase/MLVisionBarcodeModel'
+pod 'Firebase/MLVisionFaceModel'
+pod 'Firebase/MLVisionLabelModel'
+pod 'Firebase/MLVisionTextModel'
diff --git a/packages/firebase_ml_vision/example/lib/detector_painters.dart b/packages/firebase_ml_vision/example/lib/detector_painters.dart
index c9248e1bbb64..684503b1086c 100644
--- a/packages/firebase_ml_vision/example/lib/detector_painters.dart
+++ b/packages/firebase_ml_vision/example/lib/detector_painters.dart
@@ -86,7 +86,7 @@ class LabelDetectorPainter extends CustomPainter {
   LabelDetectorPainter(this.absoluteImageSize, this.labels);
 
   final Size absoluteImageSize;
-  final List<Label> labels;
+  final List<ImageLabel> labels;
 
   @override
   void paint(Canvas canvas, Size size) {
@@ -98,8 +98,8 @@ class LabelDetectorPainter extends CustomPainter {
     );
 
     builder.pushStyle(ui.TextStyle(color: Colors.green));
-    for (Label label in labels) {
-      builder.addText('Label: ${label.label}, '
+    for (ImageLabel label in labels) {
+      builder.addText('Label: ${label.text}, '
           'Confidence: ${label.confidence.toStringAsFixed(2)}\n');
     }
     builder.pop();
diff --git a/packages/firebase_ml_vision/example/lib/main.dart b/packages/firebase_ml_vision/example/lib/main.dart
index f52e06ed35c0..183a802687d6 100644
--- a/packages/firebase_ml_vision/example/lib/main.dart
+++ b/packages/firebase_ml_vision/example/lib/main.dart
@@ -82,13 +82,13 @@ class _MyHomePageState extends State<_MyHomePage> {
         results = await detector.processImage(visionImage);
         break;
       case Detector.label:
-        final LabelDetector detector = FirebaseVision.instance.labelDetector();
-        results = await detector.detectInImage(visionImage);
+        final ImageLabeler labeler = FirebaseVision.instance.imageLabeler();
+        results = await labeler.processImage(visionImage);
         break;
       case Detector.cloudLabel:
-        final CloudLabelDetector detector =
-            FirebaseVision.instance.cloudLabelDetector();
-        results = await detector.detectInImage(visionImage);
+        final ImageLabeler labeler =
+            FirebaseVision.instance.cloudImageLabeler();
+        results = await labeler.processImage(visionImage);
         break;
       case Detector.text:
         final TextRecognizer recognizer =
diff --git a/packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m b/packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m
deleted file mode 100644
index 3be3948b4a9f..000000000000
--- a/packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m
+++ /dev/null
@@ -1,51 +0,0 @@
-#import "FirebaseMlVisionPlugin.h"
-
-@implementation CloudLabelDetector
-static FIRVisionCloudLabelDetector *detector;
-
-+ (void)handleDetection:(FIRVisionImage *)image
-                options:(NSDictionary *)options
-                 result:(FlutterResult)result {
-  FIRVision *vision = [FIRVision vision];
-  detector = [vision cloudLabelDetectorWithOptions:[CloudLabelDetector parseOptions:options]];
-
-  [detector
-      detectInImage:image
-         completion:^(NSArray<FIRVisionCloudLabel *> *_Nullable labels, NSError *_Nullable error) {
-           if (error) {
-             [FLTFirebaseMlVisionPlugin handleError:error result:result];
-             return;
-           } else if (!labels) {
-             result(@[]);
-           }
-
-           NSMutableArray *labelData = [NSMutableArray array];
-           for (FIRVisionCloudLabel *label in labels) {
-             NSDictionary *data = @{
-               @"confidence" : label.confidence,
-               @"entityId" : label.entityId,
-               @"label" : label.label
-             };
-             [labelData addObject:data];
-           }
-
-           result(labelData);
-         }];
-}
-
-+ (FIRVisionCloudDetectorOptions *)parseOptions:(NSDictionary *)optionsData {
-  FIRVisionCloudDetectorOptions *options = [[FIRVisionCloudDetectorOptions alloc] init];
-
-  NSNumber *maxResults = optionsData[@"maxResults"];
-  options.maxResults = [maxResults unsignedIntegerValue];
-
-  NSString *modelTypeStr = optionsData[@"modelType"];
-  if ([@"stable" isEqualToString:modelTypeStr]) {
-    options.modelType = FIRVisionCloudModelTypeStable;
-  } else if ([@"latest" isEqualToString:modelTypeStr]) {
-    options.modelType = FIRVisionCloudModelTypeLatest;
-  }
-
-  return options;
-}
-@end
diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.h b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.h
index 9a620dc45cfa..458cd1d2641b 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.h
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.h
@@ -20,10 +20,7 @@
 @interface FaceDetector : NSObject <Detector>
 @end
 
-@interface LabelDetector : NSObject <Detector>
-@end
-
-@interface CloudLabelDetector : NSObject <Detector>
+@interface ImageLabeler : NSObject <Detector>
 @end
 
 @interface TextRecognizer : NSObject <Detector>
diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index deb5f50dd1dc..bdbaea8f7f15 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -38,10 +38,8 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     [BarcodeDetector handleDetection:image options:options result:result];
   } else if ([@"FaceDetector#processImage" isEqualToString:call.method]) {
     [FaceDetector handleDetection:image options:options result:result];
-  } else if ([@"LabelDetector#detectInImage" isEqualToString:call.method]) {
-    [LabelDetector handleDetection:image options:options result:result];
-  } else if ([@"CloudLabelDetector#detectInImage" isEqualToString:call.method]) {
-    [CloudLabelDetector handleDetection:image options:options result:result];
+  } else if ([@"ImageLabeler#processImage" isEqualToString:call.method]) {
+    [ImageLabeler handleDetection:image options:options result:result];
   } else if ([@"TextRecognizer#processImage" isEqualToString:call.method]) {
     [TextRecognizer handleDetection:image options:options result:result];
   } else {
diff --git a/packages/firebase_ml_vision/ios/Classes/ImageLabeler.m b/packages/firebase_ml_vision/ios/Classes/ImageLabeler.m
new file mode 100644
index 000000000000..c37ccf2344f6
--- /dev/null
+++ b/packages/firebase_ml_vision/ios/Classes/ImageLabeler.m
@@ -0,0 +1,58 @@
+#import "FirebaseMlVisionPlugin.h"
+
+@implementation ImageLabeler
+static FIRVisionImageLabeler *labeler;
+
++ (void)handleDetection:(FIRVisionImage *)image
+                options:(NSDictionary *)options
+                 result:(FlutterResult)result {
+  FIRVision *vision = [FIRVision vision];
+
+  if ([@"onDevice" isEqualToString:options[@"modelType"]]) {
+    labeler = [vision onDeviceImageLabelerWithOptions:[ImageLabeler parseOptions:options]];
+  } else if ([@"cloud" isEqualToString:options[@"modelType"]]) {
+    labeler = [vision cloudImageLabelerWithOptions:[ImageLabeler parseCloudOptions:options]];
+  }
+
+  [labeler
+      processImage:image
+        completion:^(NSArray<FIRVisionImageLabel *> *_Nullable labels, NSError *_Nullable error) {
+          if (error) {
+            [FLTFirebaseMlVisionPlugin handleError:error result:result];
+            return;
+          } else if (!labels) {
+            result(@[]);
+          }
+
+          NSMutableArray *labelData = [NSMutableArray array];
+          for (FIRVisionImageLabel *label in labels) {
+            NSDictionary *data = @{
+              @"confidence" : label.confidence,
+              @"entityID" : label.entityID,
+              @"text" : label.text,
+            };
+            [labelData addObject:data];
+          }
+
+          result(labelData);
+        }];
+}
+
++ (FIRVisionOnDeviceImageLabelerOptions *)parseOptions:(NSDictionary *)optionsData {
+  NSNumber *conf = optionsData[@"confidenceThreshold"];
+
+  FIRVisionOnDeviceImageLabelerOptions *options = [FIRVisionOnDeviceImageLabelerOptions new];
+  options.confidenceThreshold = [conf floatValue];
+
+  return options;
+}
+
++ (FIRVisionCloudImageLabelerOptions *)parseCloudOptions:(NSDictionary *)optionsData {
+  NSNumber *conf = optionsData[@"confidenceThreshold"];
+
+  FIRVisionCloudImageLabelerOptions *options = [FIRVisionCloudImageLabelerOptions new];
+  options.confidenceThreshold = [conf floatValue];
+
+  return options;
+}
+@end
diff --git a/packages/firebase_ml_vision/ios/Classes/LabelDetector.m b/packages/firebase_ml_vision/ios/Classes/LabelDetector.m
deleted file mode 100644
index 7c381779d843..000000000000
--- a/packages/firebase_ml_vision/ios/Classes/LabelDetector.m
+++ /dev/null
@@ -1,39 +0,0 @@
-#import "FirebaseMlVisionPlugin.h"
-
-@implementation LabelDetector
-static FIRVisionLabelDetector *detector;
-
-+ (void)handleDetection:(FIRVisionImage *)image
-                options:(NSDictionary *)options
-                 result:(FlutterResult)result {
-  FIRVision *vision = [FIRVision vision];
-  detector = [vision labelDetectorWithOptions:[LabelDetector parseOptions:options]];
-
-  [detector detectInImage:image
-               completion:^(NSArray<FIRVisionLabel *> *_Nullable labels, NSError *_Nullable error) {
-                 if (error) {
-                   [FLTFirebaseMlVisionPlugin handleError:error result:result];
-                   return;
-                 } else if (!labels) {
-                   result(@[]);
-                 }
-
-                 NSMutableArray *labelData = [NSMutableArray array];
-                 for (FIRVisionLabel *label in labels) {
-                   NSDictionary *data = @{
-                     @"confidence" : @(label.confidence),
-                     @"entityID" : label.entityID,
-                     @"label" : label.label
-                   };
-                   [labelData addObject:data];
-                 }
-
-                 result(labelData);
-               }];
-}
-
-+ (FIRVisionLabelDetectorOptions *)parseOptions:(NSDictionary *)optionsData {
-  NSNumber *conf = optionsData[@"confidenceThreshold"];
-  return [[FIRVisionLabelDetectorOptions alloc] initWithConfidenceThreshold:[conf floatValue]];
-}
-@end
diff --git a/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec b/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec
index 4e6ea62226c9..a25eef4a3fa1 100644
--- a/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec
+++ b/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec
@@ -18,7 +18,6 @@ An SDK that brings Google's machine learning expertise to Android and iOS apps i
   s.dependency 'Flutter'
   s.dependency 'Firebase/Core'
   s.dependency 'Firebase/MLVision'
-  s.dependency 'GoogleAppMeasurement', '~> 5.3.0'
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
   s.static_framework = true
 end
diff --git a/packages/firebase_ml_vision/lib/firebase_ml_vision.dart b/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
index 8dcbaa24a390..7e90b95b4a44 100644
--- a/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
+++ b/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
@@ -15,6 +15,5 @@ import 'package:flutter/services.dart';
 part 'src/barcode_detector.dart';
 part 'src/face_detector.dart';
 part 'src/firebase_vision.dart';
-part 'src/label_detector.dart';
+part 'src/image_labeler.dart';
 part 'src/text_recognizer.dart';
-part 'src/cloud_detector_options.dart';
diff --git a/packages/firebase_ml_vision/lib/src/cloud_detector_options.dart b/packages/firebase_ml_vision/lib/src/cloud_detector_options.dart
deleted file mode 100644
index 58c7c8885fe5..000000000000
--- a/packages/firebase_ml_vision/lib/src/cloud_detector_options.dart
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-part of firebase_ml_vision;
-
-/// Model types for cloud vision APIs.
-enum CloudModelType { stable, latest }
-
-/// Options for cloud vision detectors.
-class CloudDetectorOptions {
-  /// Constructor for [CloudDetectorOptions].
-  ///
-  /// [maxResults] must be greater than 0, otherwise AssertionError is thrown.
-  /// Default is 10.
-  ///
-  /// [modelType] has default [CloudModelType.stable].
-  const CloudDetectorOptions(
-      {this.maxResults = 10, this.modelType = CloudModelType.stable})
-      : assert(maxResults > 0),
-        assert(modelType != null);
-
-  /// The number of results to be returned.
-  ///
-  /// Defaults to 10.
-  /// Required to be greater than zero.
-  final int maxResults;
-
-  /// The type of model to use for the detection.
-  final CloudModelType modelType;
-
-  Map<String, dynamic> _serialize() => <String, dynamic>{
-        'maxResults': maxResults,
-        'modelType': _enumToString(modelType),
-      };
-}
diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 71c68f1d8395..0aa9b5bf7a4d 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -11,6 +11,9 @@ enum _ImageType { file, bytes }
 /// Rotation is counter-clockwise.
 enum ImageRotation { rotation0, rotation90, rotation180, rotation270 }
 
+/// Indicates whether a model is ran on device or in the cloud.
+enum ModelType { onDevice, cloud }
+
 /// The Firebase machine learning vision API.
 ///
 /// You can get an instance by calling [FirebaseVision.instance] and then get
@@ -45,17 +48,23 @@ class FirebaseVision {
     return FaceDetector._(options ?? const FaceDetectorOptions());
   }
 
-  /// Creates an instance of [LabelDetector].
-  LabelDetector labelDetector([LabelDetectorOptions options]) {
-    return LabelDetector._(options ?? const LabelDetectorOptions());
+  /// Creates an on device instance of [ImageLabeler].
+  ImageLabeler imageLabeler([ImageLabelerOptions options]) {
+    return ImageLabeler._(
+      options: options ?? const ImageLabelerOptions(),
+      modelType: ModelType.onDevice,
+    );
   }
 
   /// Creates an instance of [TextRecognizer].
   TextRecognizer textRecognizer() => TextRecognizer._();
 
-  /// Creates an instance of [CloudLabelDetector].
-  CloudLabelDetector cloudLabelDetector([CloudDetectorOptions options]) {
-    return CloudLabelDetector._(options ?? const CloudDetectorOptions());
+  /// Creates a cloud instance of [ImageLabeler].
+  ImageLabeler cloudImageLabeler([CloudImageLabelerOptions options]) {
+    return ImageLabeler._(
+      options: options ?? const CloudImageLabelerOptions(),
+      modelType: ModelType.cloud,
+    );
   }
 }
 
diff --git a/packages/firebase_ml_vision/lib/src/image_labeler.dart b/packages/firebase_ml_vision/lib/src/image_labeler.dart
new file mode 100644
index 000000000000..9ceccf39c50c
--- /dev/null
+++ b/packages/firebase_ml_vision/lib/src/image_labeler.dart
@@ -0,0 +1,127 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of firebase_ml_vision;
+
+/// Used for finding [ImageLabel]s in a supplied image.
+///
+/// When you use the API, you get a list of the entities that were recognized:
+/// people, things, places, activities, and so on. Each label found comes with a
+/// score that indicates the confidence the ML model has in its relevance. With
+/// this information, you can perform tasks such as automatic metadata
+/// generation and content moderation.
+///
+/// A image labeler is created via
+/// `imageLabeler([ImageLabelerOptions options])` or
+/// `cloudImageLabeler([CloudImageLabelerOptions options])` in [FirebaseVision]:
+///
+/// ```dart
+/// final FirebaseVisionImage image =
+///     FirebaseVisionImage.fromFilePath('path/to/file');
+///
+/// final ImageLabeler imageLabeler =
+///     FirebaseVision.instance.imageLabeler(options);
+///
+/// final List<ImageLabel> labels = await imageLabeler.processImage(image);
+/// ```
+class ImageLabeler {
+  ImageLabeler._({@required dynamic options, @required this.modelType})
+      : _options = options,
+        assert(options != null),
+        assert(modelType != null);
+
+  /// Indicates whether this labeler is ran on device or in the cloud.
+  final ModelType modelType;
+
+  // Should be of type ImageLabelerOptions or CloudImageLabelerOptions.
+  final dynamic _options;
+
+  /// Finds entities in the input image.
+  Future<List<ImageLabel>> processImage(FirebaseVisionImage visionImage) async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
+      'ImageLabeler#processImage',
+      <String, dynamic>{
+        'options': <String, dynamic>{
+          'modelType': _enumToString(modelType),
+          'confidenceThreshold': _options.confidenceThreshold,
+        },
+      }..addAll(visionImage._serialize()),
+    );
+
+    final List<ImageLabel> labels = <ImageLabel>[];
+    for (dynamic data in reply) {
+      labels.add(ImageLabel._(data));
+    }
+
+    return labels;
+  }
+}
+
+/// Options for on device image labeler.
+///
+/// Confidence threshold could be provided for the label detection. For example,
+/// if the confidence threshold is set to 0.7, only labels with
+/// confidence >= 0.7 would be returned. The default threshold is 0.5.
+class ImageLabelerOptions {
+  /// Constructor for [ImageLabelerOptions].
+  ///
+  /// Confidence threshold could be provided for the label detection.
+  /// For example, if the confidence threshold is set to 0.7, only labels with
+  /// confidence >= 0.7 would be returned. The default threshold is 0.5.
+  const ImageLabelerOptions({this.confidenceThreshold = 0.5})
+      : assert(confidenceThreshold >= 0.0),
+        assert(confidenceThreshold <= 1.0);
+
+  /// The minimum confidence threshold of labels to be detected.
+  ///
+  /// Required to be in range [0.0, 1.0].
+  final double confidenceThreshold;
+}
+
+/// Options for cloud image labeler.
+///
+/// Confidence threshold could be provided for the label detection. For example,
+/// if the confidence threshold is set to 0.7, only labels with
+/// confidence >= 0.7 would be returned. The default threshold is 0.5.
+class CloudImageLabelerOptions {
+  /// Constructor for [CloudImageLabelerOptions].
+  ///
+  /// Confidence threshold could be provided for the label detection.
+  /// For example, if the confidence threshold is set to 0.7, only labels with
+  /// confidence >= 0.7 would be returned. The default threshold is 0.5.
+  const CloudImageLabelerOptions({this.confidenceThreshold = 0.5})
+      : assert(confidenceThreshold >= 0.0),
+        assert(confidenceThreshold <= 1.0);
+
+  /// The minimum confidence threshold of labels to be detected.
+  ///
+  /// Required to be in range [0.0, 1.0].
+  final double confidenceThreshold;
+}
+
+/// Represents an entity label detected by [ImageLabeler] and [CloudImageLabeler].
+class ImageLabel {
+  ImageLabel._(dynamic data)
+      : confidence = data['confidence'],
+        entityId = data['entityId'],
+        text = data['text'];
+
+  /// The overall confidence of the result. Range [0.0, 1.0].
+  final double confidence;
+
+  /// The opaque entity ID.
+  ///
+  /// IDs are available in Google Knowledge Graph Search API
+  /// https://developers.google.com/knowledge-graph/
+  final String entityId;
+
+  /// A detected label from the given image.
+  ///
+  /// The label returned here is in English only. The end developer should use
+  /// [entityId] to retrieve unique id.
+  final String text;
+}
diff --git a/packages/firebase_ml_vision/lib/src/label_detector.dart b/packages/firebase_ml_vision/lib/src/label_detector.dart
deleted file mode 100644
index a37060a9b626..000000000000
--- a/packages/firebase_ml_vision/lib/src/label_detector.dart
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-part of firebase_ml_vision;
-
-/// Detector for detecting and labeling entities in an input image.
-///
-/// When you use the API, you get a list of the entities that were recognized:
-/// people, things, places, activities, and so on. Each label found comes with a
-/// score that indicates the confidence the ML model has in its relevance. With
-/// this information, you can perform tasks such as automatic metadata
-/// generation and content moderation.
-///
-/// A label detector is created via
-/// `labelDetector([LabelDetectorOptions options])` in [FirebaseVision]:
-///
-/// ```dart
-/// final FirebaseVisionImage image =
-///     FirebaseVisionImage.fromFilePath('path/to/file');
-///
-/// final LabelDetector labelDetector =
-///     FirebaseVision.instance.labelDetector(options);
-///
-/// final List<Label> labels = await labelDetector.detectInImage(image);
-/// ```
-class LabelDetector {
-  LabelDetector._(this.options) : assert(options != null);
-
-  /// The options for the detector.
-  ///
-  /// Sets the confidence threshold for detecting entities.
-  final LabelDetectorOptions options;
-
-  /// Detects entities in the input image.
-  Future<List<Label>> detectInImage(FirebaseVisionImage visionImage) async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
-      'LabelDetector#detectInImage',
-      <String, dynamic>{
-        'options': <String, dynamic>{
-          'confidenceThreshold': options.confidenceThreshold,
-        },
-      }..addAll(visionImage._serialize()),
-    );
-
-    final List<Label> labels = <Label>[];
-    for (dynamic data in reply) {
-      labels.add(Label._(data));
-    }
-
-    return labels;
-  }
-}
-
-/// Detector for detecting and labeling entities in an input image.
-///
-/// Uses cloud machine learning models and will require enabling Cloud API.
-///
-/// When you use the API, you get a list of the entities that were recognized:
-/// people, things, places, activities, and so on. Each label found comes with a
-/// score that indicates the confidence the ML model has in its relevance. With
-/// this information, you can perform tasks such as automatic metadata
-/// generation and content moderation.
-///
-/// A cloud label detector is created via
-/// `cloudLabelDetector([CloudDetectorOptions options])` in [FirebaseVision]:
-///
-/// ```dart
-/// final FirebaseVisionImage image =
-///     FirebaseVisionImage.fromFilePath('path/to/file');
-///
-/// final CloudLabelDetector cloudLabelDetector =
-///     FirebaseVision.instance.cloudLabelDetector();
-///
-/// final List<Label> labels = await cloudLabelDetector.detectInImage(image);
-/// ```
-class CloudLabelDetector {
-  CloudLabelDetector._(this.options) : assert(options != null);
-
-  /// Options used to configure this cloud detector.
-  final CloudDetectorOptions options;
-
-  /// Detects entities in the input image.
-  Future<List<Label>> detectInImage(FirebaseVisionImage visionImage) async {
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
-      'CloudLabelDetector#detectInImage',
-      <String, dynamic>{
-        'options': options._serialize(),
-      }..addAll(visionImage._serialize()),
-    );
-
-    final List<Label> labels = <Label>[];
-    for (dynamic data in reply) {
-      labels.add(Label._(data));
-    }
-
-    return labels;
-  }
-}
-
-/// Options for Label detector.
-///
-/// Confidence threshold could be provided for the label detection. For example,
-/// if the confidence threshold is set to 0.7, only labels with
-/// confidence >= 0.7 would be returned. The default threshold is 0.5.
-class LabelDetectorOptions {
-  /// Constructor for [LabelDetectorOptions].
-  ///
-  /// Confidence threshold could be provided for the label detection.
-  /// For example, if the confidence threshold is set to 0.7, only labels with
-  /// confidence >= 0.7 would be returned. The default threshold is 0.5.
-  const LabelDetectorOptions({this.confidenceThreshold = 0.5})
-      : assert(confidenceThreshold >= 0.0),
-        assert(confidenceThreshold <= 1.0);
-
-  /// The minimum confidence threshold of labels to be detected.
-  ///
-  /// Required to be in range [0.0, 1.0].
-  final double confidenceThreshold;
-}
-
-/// Represents an entity label detected by [LabelDetector].
-class Label {
-  Label._(dynamic data)
-      : confidence = data['confidence'],
-        entityId = data['entityId'],
-        label = data['label'];
-
-  /// The overall confidence of the result. Range [0.0, 1.0].
-  final double confidence;
-
-  /// The opaque entity ID.
-  ///
-  /// IDs are available in Google Knowledge Graph Search API
-  /// https://developers.google.com/knowledge-graph/
-  final String entityId;
-
-  /// A detected label from the given image.
-  ///
-  /// The label returned here is in English only. The end developer should use
-  /// [entityId] to retrieve unique id.
-  final String label;
-}
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index 30f399fc3520..d34def348341 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_ml_vision
 description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.6.0+2
+version: 0.7.0
 
 dependencies:
   flutter:
diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index e7f60cfa2466..e3d06220c9e5 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -24,12 +24,8 @@ void main() {
             return returnValue;
           case 'FaceDetector#processImage':
             return returnValue;
-          case 'LabelDetector#detectInImage':
-            return returnValue;
           case 'TextRecognizer#processImage':
             return returnValue;
-          case 'CloudLabelDetector#detectInImage':
-            return returnValue;
           default:
             return null;
         }
@@ -625,175 +621,6 @@ void main() {
       });
     });
 
-    group('$LabelDetector', () {
-      test('detectInImage', () async {
-        final List<dynamic> labelData = <dynamic>[
-          <dynamic, dynamic>{
-            'confidence': 0.6,
-            'entityId': 'hello',
-            'label': 'friend',
-          },
-          <dynamic, dynamic>{
-            'confidence': 0.8,
-            'entityId': 'hi',
-            'label': 'brother',
-          },
-        ];
-
-        returnValue = labelData;
-
-        final LabelDetector detector = FirebaseVision.instance.labelDetector(
-          const LabelDetectorOptions(confidenceThreshold: 0.2),
-        );
-
-        final FirebaseVisionImage image = FirebaseVisionImage.fromFilePath(
-          'empty',
-        );
-
-        final List<Label> labels = await detector.detectInImage(image);
-
-        expect(log, <Matcher>[
-          isMethodCall(
-            'LabelDetector#detectInImage',
-            arguments: <String, dynamic>{
-              'type': 'file',
-              'path': 'empty',
-              'bytes': null,
-              'metadata': null,
-              'options': <String, dynamic>{
-                'confidenceThreshold': 0.2,
-              },
-            },
-          ),
-        ]);
-
-        expect(labels[0].confidence, 0.6);
-        expect(labels[0].entityId, 'hello');
-        expect(labels[0].label, 'friend');
-
-        expect(labels[1].confidence, 0.8);
-        expect(labels[1].entityId, 'hi');
-        expect(labels[1].label, 'brother');
-      });
-
-      test('detectInImage no blocks', () async {
-        returnValue = <dynamic>[];
-
-        final LabelDetector detector = FirebaseVision.instance.labelDetector(
-          const LabelDetectorOptions(),
-        );
-        final FirebaseVisionImage image =
-            FirebaseVisionImage.fromFilePath('empty');
-
-        final List<Label> labels = await detector.detectInImage(image);
-
-        expect(log, <Matcher>[
-          isMethodCall(
-            'LabelDetector#detectInImage',
-            arguments: <String, dynamic>{
-              'type': 'file',
-              'path': 'empty',
-              'bytes': null,
-              'metadata': null,
-              'options': <String, dynamic>{
-                'confidenceThreshold': 0.5,
-              },
-            },
-          ),
-        ]);
-
-        expect(labels, isEmpty);
-      });
-    });
-
-    group('$CloudLabelDetector', () {
-      test('detectInImage', () async {
-        final List<dynamic> labelData = <dynamic>[
-          <dynamic, dynamic>{
-            'confidence': 0.6,
-            'entityId': '/m/0',
-            'label': 'banana',
-          },
-          <dynamic, dynamic>{
-            'confidence': 0.8,
-            'entityId': '/m/1',
-            'label': 'apple',
-          },
-        ];
-
-        returnValue = labelData;
-
-        final CloudLabelDetector detector =
-            FirebaseVision.instance.cloudLabelDetector(
-          const CloudDetectorOptions(
-            maxResults: 5,
-            modelType: CloudModelType.latest,
-          ),
-        );
-
-        final FirebaseVisionImage image = FirebaseVisionImage.fromFilePath(
-          'empty',
-        );
-
-        final List<Label> labels = await detector.detectInImage(image);
-
-        expect(log, <Matcher>[
-          isMethodCall(
-            'CloudLabelDetector#detectInImage',
-            arguments: <String, dynamic>{
-              'type': 'file',
-              'path': 'empty',
-              'bytes': null,
-              'metadata': null,
-              'options': <String, dynamic>{
-                'maxResults': 5,
-                'modelType': 'latest',
-              },
-            },
-          ),
-        ]);
-
-        expect(labels[0].confidence, 0.6);
-        expect(labels[0].entityId, '/m/0');
-        expect(labels[0].label, 'banana');
-
-        expect(labels[1].confidence, 0.8);
-        expect(labels[1].entityId, '/m/1');
-        expect(labels[1].label, 'apple');
-      });
-
-      test('detectInImage no blocks', () async {
-        returnValue = <dynamic>[];
-
-        final CloudLabelDetector detector =
-            FirebaseVision.instance.cloudLabelDetector(
-          const CloudDetectorOptions(),
-        );
-        final FirebaseVisionImage image =
-            FirebaseVisionImage.fromFilePath('empty');
-
-        final List<Label> labels = await detector.detectInImage(image);
-
-        expect(log, <Matcher>[
-          isMethodCall(
-            'CloudLabelDetector#detectInImage',
-            arguments: <String, dynamic>{
-              'type': 'file',
-              'path': 'empty',
-              'bytes': null,
-              'metadata': null,
-              'options': <String, dynamic>{
-                'maxResults': 10,
-                'modelType': 'stable',
-              },
-            },
-          ),
-        ]);
-
-        expect(labels, isEmpty);
-      });
-    });
-
     group('$TextRecognizer', () {
       final TextRecognizer recognizer =
           FirebaseVision.instance.textRecognizer();
diff --git a/packages/firebase_ml_vision/test/image_labeler_test.dart b/packages/firebase_ml_vision/test/image_labeler_test.dart
new file mode 100644
index 000000000000..8c3c3037ff54
--- /dev/null
+++ b/packages/firebase_ml_vision/test/image_labeler_test.dart
@@ -0,0 +1,165 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:firebase_ml_vision/firebase_ml_vision.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('$FirebaseVision', () {
+    final List<MethodCall> log = <MethodCall>[];
+    dynamic returnValue;
+
+    setUp(() {
+      FirebaseVision.channel
+          .setMockMethodCallHandler((MethodCall methodCall) async {
+        log.add(methodCall);
+
+        switch (methodCall.method) {
+          case 'ImageLabeler#processImage':
+            return returnValue;
+          default:
+            return null;
+        }
+      });
+      log.clear();
+    });
+
+    group('$ImageLabeler', () {
+      test('processImage', () async {
+        final List<dynamic> labelData = <dynamic>[
+          <dynamic, dynamic>{
+            'confidence': 0.6,
+            'entityId': 'hello',
+            'text': 'friend',
+          },
+          <dynamic, dynamic>{
+            'confidence': 0.8,
+            'entityId': 'hi',
+            'text': 'brother',
+          },
+        ];
+
+        returnValue = labelData;
+
+        final ImageLabeler detector = FirebaseVision.instance.imageLabeler(
+          const ImageLabelerOptions(confidenceThreshold: 0.2),
+        );
+
+        final FirebaseVisionImage image = FirebaseVisionImage.fromFilePath(
+          'empty',
+        );
+
+        final List<ImageLabel> labels = await detector.processImage(image);
+
+        expect(log, <Matcher>[
+          isMethodCall(
+            'ImageLabeler#processImage',
+            arguments: <String, dynamic>{
+              'type': 'file',
+              'path': 'empty',
+              'bytes': null,
+              'metadata': null,
+              'options': <String, dynamic>{
+                'modelType': 'onDevice',
+                'confidenceThreshold': 0.2,
+              },
+            },
+          ),
+        ]);
+
+        expect(labels[0].confidence, 0.6);
+        expect(labels[0].entityId, 'hello');
+        expect(labels[0].text, 'friend');
+
+        expect(labels[1].confidence, 0.8);
+        expect(labels[1].entityId, 'hi');
+        expect(labels[1].text, 'brother');
+      });
+
+      test('processImage no blocks', () async {
+        returnValue = <dynamic>[];
+
+        final ImageLabeler detector = FirebaseVision.instance.imageLabeler(
+          const ImageLabelerOptions(),
+        );
+        final FirebaseVisionImage image =
+            FirebaseVisionImage.fromFilePath('empty');
+
+        final List<ImageLabel> labels = await detector.processImage(image);
+
+        expect(log, <Matcher>[
+          isMethodCall(
+            'ImageLabeler#processImage',
+            arguments: <String, dynamic>{
+              'type': 'file',
+              'path': 'empty',
+              'bytes': null,
+              'metadata': null,
+              'options': <String, dynamic>{
+                'modelType': 'onDevice',
+                'confidenceThreshold': 0.5,
+              },
+            },
+          ),
+        ]);
+
+        expect(labels, isEmpty);
+      });
+    });
+
+    group('Cloud $ImageLabeler', () {
+      test('processImage', () async {
+        final List<dynamic> labelData = <dynamic>[
+          <dynamic, dynamic>{
+            'confidence': 0.6,
+            'entityId': '/m/0',
+            'text': 'banana',
+          },
+          <dynamic, dynamic>{
+            'confidence': 0.8,
+            'entityId': '/m/1',
+            'text': 'apple',
+          },
+        ];
+
+        returnValue = labelData;
+
+        final ImageLabeler labeler = FirebaseVision.instance.cloudImageLabeler(
+          const CloudImageLabelerOptions(confidenceThreshold: 0.6),
+        );
+
+        final FirebaseVisionImage image = FirebaseVisionImage.fromFilePath(
+          'empty',
+        );
+
+        final List<ImageLabel> labels = await labeler.processImage(image);
+
+        expect(log, <Matcher>[
+          isMethodCall(
+            'ImageLabeler#processImage',
+            arguments: <String, dynamic>{
+              'type': 'file',
+              'path': 'empty',
+              'bytes': null,
+              'metadata': null,
+              'options': <String, dynamic>{
+                'modelType': 'cloud',
+                'confidenceThreshold': 0.6,
+              },
+            },
+          ),
+        ]);
+
+        expect(labels[0].confidence, 0.6);
+        expect(labels[0].entityId, '/m/0');
+        expect(labels[0].text, 'banana');
+
+        expect(labels[1].confidence, 0.8);
+        expect(labels[1].entityId, '/m/1');
+        expect(labels[1].text, 'apple');
+      });
+    });
+  });
+}

From beccd5febec729aab78f5e57f689d2137998c8df Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Thu, 4 Apr 2019 12:51:11 -0700
Subject: [PATCH 290/410] [firebase_ml_vision] Android side of upgrade to new
 ImageLabeler (#1367)

---
 packages/firebase_ml_vision/README.md         |   2 +-
 .../firebase_ml_vision/android/build.gradle   |   2 +-
 .../firebasemlvision/CloudLabelDetector.java  | 100 ------------------
 .../firebasemlvision/FaceDetector.java        |  29 ++---
 .../FirebaseMlVisionPlugin.java               |   7 +-
 .../firebasemlvision/ImageLabeler.java        |  99 +++++++++++++++++
 .../firebasemlvision/LabelDetector.java       |  80 --------------
 .../example/android/app/build.gradle          |   2 +-
 8 files changed, 121 insertions(+), 200 deletions(-)
 delete mode 100644 packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/CloudLabelDetector.java
 create mode 100644 packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/ImageLabeler.java
 delete mode 100644 packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/LabelDetector.java

diff --git a/packages/firebase_ml_vision/README.md b/packages/firebase_ml_vision/README.md
index 4dcd1c491f29..56c55f21a587 100644
--- a/packages/firebase_ml_vision/README.md
+++ b/packages/firebase_ml_vision/README.md
@@ -20,7 +20,7 @@ android {
     dependencies {
         // ...
 
-        api 'com.google.firebase:firebase-ml-vision-image-label-model:16.2.0'
+        api 'com.google.firebase:firebase-ml-vision-image-label-model:17.0.2'
     }
 }
 ```
diff --git a/packages/firebase_ml_vision/android/build.gradle b/packages/firebase_ml_vision/android/build.gradle
index a9d99ee46d9b..8fcc744893c9 100644
--- a/packages/firebase_ml_vision/android/build.gradle
+++ b/packages/firebase_ml_vision/android/build.gradle
@@ -45,7 +45,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-ml-vision:17.0.1'
+        api 'com.google.firebase:firebase-ml-vision:19.0.2'
         implementation 'androidx.annotation:annotation:1.0.0'
         implementation 'androidx.exifinterface:exifinterface:1.0.0'
     }
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/CloudLabelDetector.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/CloudLabelDetector.java
deleted file mode 100644
index e24f6209cd40..000000000000
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/CloudLabelDetector.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package io.flutter.plugins.firebasemlvision;
-
-import androidx.annotation.NonNull;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.ml.vision.FirebaseVision;
-import com.google.firebase.ml.vision.cloud.FirebaseVisionCloudDetectorOptions;
-import com.google.firebase.ml.vision.cloud.label.FirebaseVisionCloudLabel;
-import com.google.firebase.ml.vision.cloud.label.FirebaseVisionCloudLabelDetector;
-import com.google.firebase.ml.vision.common.FirebaseVisionImage;
-import io.flutter.plugin.common.MethodChannel;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-class CloudLabelDetector implements Detector {
-  static final CloudLabelDetector instance = new CloudLabelDetector();
-
-  private CloudLabelDetector() {}
-
-  private FirebaseVisionCloudLabelDetector detector;
-  private Map<String, Object> lastOptions;
-
-  @Override
-  public void handleDetection(
-      FirebaseVisionImage image, Map<String, Object> options, final MethodChannel.Result result) {
-
-    // Use instantiated detector if the options are the same. Otherwise, close and instantiate new
-    // options.
-
-    if (detector == null) {
-      lastOptions = options;
-      detector =
-          FirebaseVision.getInstance().getVisionCloudLabelDetector(parseOptions(lastOptions));
-    } else if (!options.equals(lastOptions)) {
-      try {
-        detector.close();
-      } catch (IOException e) {
-        result.error("cloudLabelDetectorIOError", e.getLocalizedMessage(), null);
-        return;
-      }
-
-      lastOptions = options;
-      detector =
-          FirebaseVision.getInstance().getVisionCloudLabelDetector(parseOptions(lastOptions));
-    }
-
-    detector
-        .detectInImage(image)
-        .addOnSuccessListener(
-            new OnSuccessListener<List<FirebaseVisionCloudLabel>>() {
-              @Override
-              public void onSuccess(List<FirebaseVisionCloudLabel> firebaseVisionCloudLabels) {
-                List<Map<String, Object>> labels =
-                    new ArrayList<>(firebaseVisionCloudLabels.size());
-                for (FirebaseVisionCloudLabel label : firebaseVisionCloudLabels) {
-                  Map<String, Object> labelData = new HashMap<>();
-                  labelData.put("confidence", (double) label.getConfidence());
-                  labelData.put("entityId", label.getEntityId());
-                  labelData.put("label", label.getLabel());
-
-                  labels.add(labelData);
-                }
-
-                result.success(labels);
-              }
-            })
-        .addOnFailureListener(
-            new OnFailureListener() {
-              @Override
-              public void onFailure(@NonNull Exception e) {
-                result.error("labelDetectorError", e.getLocalizedMessage(), null);
-              }
-            });
-  }
-
-  private FirebaseVisionCloudDetectorOptions parseOptions(Map<String, Object> optionsData) {
-    final int maxResults = (int) optionsData.get("maxResults");
-    final String modelTypeStr = (String) optionsData.get("modelType");
-
-    final int modelType;
-    switch (modelTypeStr) {
-      case "stable":
-        modelType = FirebaseVisionCloudDetectorOptions.STABLE_MODEL;
-        break;
-      case "latest":
-        modelType = FirebaseVisionCloudDetectorOptions.LATEST_MODEL;
-        break;
-      default:
-        throw new IllegalArgumentException(String.format("No type for model: %s", modelTypeStr));
-    }
-
-    return new FirebaseVisionCloudDetectorOptions.Builder()
-        .setMaxResults(maxResults)
-        .setModelType(modelType)
-        .build();
-  }
-}
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FaceDetector.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FaceDetector.java
index d81573f59d01..6360fb1fe3e0 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FaceDetector.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FaceDetector.java
@@ -102,16 +102,16 @@ public void onFailure(@NonNull Exception exception) {
   private Map<String, double[]> getLandmarkData(FirebaseVisionFace face) {
     Map<String, double[]> landmarks = new HashMap<>();
 
-    landmarks.put("bottomMouth", landmarkPosition(face, FirebaseVisionFaceLandmark.BOTTOM_MOUTH));
+    landmarks.put("bottomMouth", landmarkPosition(face, FirebaseVisionFaceLandmark.MOUTH_BOTTOM));
     landmarks.put("leftCheek", landmarkPosition(face, FirebaseVisionFaceLandmark.LEFT_CHEEK));
     landmarks.put("leftEar", landmarkPosition(face, FirebaseVisionFaceLandmark.LEFT_EAR));
     landmarks.put("leftEye", landmarkPosition(face, FirebaseVisionFaceLandmark.LEFT_EYE));
-    landmarks.put("leftMouth", landmarkPosition(face, FirebaseVisionFaceLandmark.LEFT_MOUTH));
+    landmarks.put("leftMouth", landmarkPosition(face, FirebaseVisionFaceLandmark.MOUTH_LEFT));
     landmarks.put("noseBase", landmarkPosition(face, FirebaseVisionFaceLandmark.NOSE_BASE));
     landmarks.put("rightCheek", landmarkPosition(face, FirebaseVisionFaceLandmark.RIGHT_CHEEK));
     landmarks.put("rightEar", landmarkPosition(face, FirebaseVisionFaceLandmark.RIGHT_EAR));
     landmarks.put("rightEye", landmarkPosition(face, FirebaseVisionFaceLandmark.RIGHT_EYE));
-    landmarks.put("rightMouth", landmarkPosition(face, FirebaseVisionFaceLandmark.RIGHT_MOUTH));
+    landmarks.put("rightMouth", landmarkPosition(face, FirebaseVisionFaceLandmark.MOUTH_RIGHT));
 
     return landmarks;
   }
@@ -139,21 +139,26 @@ private FirebaseVisionFaceDetectorOptions parseOptions(Map<String, Object> optio
     int mode;
     switch ((String) options.get("mode")) {
       case "accurate":
-        mode = FirebaseVisionFaceDetectorOptions.ACCURATE_MODE;
+        mode = FirebaseVisionFaceDetectorOptions.ACCURATE;
         break;
       case "fast":
-        mode = FirebaseVisionFaceDetectorOptions.FAST_MODE;
+        mode = FirebaseVisionFaceDetectorOptions.FAST;
         break;
       default:
         throw new IllegalArgumentException("Not a mode:" + options.get("mode"));
     }
 
-    return new FirebaseVisionFaceDetectorOptions.Builder()
-        .setClassificationType(classification)
-        .setLandmarkType(landmark)
-        .setMinFaceSize((float) ((double) options.get("minFaceSize")))
-        .setModeType(mode)
-        .setTrackingEnabled((boolean) options.get("enableTracking"))
-        .build();
+    FirebaseVisionFaceDetectorOptions.Builder builder =
+        new FirebaseVisionFaceDetectorOptions.Builder()
+            .setClassificationMode(classification)
+            .setLandmarkMode(landmark)
+            .setMinFaceSize((float) ((double) options.get("minFaceSize")))
+            .setPerformanceMode(mode);
+
+    if ((boolean) options.get("enableTracking")) {
+      builder.enableTracking();
+    }
+
+    return builder.build();
   }
 }
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
index c4b1eaab6ce1..566a96fea672 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
@@ -51,11 +51,8 @@ public void onMethodCall(MethodCall call, Result result) {
       case "FaceDetector#processImage":
         FaceDetector.instance.handleDetection(image, options, result);
         break;
-      case "LabelDetector#detectInImage":
-        LabelDetector.instance.handleDetection(image, options, result);
-        break;
-      case "CloudLabelDetector#detectInImage":
-        CloudLabelDetector.instance.handleDetection(image, options, result);
+      case "ImageLabeler#processImage":
+        ImageLabeler.instance.handleDetection(image, options, result);
         break;
       case "TextRecognizer#processImage":
         TextRecognizer.instance.handleDetection(image, options, result);
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/ImageLabeler.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/ImageLabeler.java
new file mode 100644
index 000000000000..0a7468950a61
--- /dev/null
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/ImageLabeler.java
@@ -0,0 +1,99 @@
+package io.flutter.plugins.firebasemlvision;
+
+import androidx.annotation.NonNull;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.firebase.ml.vision.FirebaseVision;
+import com.google.firebase.ml.vision.common.FirebaseVisionImage;
+import com.google.firebase.ml.vision.label.FirebaseVisionCloudImageLabelerOptions;
+import com.google.firebase.ml.vision.label.FirebaseVisionImageLabel;
+import com.google.firebase.ml.vision.label.FirebaseVisionImageLabeler;
+import com.google.firebase.ml.vision.label.FirebaseVisionOnDeviceImageLabelerOptions;
+import io.flutter.plugin.common.MethodChannel;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+class ImageLabeler implements Detector {
+  static final ImageLabeler instance = new ImageLabeler();
+
+  private ImageLabeler() {}
+
+  private FirebaseVisionImageLabeler labeler;
+  private Map<String, Object> lastOptions;
+
+  @Override
+  public void handleDetection(
+      FirebaseVisionImage image, Map<String, Object> options, final MethodChannel.Result result) {
+
+    // Use instantiated labeler if the options are the same. Otherwise, close and instantiate new
+    // options.
+
+    if (labeler != null && !options.equals(lastOptions)) {
+      try {
+        labeler.close();
+      } catch (IOException e) {
+        result.error("labelDetectorIOError", e.getLocalizedMessage(), null);
+        return;
+      }
+
+      labeler = null;
+      lastOptions = null;
+    }
+
+    if (labeler == null) {
+      lastOptions = options;
+
+      final String modelType = (String) options.get("modelType");
+      if (modelType.equals("onDevice")) {
+        labeler = FirebaseVision.getInstance().getOnDeviceImageLabeler(parseOptions(lastOptions));
+      } else if (modelType.equals("cloud")) {
+        labeler = FirebaseVision.getInstance().getCloudImageLabeler(parseCloudOptions(lastOptions));
+      }
+    }
+
+    labeler
+        .processImage(image)
+        .addOnSuccessListener(
+            new OnSuccessListener<List<FirebaseVisionImageLabel>>() {
+              @Override
+              public void onSuccess(List<FirebaseVisionImageLabel> firebaseVisionLabels) {
+                List<Map<String, Object>> labels = new ArrayList<>(firebaseVisionLabels.size());
+                for (FirebaseVisionImageLabel label : firebaseVisionLabels) {
+                  Map<String, Object> labelData = new HashMap<>();
+                  labelData.put("confidence", (double) label.getConfidence());
+                  labelData.put("entityId", label.getEntityId());
+                  labelData.put("text", label.getText());
+
+                  labels.add(labelData);
+                }
+
+                result.success(labels);
+              }
+            })
+        .addOnFailureListener(
+            new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception e) {
+                result.error("imageLabelerError", e.getLocalizedMessage(), null);
+              }
+            });
+  }
+
+  private FirebaseVisionOnDeviceImageLabelerOptions parseOptions(Map<String, Object> optionsData) {
+    float conf = (float) (double) optionsData.get("confidenceThreshold");
+    return new FirebaseVisionOnDeviceImageLabelerOptions.Builder()
+        .setConfidenceThreshold(conf)
+        .build();
+  }
+
+  private FirebaseVisionCloudImageLabelerOptions parseCloudOptions(
+      Map<String, Object> optionsData) {
+    float conf = (float) (double) optionsData.get("confidenceThreshold");
+    return new FirebaseVisionCloudImageLabelerOptions.Builder()
+        .setConfidenceThreshold(conf)
+        .build();
+  }
+}
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/LabelDetector.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/LabelDetector.java
deleted file mode 100644
index c3a317ed0a59..000000000000
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/LabelDetector.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package io.flutter.plugins.firebasemlvision;
-
-import androidx.annotation.NonNull;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.ml.vision.FirebaseVision;
-import com.google.firebase.ml.vision.common.FirebaseVisionImage;
-import com.google.firebase.ml.vision.label.FirebaseVisionLabel;
-import com.google.firebase.ml.vision.label.FirebaseVisionLabelDetector;
-import com.google.firebase.ml.vision.label.FirebaseVisionLabelDetectorOptions;
-import io.flutter.plugin.common.MethodChannel;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-class LabelDetector implements Detector {
-  static final LabelDetector instance = new LabelDetector();
-
-  private LabelDetector() {}
-
-  private FirebaseVisionLabelDetector detector;
-  private Map<String, Object> lastOptions;
-
-  @Override
-  public void handleDetection(
-      FirebaseVisionImage image, Map<String, Object> options, final MethodChannel.Result result) {
-
-    // Use instantiated detector if the options are the same. Otherwise, close and instantiate new
-    // options.
-
-    if (detector == null) {
-      lastOptions = options;
-      detector = FirebaseVision.getInstance().getVisionLabelDetector(parseOptions(lastOptions));
-    } else if (!options.equals(lastOptions)) {
-      try {
-        detector.close();
-      } catch (IOException e) {
-        result.error("labelDetectorIOError", e.getLocalizedMessage(), null);
-        return;
-      }
-
-      lastOptions = options;
-      detector = FirebaseVision.getInstance().getVisionLabelDetector(parseOptions(lastOptions));
-    }
-
-    detector
-        .detectInImage(image)
-        .addOnSuccessListener(
-            new OnSuccessListener<List<FirebaseVisionLabel>>() {
-              @Override
-              public void onSuccess(List<FirebaseVisionLabel> firebaseVisionLabels) {
-                List<Map<String, Object>> labels = new ArrayList<>(firebaseVisionLabels.size());
-                for (FirebaseVisionLabel label : firebaseVisionLabels) {
-                  Map<String, Object> labelData = new HashMap<>();
-                  labelData.put("confidence", (double) label.getConfidence());
-                  labelData.put("entityId", label.getEntityId());
-                  labelData.put("label", label.getLabel());
-
-                  labels.add(labelData);
-                }
-
-                result.success(labels);
-              }
-            })
-        .addOnFailureListener(
-            new OnFailureListener() {
-              @Override
-              public void onFailure(@NonNull Exception e) {
-                result.error("labelDetectorError", e.getLocalizedMessage(), null);
-              }
-            });
-  }
-
-  private FirebaseVisionLabelDetectorOptions parseOptions(Map<String, Object> optionsData) {
-    float conf = (float) (double) optionsData.get("confidenceThreshold");
-    return new FirebaseVisionLabelDetectorOptions.Builder().setConfidenceThreshold(conf).build();
-  }
-}
diff --git a/packages/firebase_ml_vision/example/android/app/build.gradle b/packages/firebase_ml_vision/example/android/app/build.gradle
index e6d7ece97e0f..41ef760a9932 100644
--- a/packages/firebase_ml_vision/example/android/app/build.gradle
+++ b/packages/firebase_ml_vision/example/android/app/build.gradle
@@ -47,7 +47,7 @@ android {
     }
 
     dependencies {
-        api 'com.google.firebase:firebase-ml-vision-image-label-model:16.2.0'
+        api 'com.google.firebase:firebase-ml-vision-image-label-model:17.0.2'
     }
 }
 

From ce188970ec06d597351129eca155674fdc5c8354 Mon Sep 17 00:00:00 2001
From: RafaO <rafao1989@hotmail.com>
Date: Fri, 5 Apr 2019 00:26:07 +0200
Subject: [PATCH 291/410] Add support for map tapping (#985)

---
 .../java/io/flutter/plugins/googlemaps/Convert.java    |  2 +-
 .../plugins/googlemaps/GoogleMapController.java        | 10 ++++++++++
 .../ios/Classes/GoogleMapController.m                  |  5 +++++
 packages/google_maps_flutter/lib/src/controller.dart   |  3 +++
 packages/google_maps_flutter/lib/src/google_map.dart   |  9 +++++++++
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
index 34551e90237a..db430feceaa6 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
@@ -127,7 +127,7 @@ static Object toJson(String markerId) {
     return data;
   }
 
-  private static Object toJson(LatLng latLng) {
+  static Object toJson(LatLng latLng) {
     return Arrays.asList(latLng.latitude, latLng.longitude);
   }
 
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index 63f3cb2650f5..20a19cdd787b 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -26,6 +26,7 @@
 import com.google.android.gms.maps.MapView;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.model.CameraPosition;
+import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.android.gms.maps.model.Marker;
 import io.flutter.plugin.common.MethodCall;
@@ -50,6 +51,7 @@ final class GoogleMapController
         GoogleMapOptionsSink,
         MethodChannel.MethodCallHandler,
         OnMapReadyCallback,
+        GoogleMap.OnMapClickListener,
         PlatformView {
 
   private static final String TAG = "GoogleMapController";
@@ -155,6 +157,7 @@ public void onMapReady(GoogleMap googleMap) {
     googleMap.setOnCameraMoveListener(this);
     googleMap.setOnCameraIdleListener(this);
     googleMap.setOnMarkerClickListener(this);
+    googleMap.setOnMapClickListener(this);
     updateMyLocationEnabled();
     markersController.setGoogleMap(googleMap);
     updateInitialMarkers();
@@ -241,6 +244,13 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
     }
   }
 
+  @Override
+  public void onMapClick(LatLng latLng) {
+    final Map<String, Object> arguments = new HashMap<>(2);
+    arguments.put("position", Convert.toJson(latLng));
+    methodChannel.invokeMethod("map#onTap", arguments);
+  }
+
   @Override
   public void onCameraMoveStarted(int reason) {
     final Map<String, Object> arguments = new HashMap<>(2);
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index c5de740d82db..788ba6a08ab0 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -8,6 +8,7 @@
 #pragma mark - Conversion of JSON-like values sent via platform channels. Forward declarations.
 
 static NSDictionary* PositionToJson(GMSCameraPosition* position);
+static NSArray* LocationToJson(CLLocationCoordinate2D position);
 static GMSCameraPosition* ToOptionalCameraPosition(NSDictionary* json);
 static GMSCoordinateBounds* ToOptionalBounds(NSArray* json);
 static GMSCameraUpdate* ToCameraUpdate(NSArray* data);
@@ -257,6 +258,10 @@ - (void)mapView:(GMSMapView*)mapView didTapInfoWindowOfMarker:(GMSMarker*)marker
   [_markersController onInfoWindowTap:markerId];
 }
 
+- (void)mapView:(GMSMapView*)mapView didTapAtCoordinate:(CLLocationCoordinate2D)coordinate {
+  [_channel invokeMethod:@"map#onTap" arguments:@{@"position" : LocationToJson(coordinate)}];
+}
+
 @end
 
 #pragma mark - Implementations of JSON conversion functions.
diff --git a/packages/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/lib/src/controller.dart
index bb8b4888eb54..c16c8384fc85 100644
--- a/packages/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/lib/src/controller.dart
@@ -63,6 +63,9 @@ class GoogleMapController {
       case 'infoWindow#onTap':
         _googleMapState.onInfoWindowTap(call.arguments['markerId']);
         break;
+      case 'map#onTap':
+        _googleMapState.onTap(LatLng._fromJson(call.arguments['position']));
+        break;
       default:
         throw MissingPluginException();
     }
diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/lib/src/google_map.dart
index 794935c21ed7..a75424b03640 100644
--- a/packages/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/lib/src/google_map.dart
@@ -33,6 +33,7 @@ class GoogleMap extends StatefulWidget {
     this.onCameraMoveStarted,
     this.onCameraMove,
     this.onCameraIdle,
+    this.onTap,
   })  : assert(initialCameraPosition != null),
         super(key: key);
 
@@ -91,6 +92,9 @@ class GoogleMap extends StatefulWidget {
   /// animations and the user has stopped interacting with the map.
   final VoidCallback onCameraIdle;
 
+  /// Called every time a [GoogleMap] is tapped.
+  final ArgumentCallback<LatLng> onTap;
+
   /// True if a "My Location" layer should be shown on the map.
   ///
   /// This layer includes a location indicator at the current device location,
@@ -223,6 +227,11 @@ class _GoogleMapState extends State<GoogleMap> {
     final MarkerId markerId = MarkerId(markerIdParam);
     _markers[markerId].infoWindow.onTap();
   }
+
+  void onTap(LatLng position) {
+    assert(position != null);
+    widget.onTap(position);
+  }
 }
 
 /// Configuration options for the GoogleMaps user interface.

From ae0ee5e06c6e9edcd41adeb6ccd7392d72341272 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Thu, 4 Apr 2019 16:17:54 -0700
Subject: [PATCH 292/410] Update changelog and pubspec for onTap (#1447)

---
 packages/google_maps_flutter/CHANGELOG.md | 4 ++++
 packages/google_maps_flutter/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 6945ada986ea..2da38c850f6e 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.2
+
+* Added onTap for callback for GoogleMap.
+
 ## 0.5.1
 
 * Update Android gradle version.
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 9999079032ac..a3ec53290bf7 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.1
+version: 0.5.2
 
 dependencies:
   flutter:

From 8c180f0dc997746ed2ccd37d4ae106923ad3a593 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Thu, 4 Apr 2019 16:20:49 -0700
Subject: [PATCH 293/410] [in_app_purchase]load purchase (#1380)

Adding unified IAP load purchase api.
Updated the example app to have indicators on already purchased items.
No pubspec and CHANGELOG.md is updated since this plugin is still under development.

flutter/flutter#26326
---
 .../in_app_purchase/example/lib/main.dart     |  33 ++-
 .../ios/Classes/FIAObjectTranslator.m         |   1 +
 .../ios/Classes/InAppPurchasePlugin.m         |   6 +-
 .../purchase_wrapper.dart                     |  16 ++
 .../app_store_connection.dart                 | 117 +++++++++-
 .../google_play_connection.dart               |  45 ++++
 .../in_app_purchase_connection.dart           | 123 ++++++++++
 .../store_kit_wrappers/enum_converters.dart   |  30 +++
 .../store_kit_wrappers/enum_converters.g.dart |  40 ++++
 .../sk_payment_queue_wrapper.dart             |   6 +-
 .../sk_payment_transaction_wrappers.dart      |  22 +-
 .../sk_payment_wrapper.dart                   |   1 -
 .../purchase_wrapper_test.dart                |  13 ++
 .../app_store_connection_test.dart            | 212 +++++++++++++++---
 .../google_play_connection_test.dart          |  61 +++++
 .../sk_methodchannel_apis_test.dart           |   2 +-
 .../store_kit_wrappers/sk_product_test.dart   |  12 +
 17 files changed, 689 insertions(+), 51 deletions(-)
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.g.dart
 delete mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_wrapper.dart

diff --git a/packages/in_app_purchase/example/lib/main.dart b/packages/in_app_purchase/example/lib/main.dart
index e6d284a7a40e..02bc7d448240 100644
--- a/packages/in_app_purchase/example/lib/main.dart
+++ b/packages/in_app_purchase/example/lib/main.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:in_app_purchase/in_app_purchase_connection.dart';
 
@@ -54,10 +53,10 @@ class _MyAppState extends State<MyApp> {
               future: _buildProductList(),
               builder: (BuildContext context, AsyncSnapshot snapshot) {
                 if (snapshot.error != null) {
+                  print(snapshot.error);
                   return Center(
-                    child: buildListCard(ListTile(
-                        title: Text('Error fetching products'),
-                        subtitle: snapshot.error)),
+                    child: buildListCard(
+                        ListTile(title: Text('Error fetching products'))),
                   );
                 } else if (!snapshot.hasData) {
                   return Card(
@@ -118,6 +117,32 @@ class _MyAppState extends State<MyApp> {
               'This app needs special configuration to run. Please see example/README.md for instructions.')));
     }
 
+    // This loading previous purchases code is just a demo. Please do not use this as it is.
+    // In your app you should always verify the purchase data using the `verificationData` inside the [PurchaseDetails] object before trusting it.
+    // We recommend that you use your own server to verity the purchase data.
+    Map<String, PurchaseDetails> purchases = Map.fromEntries(((await connection
+                .queryPastPurchases())
+            .pastPurchases)
+        .map((PurchaseDetails purchase) =>
+            MapEntry<String, PurchaseDetails>(purchase.productId, purchase)));
+
+    productList.addAll(response.productDetails.map(
+      (ProductDetails productDetails) {
+        PurchaseDetails previousPurchase = purchases[productDetails.id];
+        return ListTile(
+          title: Text(
+            productDetails.title,
+          ),
+          subtitle: Text(
+            productDetails.description,
+          ),
+          trailing: previousPurchase != null
+              ? Icon(Icons.check)
+              : Text(productDetails.price),
+        );
+      },
+    ));
+
     return Card(
         child:
             Column(children: <Widget>[productHeader, Divider()] + productList));
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
index bd9b65edd61d..375028015c90 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
@@ -153,6 +153,7 @@ + (NSDictionary *)getMapFromSKPaymentTransaction:(SKPaymentTransaction *)transac
     [downloads addObject:[FIAObjectTranslator getMapFromSKDownload:download]];
   }
   [map setObject:downloads forKey:@"downloads"];
+
   return map;
 }
 
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
index 5464eba1aa0b..ddd11baa7d6b 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
@@ -283,10 +283,8 @@ - (void)handleTransactionsRemoved:(NSArray<SKPaymentTransaction *> *)transaction
 }
 
 - (void)handleTransactionRestoreFailed:(NSError *)error {
-  FlutterError *fltError = [FlutterError errorWithCode:error.domain
-                                               message:error.description
-                                               details:error.description];
-  [self.callbackChannel invokeMethod:@"restoreCompletedTransactions" arguments:fltError];
+  [self.callbackChannel invokeMethod:@"restoreCompletedTransactionsFailed"
+                           arguments:[FIAObjectTranslator getMapFromNSError:error]];
 }
 
 - (void)restoreCompletedTransactionsFinished {
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
index 5a584e570bf5..1d1c1e87bc95 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
@@ -5,6 +5,7 @@
 import 'dart:ui' show hashValues;
 import 'package:flutter/foundation.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/in_app_purchase_connection.dart';
 import 'enum_converters.dart';
 import 'billing_client_wrapper.dart';
 
@@ -89,6 +90,21 @@ class PurchaseWrapper {
   /// Note though that verifying a purchase locally is inherently insecure (see
   /// the article for more details).
   final String originalJson;
+
+  /// Generate a [PurchaseDetails] object based on the transaction.
+  ///
+  /// [PurchaseDetails] is used to represent a purchase for the unified payment APIs.
+  PurchaseDetails toPurchaseDetails() {
+    return PurchaseDetails(
+      purchaseID: orderId,
+      productId: sku,
+      verificationData: PurchaseVerificationData(
+          localVerificationData: originalJson,
+          serverVerificationData: purchaseToken,
+          source: PurchaseSource.GooglePlay),
+      transactionDate: purchaseTime.toString(),
+    );
+  }
 }
 
 /// A data struct representing the result of a transaction.
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
index 6d0477fb3e8f..ca72ee36543d 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
@@ -4,6 +4,8 @@
 
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
+
 import 'in_app_purchase_connection.dart';
 import 'product_details.dart';
 import 'package:in_app_purchase/store_kit_wrappers.dart';
@@ -15,9 +17,10 @@ import 'package:in_app_purchase/store_kit_wrappers.dart';
 class AppStoreConnection implements InAppPurchaseConnection {
   static AppStoreConnection get instance => _getOrCreateInstance();
   static AppStoreConnection _instance;
+  static SKPaymentQueueWrapper _skPaymentQueueWrapper;
+  static _TransactionObserver _observer;
 
-  @override
-  Future<bool> isAvailable() => SKPaymentQueueWrapper.canMakePayments();
+  static SKTransactionObserverWrapper get observer => _observer;
 
   static AppStoreConnection _getOrCreateInstance() {
     if (_instance != null) {
@@ -25,9 +28,58 @@ class AppStoreConnection implements InAppPurchaseConnection {
     }
 
     _instance = AppStoreConnection();
+    _skPaymentQueueWrapper = SKPaymentQueueWrapper();
+    _observer = _TransactionObserver();
+    _skPaymentQueueWrapper.setTransactionObserver(observer);
     return _instance;
   }
 
+  @override
+  Future<bool> isAvailable() => SKPaymentQueueWrapper.canMakePayments();
+
+  @override
+  Future<QueryPurchaseDetailsResponse> queryPastPurchases(
+      {String applicationUserName}) async {
+    PurchaseError error;
+    List<PurchaseDetails> pastPurchases = [];
+
+    try {
+      String receiptData;
+      try {
+        receiptData = await SKReceiptManager.retrieveReceiptData();
+      } catch (e) {
+        receiptData = null;
+      }
+      final List<SKPaymentTransactionWrapper> restoredTransactions =
+          await _observer.getRestoredTransactions(
+              queue: _skPaymentQueueWrapper,
+              applicationUserName: applicationUserName);
+      _observer.cleanUpRestoredTransactions();
+      if (restoredTransactions != null) {
+        pastPurchases = restoredTransactions
+            .map((SKPaymentTransactionWrapper wrapper) =>
+                wrapper.toPurchaseDetails(receiptData))
+            .toList();
+      }
+    } catch (e) {
+      error = PurchaseError(
+          source: PurchaseSource.AppStore, code: e.domain, message: e.userInfo);
+    }
+    return QueryPurchaseDetailsResponse(
+        pastPurchases: pastPurchases, error: error);
+  }
+
+  @override
+  Future<PurchaseVerificationData> refreshPurchaseVerificationData(
+      PurchaseDetails purchase) async {
+    await SKRequestMaker().startRefreshReceiptRequest();
+    String receipt = await SKReceiptManager.retrieveReceiptData();
+    return PurchaseVerificationData(
+        localVerificationData: receipt,
+        serverVerificationData: receipt,
+        source: PurchaseSource.AppStore);
+  }
+
   /// Query the product detail list.
   ///
   /// This method only returns [ProductDetailsResponse].
@@ -49,3 +101,64 @@ class AppStoreConnection implements InAppPurchaseConnection {
     return productDetailsResponse;
   }
 }
+
+class _TransactionObserver implements SKTransactionObserverWrapper {
+  Completer<List<SKPaymentTransactionWrapper>> _restoreCompleter;
+  List<SKPaymentTransactionWrapper> _restoredTransactions;
+
+  Future<List<SKPaymentTransactionWrapper>> getRestoredTransactions(
+      {@required SKPaymentQueueWrapper queue, String applicationUserName}) {
+    assert(queue != null);
+    _restoreCompleter = Completer();
+    queue.restoreTransactions(applicationUserName: applicationUserName);
+    return _restoreCompleter.future;
+  }
+
+  void cleanUpRestoredTransactions() {
+    _restoredTransactions = null;
+    _restoreCompleter = null;
+  }
+
+  /// Triggered when any transactions are updated.
+  void updatedTransactions({List<SKPaymentTransactionWrapper> transactions}) {
+    if (_restoreCompleter != null) {
+      if (_restoredTransactions == null) {
+        _restoredTransactions = [];
+      }
+      _restoredTransactions.addAll(transactions
+          .where((SKPaymentTransactionWrapper wrapper) {
+        return wrapper.transactionState ==
+            SKPaymentTransactionStateWrapper.restored;
+      }).map((SKPaymentTransactionWrapper wrapper) =>
+              wrapper.originalTransaction));
+    }
+  }
+
+  /// Triggered when any transactions are removed from the payment queue.
+  void removedTransactions({List<SKPaymentTransactionWrapper> transactions}) {}
+
+  /// Triggered when there is an error while restoring transactions.
+  void restoreCompletedTransactionsFailed({SKError error}) {
+    _restoreCompleter.completeError(error);
+  }
+
+  /// Triggered when payment queue has finished sending restored transactions.
+  void paymentQueueRestoreCompletedTransactionsFinished() {
+    _restoreCompleter.complete(_restoredTransactions);
+  }
+
+  /// Triggered when any download objects are updated.
+  void updatedDownloads({List<SKDownloadWrapper> downloads}) {}
+
+  /// Triggered when a user initiated an in-app purchase from App Store.
+  ///
+  /// Return `true` to continue the transaction in your app. If you have multiple [SKTransactionObserverWrapper]s, the transaction
+  /// will continue if one [SKTransactionObserverWrapper] has [shouldAddStorePayment] returning `true`.
+  /// Return `false` to defer or cancel the transaction. For example, you may need to defer a transaction if the user is in the middle of onboarding.
+  /// You can also continue the transaction later by calling
+  /// [addPayment] with the [SKPaymentWrapper] object you get from this method.
+  bool shouldAddStorePayment(
+      {SKPaymentWrapper payment, SKProductWrapper product}) {
+    return true;
+  }
+}
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
index 5751166c4f53..03f832ce5edc 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
@@ -34,6 +34,51 @@ class GooglePlayConnection
     return _billingClient.isReady();
   }
 
+  @override
+  Future<QueryPurchaseDetailsResponse> queryPastPurchases(
+      {String applicationUserName}) async {
+    final List<PurchasesResultWrapper> responses = await Future.wait([
+      _billingClient.queryPurchaseHistory(SkuType.inapp),
+      _billingClient.queryPurchaseHistory(SkuType.subs)
+    ]);
+
+    Set errorCodeSet = responses
+        .where((PurchasesResultWrapper response) =>
+            response.responseCode != BillingResponse.ok)
+        .map((PurchasesResultWrapper response) =>
+            response.responseCode.toString())
+        .toSet();
+
+    String errorMessage =
+        errorCodeSet.isNotEmpty ? errorCodeSet.join(', ') : null;
+
+    List<PurchaseDetails> pastPurchases =
+        responses.expand((PurchasesResultWrapper response) {
+      return response.purchasesList;
+    }).map((PurchaseWrapper purchaseWrapper) {
+      return purchaseWrapper.toPurchaseDetails();
+    }).toList();
+
+    return QueryPurchaseDetailsResponse(
+      pastPurchases: pastPurchases,
+      error: errorMessage != null
+          ? PurchaseError(
+              source: PurchaseSource.GooglePlay,
+              code: 'restore_transactions_failed',
+              message: {'message': errorMessage})
+          : null,
+    );
+  }
+
+  /// This is a non-op.
+  ///
+  /// There is no refreshing verification data on Google Play.
+  @override
+  Future<PurchaseVerificationData> refreshPurchaseVerificationData(
+      PurchaseDetails purchase) async {
+    return purchase.verificationData;
+  }
+
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     switch (state) {
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
index 1cb0e0e5002c..cf9da2e8a0b9 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
@@ -7,6 +7,115 @@ import 'dart:io';
 import 'app_store_connection.dart';
 import 'google_play_connection.dart';
 import 'product_details.dart';
+import 'package:flutter/foundation.dart';
+
+/// Represents the data that is used to verify purchases.
+///
+/// The property [source] helps you to determine the method to verify purchases.
+/// Different source of purchase has different methods of verifying purchases.
+///
+/// Both platforms have 2 ways to verify purchase data. You can either choose to verify the data locally using [localVerificationData]
+/// or verify the data using your own server with [serverVerificationData].
+///
+/// For details on how to verify your purchase on iOS,
+/// you can refer to Apple's document about [`About Receipt Validation`](https://developer.apple.com/library/archive/releasenotes/General/ValidateAppStoreReceipt/Introduction.html#//apple_ref/doc/uid/TP40010573-CH105-SW1).
+///
+/// On Android, all purchase information should also be verified manually. See [`Verify a purchase`](https://developer.android.com/google/play/billing/billing_library_overview#Verify).
+///
+/// It is preferable to verify purchases using a server with [serverVerificationData].
+///
+/// If the platform is iOS, it is possible the data can be null or your validation of this data turns out invalid. When this happens,
+/// Call [InAppPurchaseConnection.refreshPurchaseVerificationData] to get a new [PurchaseVerificationData] object. And then you can
+/// validate the receipt data again using one of the methods mentioned in [`Receipt Validation`](https://developer.apple.com/library/archive/releasenotes/General/ValidateAppStoreReceipt/Introduction.html#//apple_ref/doc/uid/TP40010573-CH105-SW1).
+///
+/// You should never use any purchase data until verified.
+class PurchaseVerificationData {
+  /// The data used for local verification.
+  ///
+  /// If the [source] is [PurchaseSource.AppStore], this data is a based64 encoded string. The structure of the payload is defined using ASN.1.
+  /// If the [source] is [PurchaseSource.GooglePlay], this data is a JSON String.
+  final String localVerificationData;
+
+  /// The data used for server verification.
+  ///
+  /// If the platform is iOS, this data is identical to [localVerificationData].
+  final String serverVerificationData;
+
+  /// Indicates the source of the purchase.
+  final PurchaseSource source;
+
+  PurchaseVerificationData(
+      {@required this.localVerificationData,
+      @required this.serverVerificationData,
+      @required this.source});
+}
+
+/// Which platform the purchase is on.
+enum PurchaseSource { GooglePlay, AppStore }
+
+/// Error of a purchase process.
+///
+/// The error can happen during the purchase, or restoring a purchase.
+/// Errors from restoring a purchase are not indicative of any errors during the original purchase.
+class PurchaseError {
+  PurchaseError(
+      {@required this.source, @required this.code, @required this.message});
+
+  /// Which source is the error on.
+  final PurchaseSource source;
+
+  /// The error code.
+  final String code;
+
+  /// A map containing the detailed error message.
+  final Map<String, dynamic> message;
+}
+
+/// Represents the transaction details of a purchase.
+class PurchaseDetails {
+  /// A unique identifier of the purchase.
+  final String purchaseID;
+
+  /// The product identifier of the purchase.
+  final String productId;
+
+  /// The verification data of the purchase.
+  ///
+  /// Use this to verify the purchase. See [PurchaseVerificationData] for details on how to verify purchase use this data.
+  /// You should never use any purchase data until verified.
+  final PurchaseVerificationData verificationData;
+
+  /// The timestamp of the transaction.
+  ///
+  /// Milliseconds since epoch.
+  final String transactionDate;
+
+  PurchaseDetails({
+    @required this.purchaseID,
+    @required this.productId,
+    @required this.verificationData,
+    @required this.transactionDate,
+  });
+}
+
+/// The response object for fetching the past purchases.
+///
+/// An instance of this class is returned in [InAppPurchaseConnection.queryPastPurchases].
+class QueryPurchaseDetailsResponse {
+  QueryPurchaseDetailsResponse({@required this.pastPurchases, this.error});
+
+  /// A list of successfully fetched past purchases.
+  ///
+  /// If there are no past purchases, or there is an [error] fetching past purchases,
+  /// this variable is an empty List.
+  /// You should verify the purchase data using [PurchaseDetails.verificationData] before using the [PurchaseDetails] object.
+  final List<PurchaseDetails> pastPurchases;
+
+  /// The error when fetching past purchases.
+  ///
+  /// If the fetch is successful, the value is null.
+  final PurchaseError error;
+}
 
 /// Basic generic API for making in app purchases across multiple platforms.
 abstract class InAppPurchaseConnection {
@@ -16,6 +125,20 @@ abstract class InAppPurchaseConnection {
   /// Query product details list that match the given set of identifiers.
   Future<ProductDetailsResponse> queryProductDetails(Set<String> identifiers);
 
+  /// Query all the past purchases.
+  ///
+  /// The `applicationUserName` is required if you also passed this in when making a purchase.
+  /// If you did not use a `applicationUserName` when creating payments, you can ignore this parameter.
+  Future<QueryPurchaseDetailsResponse> queryPastPurchases(
+      {String applicationUserName});
+
+  /// A utility method in case there is an issue with getting the verification data originally.
+  ///
+  /// On Android, it is a non-op. We directly return the verification data in the `purchase` that is passed in.
+  /// See [PurchaseVerificationData] for more details on when to use this.
+  Future<PurchaseVerificationData> refreshPurchaseVerificationData(
+      PurchaseDetails purchase);
+
   /// The [InAppPurchaseConnection] implemented for this platform.
   ///
   /// Throws an [UnsupportedError] when accessed on a platform other than
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart
new file mode 100644
index 000000000000..cfbe16d57e89
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart
@@ -0,0 +1,30 @@
+import 'package:in_app_purchase/store_kit_wrappers.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'enum_converters.g.dart';
+
+/// Serializer for [SKPaymentTransactionStateWrapper].
+///
+/// Use these in `@JsonSerializable()` classes by annotating them with
+/// `@SKTransactionStatusConverter()`.
+class SKTransactionStatusConverter
+    implements JsonConverter<SKPaymentTransactionStateWrapper, int> {
+  const SKTransactionStatusConverter();
+
+  @override
+  SKPaymentTransactionStateWrapper fromJson(int json) =>
+      _$enumDecode<SKPaymentTransactionStateWrapper>(
+          _$SKPaymentTransactionStateWrapperEnumMap
+              .cast<SKPaymentTransactionStateWrapper, dynamic>(),
+          json);
+
+  @override
+  int toJson(SKPaymentTransactionStateWrapper object) =>
+      _$SKPaymentTransactionStateWrapperEnumMap[object];
+}
+
+// Define a class so we generate serializer helper methods for the enums
+@JsonSerializable()
+class _SerializedEnums {
+  SKPaymentTransactionStateWrapper response;
+}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.g.dart
new file mode 100644
index 000000000000..3ba355fe0130
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.g.dart
@@ -0,0 +1,40 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'enum_converters.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_SerializedEnums _$_SerializedEnumsFromJson(Map json) {
+  return _SerializedEnums()
+    ..response = _$enumDecode(
+        _$SKPaymentTransactionStateWrapperEnumMap, json['response']);
+}
+
+Map<String, dynamic> _$_SerializedEnumsToJson(_SerializedEnums instance) =>
+    <String, dynamic>{
+      'response': _$SKPaymentTransactionStateWrapperEnumMap[instance.response]
+    };
+
+T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    throw ArgumentError('A value must be provided. Supported values: '
+        '${enumValues.values.join(', ')}');
+  }
+  return enumValues.entries
+      .singleWhere((e) => e.value == source,
+          orElse: () => throw ArgumentError(
+              '`$source` is not one of the supported values: '
+              '${enumValues.values.join(', ')}'))
+      .key;
+}
+
+const _$SKPaymentTransactionStateWrapperEnumMap =
+    <SKPaymentTransactionStateWrapper, dynamic>{
+  SKPaymentTransactionStateWrapper.purchasing: 0,
+  SKPaymentTransactionStateWrapper.purchased: 1,
+  SKPaymentTransactionStateWrapper.failed: 2,
+  SKPaymentTransactionStateWrapper.restored: 3,
+  SKPaymentTransactionStateWrapper.deferred: 4
+};
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
index c4dda97688cd..89f42105fdfd 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
@@ -119,11 +119,11 @@ class SKPaymentQueueWrapper {
             _observer.removedTransactions(transactions: transactions);
           });
         }
-      case 'restoreCompletedTransactions':
+      case 'restoreCompletedTransactionsFailed':
         {
-          final Error error = call.arguments;
+          SKError error = SKError.fromJson(call.arguments);
           return Future<void>(() {
-            _observer.restoreCompletedTransactions(error: error);
+            _observer.restoreCompletedTransactionsFailed(error: error);
           });
         }
       case 'paymentQueueRestoreCompletedTransactionsFinished':
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
index 566eac32ed18..a30f015998f1 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
@@ -8,6 +8,8 @@ import 'package:json_annotation/json_annotation.dart';
 import 'sk_product_wrapper.dart';
 import 'sk_download_wrapper.dart';
 import 'sk_payment_queue_wrapper.dart';
+import 'enum_converters.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/in_app_purchase_connection.dart';
 
 part 'sk_payment_transaction_wrappers.g.dart';
 
@@ -22,7 +24,7 @@ abstract class SKTransactionObserverWrapper {
   void removedTransactions({List<SKPaymentTransactionWrapper> transactions});
 
   /// Triggered when there is an error while restoring transactions.
-  void restoreCompletedTransactions({Error error});
+  void restoreCompletedTransactionsFailed({SKError error});
 
   /// Triggered when payment queue has finished sending restored transactions.
   void paymentQueueRestoreCompletedTransactionsFinished();
@@ -101,7 +103,23 @@ class SKPaymentTransactionWrapper {
     return _$SKPaymentTransactionWrapperFromJson(map);
   }
 
+  /// Generate a [PurchaseDetails] object based on the transaction.
+  ///
+  /// [PurchaseDetails] is Used to represent a purchase detail for unified iOS and Android API.
+  PurchaseDetails toPurchaseDetails(String base64EncodedReceipt) {
+    return PurchaseDetails(
+      purchaseID: transactionIdentifier,
+      productId: payment.productIdentifier,
+      verificationData: PurchaseVerificationData(
+          localVerificationData: base64EncodedReceipt,
+          serverVerificationData: base64EncodedReceipt,
+          source: PurchaseSource.AppStore),
+      transactionDate: (transactionTimeStamp * 1000).toInt().toString(),
+    );
+  }
+
   /// Current transaction state.
+  @SKTransactionStatusConverter()
   final SKPaymentTransactionStateWrapper transactionState;
 
   /// The payment that is created and added to the payment queue which generated this transaction.
@@ -115,7 +133,7 @@ class SKPaymentTransactionWrapper {
 
   /// The timestamp of the transaction.
   ///
-  /// Milliseconds since epoch.
+  /// Seconds since epoch.
   /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased] or [SKPaymentTransactionStateWrapper.restored].
   final double transactionTimeStamp;
 
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_wrapper.dart
deleted file mode 100644
index 8b137891791f..000000000000
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_wrapper.dart
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
index a8eee48ec330..342d3e76037e 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
@@ -5,6 +5,7 @@
 import 'package:test/test.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/in_app_purchase_connection.dart';
 
 final PurchaseWrapper dummyPurchase = PurchaseWrapper(
   orderId: 'orderId',
@@ -26,6 +27,18 @@ void main() {
 
       expect(parsed, equals(expected));
     });
+
+    test('toPurchaseDetails() should return correct PurchaseDetail object', () {
+      final PurchaseDetails details = dummyPurchase.toPurchaseDetails();
+      expect(details.purchaseID, dummyPurchase.orderId);
+      expect(details.productId, dummyPurchase.sku);
+      expect(details.transactionDate, dummyPurchase.purchaseTime.toString());
+      expect(details.verificationData.source, PurchaseSource.GooglePlay);
+      expect(details.verificationData.localVerificationData,
+          dummyPurchase.originalJson);
+      expect(details.verificationData.serverVerificationData,
+          dummyPurchase.purchaseToken);
+    });
   });
 
   group('PurchasesResultWrapper', () {
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
index aba9d89dcaa2..e1dede583289 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
@@ -2,68 +2,212 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
+
+import 'package:flutter/services.dart';
 import 'package:test/test.dart';
 
 import 'package:in_app_purchase/src/channel.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/app_store_connection.dart';
-import '../stub_in_app_purchase_platform.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/in_app_purchase_connection.dart';
+import 'package:in_app_purchase/store_kit_wrappers.dart';
 import '../store_kit_wrappers/sk_test_stub_objects.dart';
 
 void main() {
-  final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
+  final FakeIOSPlatform fakeIOSPlatform = FakeIOSPlatform();
 
-  setUpAll(() =>
-      channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
+  setUpAll(() {
+    SystemChannels.platform
+        .setMockMethodCallHandler(fakeIOSPlatform.onMethodCall);
+  });
 
   group('isAvailable', () {
     test('true', () async {
-      stubPlatform.addResponse(
-          name: '-[SKPaymentQueue canMakePayments:]', value: true);
       expect(await AppStoreConnection.instance.isAvailable(), isTrue);
     });
-
-    test('false', () async {
-      stubPlatform.addResponse(
-          name: '-[SKPaymentQueue canMakePayments:]', value: false);
-      expect(await AppStoreConnection.instance.isAvailable(), isFalse);
-    });
   });
 
   group('query product list', () {
-    test('should get product list', () async {
-      stubPlatform.addResponse(
-          name: '-[InAppPurchasePlugin startProductRequest:result:]',
-          value: buildProductResponseMap(dummyProductResponseWrapper));
+    test('should get product list and correct invalid identifiers', () async {
       final AppStoreConnection connection = AppStoreConnection();
-      final ProductDetailsResponse response =
-          await connection.queryProductDetails(<String>['id'].toSet());
+      final ProductDetailsResponse response = await connection
+          .queryProductDetails(<String>['123', '456', '789'].toSet());
       List<ProductDetails> products = response.productDetails;
       expect(
-        products,
-        isNotEmpty,
+        products.first.id,
+        '123',
       );
       expect(
-        products.first.title,
-        'title',
+        products[1].id,
+        '456',
       );
       expect(
-        products.first.title,
-        isNot('splash coins'),
+        response.notFoundIDs,
+        ['789'],
       );
     });
+  });
 
-    test('should get correct not found identifiers', () async {
-      stubPlatform.addResponse(
-          name: '-[InAppPurchasePlugin startProductRequest:result:]',
-          value: buildProductResponseMap(dummyProductResponseWrapper));
-      final AppStoreConnection connection = AppStoreConnection();
-      final ProductDetailsResponse response =
-          await connection.queryProductDetails(<String>['123'].toSet());
+  group('query purchases list', () {
+    test('should get purchase list', () async {
+      QueryPurchaseDetailsResponse response =
+          await AppStoreConnection.instance.queryPastPurchases();
+      expect(response.pastPurchases.length, 2);
       expect(
-        response.notFoundIDs,
-        <String>['123'],
-      );
+          response.pastPurchases.first.purchaseID,
+          fakeIOSPlatform
+              .transactions.first.originalTransaction.transactionIdentifier);
+      expect(
+          response.pastPurchases.last.purchaseID,
+          fakeIOSPlatform
+              .transactions.last.originalTransaction.transactionIdentifier);
+      expect(
+          response.pastPurchases.first.verificationData.localVerificationData,
+          'dummy base64data');
+      expect(
+          response.pastPurchases.first.verificationData.serverVerificationData,
+          'dummy base64data');
+      expect(response.error, isNull);
+    });
+
+    test('should get empty result if there is no restored transactions',
+        () async {
+      fakeIOSPlatform.testRestoredTransactionsNull = true;
+      QueryPurchaseDetailsResponse response =
+          await AppStoreConnection.instance.queryPastPurchases();
+      expect(response.pastPurchases, isEmpty);
+      fakeIOSPlatform.testRestoredTransactionsNull = false;
+    });
+
+    test('test restore error', () async {
+      fakeIOSPlatform.testRestoredError = SKError(
+          code: 123,
+          domain: 'error_test',
+          userInfo: {'message': 'errorMessage'});
+      QueryPurchaseDetailsResponse response =
+          await AppStoreConnection.instance.queryPastPurchases();
+      expect(response.pastPurchases, isEmpty);
+      expect(response.error.source, PurchaseSource.AppStore);
+      expect(response.error.message['message'], 'errorMessage');
+      fakeIOSPlatform.testRestoredError = null;
+    });
+
+    test('receipt error should populate null to verificationData.data',
+        () async {
+      fakeIOSPlatform.receiptData = null;
+      QueryPurchaseDetailsResponse response =
+          await AppStoreConnection.instance.queryPastPurchases();
+      expect(
+          response.pastPurchases.first.verificationData.localVerificationData,
+          null);
+      expect(
+          response.pastPurchases.first.verificationData.serverVerificationData,
+          null);
+      fakeIOSPlatform.receiptData = 'dummy base64data';
+    });
+  });
+
+  group('refresh receipt data', () {
+    test('should refresh receipt data', () async {
+      PurchaseVerificationData receiptData = await AppStoreConnection.instance
+          .refreshPurchaseVerificationData(null);
+      expect(receiptData.source, PurchaseSource.AppStore);
+      expect(receiptData.localVerificationData, 'refreshed receipt data');
+      expect(receiptData.serverVerificationData, 'refreshed receipt data');
+      fakeIOSPlatform.receiptData = 'dummy base64data';
     });
   });
 }
+
+class FakeIOSPlatform {
+  FakeIOSPlatform() {
+    channel.setMockMethodCallHandler(onMethodCall);
+    preConfigure();
+  }
+
+  // pre-configured store informations
+  String receiptData = 'dummy base64data';
+  Set<String> validProductIDs = ['123', '456'].toSet();
+  Map<String, SKProductWrapper> validProducts = Map();
+  List<SKPaymentTransactionWrapper> transactions = [];
+  bool testRestoredTransactionsNull = false;
+  SKError testRestoredError = null;
+
+  void preConfigure() {
+    for (String validID in validProductIDs) {
+      Map productWrapperMap = buildProductMap(dummyProductWrapper);
+      productWrapperMap['productIdentifier'] = validID;
+      validProducts[validID] = SKProductWrapper.fromJson(productWrapperMap);
+    }
+
+    SKPaymentTransactionWrapper tran1 = SKPaymentTransactionWrapper(
+      transactionIdentifier: '123',
+      payment: dummyPayment,
+      originalTransaction: dummyTransaction,
+      transactionTimeStamp: 123123123.022,
+      transactionState: SKPaymentTransactionStateWrapper.restored,
+      downloads: null,
+      error: null,
+    );
+    SKPaymentTransactionWrapper tran2 = SKPaymentTransactionWrapper(
+      transactionIdentifier: '1234',
+      payment: dummyPayment,
+      originalTransaction: dummyTransaction,
+      transactionTimeStamp: 123123123.022,
+      transactionState: SKPaymentTransactionStateWrapper.restored,
+      downloads: null,
+      error: null,
+    );
+
+    transactions.addAll([tran1, tran2]);
+  }
+
+  Future<dynamic> onMethodCall(MethodCall call) {
+    switch (call.method) {
+      case '-[SKPaymentQueue canMakePayments:]':
+        return Future<bool>.value(true);
+      case '-[InAppPurchasePlugin startProductRequest:result:]':
+        List<String> productIDS =
+            List.castFrom<dynamic, String>(call.arguments);
+        assert(productIDS is List<String>, 'invalid argument type');
+        List<String> invalidFound = [];
+        List<SKProductWrapper> products = [];
+        for (String productID in productIDS) {
+          if (!validProductIDs.contains(productID)) {
+            invalidFound.add(productID);
+          } else {
+            products.add(validProducts[productID]);
+          }
+        }
+        SkProductResponseWrapper response = SkProductResponseWrapper(
+            products: products, invalidProductIdentifiers: invalidFound);
+        return Future<Map<String, dynamic>>.value(
+            buildProductResponseMap(response));
+      case '-[InAppPurchasePlugin restoreTransactions:result:]':
+        if (testRestoredError != null) {
+          AppStoreConnection.observer
+              .restoreCompletedTransactionsFailed(error: testRestoredError);
+          return Future<void>.sync(() {});
+        }
+        if (!testRestoredTransactionsNull) {
+          AppStoreConnection.observer
+              .updatedTransactions(transactions: transactions);
+        }
+        AppStoreConnection.observer
+            .paymentQueueRestoreCompletedTransactionsFinished();
+        return Future<void>.sync(() {});
+      case '-[InAppPurchasePlugin retrieveReceiptData:result:]':
+        if (receiptData != null) {
+          return Future<void>.value(receiptData);
+        } else {
+          throw PlatformException(code: 'no_receipt_data');
+        }
+        break;
+      case '-[InAppPurchasePlugin refreshReceipt:result:]':
+        receiptData = 'refreshed receipt data';
+        return Future<void>.sync(() {});
+    }
+    return Future<void>.sync(() {});
+  }
+}
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index 627074df562d..40c99dc5a3b3 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -8,10 +8,12 @@ import 'package:flutter/widgets.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/google_play_connection.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/in_app_purchase_connection.dart';
 import 'package:in_app_purchase/src/channel.dart';
 import '../stub_in_app_purchase_platform.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
 import '../billing_client_wrappers/sku_details_wrapper_test.dart';
+import '../billing_client_wrappers/purchase_wrapper_test.dart';
 
 void main() {
   final StubInAppPurchasePlatform stubPlatform = StubInAppPurchasePlatform();
@@ -112,4 +114,63 @@ void main() {
       expect(response.notFoundIDs.first, 'invalid');
     });
   });
+
+  group('queryPurchaseDetails', () {
+    final String queryMethodName =
+        'BillingClient#queryPurchaseHistoryAsync(String, PurchaseHistoryResponseListener)';
+    test('handles error', () async {
+      final BillingResponse responseCode = BillingResponse.developerError;
+      stubPlatform.addResponse(name: queryMethodName, value: <dynamic, dynamic>{
+        'responseCode': BillingResponseConverter().toJson(responseCode),
+        'purchasesList': <Map<String, dynamic>>[]
+      });
+      final QueryPurchaseDetailsResponse response =
+          await connection.queryPastPurchases();
+      expect(response.pastPurchases, isEmpty);
+      expect(response.error.message['message'],
+          BillingResponse.developerError.toString());
+      expect(response.error.source, PurchaseSource.GooglePlay);
+    });
+
+    test('returns SkuDetailsResponseWrapper', () async {
+      final BillingResponse responseCode = BillingResponse.ok;
+      stubPlatform.addResponse(name: queryMethodName, value: <String, dynamic>{
+        'responseCode': BillingResponseConverter().toJson(responseCode),
+        'purchasesList': <Map<String, dynamic>>[
+          buildPurchaseMap(dummyPurchase),
+        ]
+      });
+
+      // Since queryPastPurchases makes 2 platform method calls (one for each SkuType), the result will contain 2 dummyWrapper instead
+      // of 1.
+      final QueryPurchaseDetailsResponse response =
+          await connection.queryPastPurchases();
+      expect(response.error, isNull);
+      expect(response.pastPurchases.first.purchaseID, dummyPurchase.orderId);
+    });
+  });
+
+  group('refresh receipt data', () {
+    final String queryMethodName =
+        'BillingClient#queryPurchaseHistoryAsync(String, PurchaseHistoryResponseListener)';
+    test('should refresh receipt data', () async {
+      final BillingResponse responseCode = BillingResponse.ok;
+      stubPlatform.addResponse(name: queryMethodName, value: <String, dynamic>{
+        'responseCode': BillingResponseConverter().toJson(responseCode),
+        'purchasesList': <Map<String, dynamic>>[
+          buildPurchaseMap(dummyPurchase),
+        ]
+      });
+      final QueryPurchaseDetailsResponse response =
+          await connection.queryPastPurchases();
+
+      PurchaseVerificationData receiptData = await GooglePlayConnection.instance
+          .refreshPurchaseVerificationData(response.pastPurchases.first);
+      expect(receiptData.source, PurchaseSource.GooglePlay);
+      expect(receiptData.localVerificationData,
+          response.pastPurchases.first.verificationData.localVerificationData);
+      expect(receiptData.serverVerificationData,
+          response.pastPurchases.first.verificationData.serverVerificationData);
+    });
+  });
 }
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart
index 75873dd8d438..e908c5afffd3 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart
@@ -173,7 +173,7 @@ class TestPaymentTransactionObserver extends SKTransactionObserverWrapper {
 
   void removedTransactions({List<SKPaymentTransactionWrapper> transactions}) {}
 
-  void restoreCompletedTransactions({Error error}) {}
+  void restoreCompletedTransactionsFailed({SKError error}) {}
 
   void paymentQueueRestoreCompletedTransactionsFinished() {}
 
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
index 107826f3a044..3df284e0db9d 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
@@ -6,6 +6,7 @@ import 'package:test/test.dart';
 import 'package:in_app_purchase/src/store_kit_wrappers/sk_product_wrapper.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
 import 'package:in_app_purchase/store_kit_wrappers.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/in_app_purchase_connection.dart';
 import 'sk_test_stub_objects.dart';
 
 void main() {
@@ -131,6 +132,17 @@ void main() {
       expect(transaction, equals(dummyTransaction));
     });
 
+    test('toPurchaseDetails() should return correct PurchaseDetail object', () {
+      PurchaseDetails details =
+          dummyTransaction.toPurchaseDetails('receipt data');
+      expect(dummyTransaction.transactionIdentifier, details.purchaseID);
+      expect(dummyTransaction.payment.productIdentifier, details.productId);
+      expect((dummyTransaction.transactionTimeStamp * 1000).toInt().toString(),
+          details.transactionDate);
+      expect(details.verificationData.localVerificationData, 'receipt data');
+      expect(details.verificationData.serverVerificationData, 'receipt data');
+      expect(details.verificationData.source, PurchaseSource.AppStore);
+    });
     test('Should generate correct map of the payment object', () {
       Map map = dummyPayment.toMap();
       expect(map['productIdentifier'], dummyPayment.productIdentifier);

From fb834f0aced899cf0c4b108728080e086020d91b Mon Sep 17 00:00:00 2001
From: koji ishii <ko2ic.dev@gmail.com>
Date: Sat, 6 Apr 2019 02:34:05 +0900
Subject: [PATCH 294/410] [firebase_crashlytics] Fix to Initialize Fabric
 (#1437)

* [firebase_crashlytics] Fix to initialize Fabric
---
 packages/firebase_crashlytics/CHANGELOG.md                  | 6 +++++-
 .../firebasecrashlytics/FirebaseCrashlyticsPlugin.java      | 4 ++++
 .../ios/Classes/FirebaseCrashlyticsPlugin.m                 | 2 ++
 packages/firebase_crashlytics/pubspec.yaml                  | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_crashlytics/CHANGELOG.md b/packages/firebase_crashlytics/CHANGELOG.md
index c66c92b57a54..dd0f42590dc6 100644
--- a/packages/firebase_crashlytics/CHANGELOG.md
+++ b/packages/firebase_crashlytics/CHANGELOG.md
@@ -1,6 +1,10 @@
+## 0.0.4
+
+* Initialize Fabric automatically, preventing crashes that could occur when setting user data.
+
 ## 0.0.3
 
-* Rely on firebase_core to add the Android dependency on Firebase instead of hardcoding the version ourselves
+* Rely on firebase_core to add the Android dependency on Firebase instead of hardcoding the version ourselves.
 
 ## 0.0.2+1
 
diff --git a/packages/firebase_crashlytics/android/src/main/java/io/flutter/plugins/firebase/crashlytics/firebasecrashlytics/FirebaseCrashlyticsPlugin.java b/packages/firebase_crashlytics/android/src/main/java/io/flutter/plugins/firebase/crashlytics/firebasecrashlytics/FirebaseCrashlyticsPlugin.java
index 35639229f4a4..610ae9e1a007 100644
--- a/packages/firebase_crashlytics/android/src/main/java/io/flutter/plugins/firebase/crashlytics/firebasecrashlytics/FirebaseCrashlyticsPlugin.java
+++ b/packages/firebase_crashlytics/android/src/main/java/io/flutter/plugins/firebase/crashlytics/firebasecrashlytics/FirebaseCrashlyticsPlugin.java
@@ -22,6 +22,10 @@ public static void registerWith(Registrar registrar) {
     final MethodChannel channel =
         new MethodChannel(registrar.messenger(), "plugins.flutter.io/firebase_crashlytics");
     channel.setMethodCallHandler(new FirebaseCrashlyticsPlugin());
+
+    if (!Fabric.isInitialized()) {
+      Fabric.with(registrar.context(), new Crashlytics());
+    }
   }
 
   @Override
diff --git a/packages/firebase_crashlytics/ios/Classes/FirebaseCrashlyticsPlugin.m b/packages/firebase_crashlytics/ios/Classes/FirebaseCrashlyticsPlugin.m
index 0215e61be035..02acdebf3e32 100644
--- a/packages/firebase_crashlytics/ios/Classes/FirebaseCrashlyticsPlugin.m
+++ b/packages/firebase_crashlytics/ios/Classes/FirebaseCrashlyticsPlugin.m
@@ -13,6 +13,8 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
                                   binaryMessenger:[registrar messenger]];
   FirebaseCrashlyticsPlugin *instance = [[FirebaseCrashlyticsPlugin alloc] init];
   [registrar addMethodCallDelegate:instance channel:channel];
+
+  [Fabric with:@[ [Crashlytics self] ]];
 }
 
 - (instancetype)init {
diff --git a/packages/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/pubspec.yaml
index bd7da5e6e05d..624e7a742c75 100644
--- a/packages/firebase_crashlytics/pubspec.yaml
+++ b/packages/firebase_crashlytics/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_crashlytics
 description: Flutter plugin for Firebase Crashlytics. It reports uncaught errors to the
   Firebase console.
-version: 0.0.3
+version: 0.0.4
 author: Flutter Team <flutter-dev@google.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_crashlytics
 

From 2183980a979283b838b32b8cb79da003e6d224bb Mon Sep 17 00:00:00 2001
From: Arthur Thompson <arthur.thompson.jr@gmail.com>
Date: Fri, 5 Apr 2019 10:36:29 -0700
Subject: [PATCH 295/410] Use Gradle BoM with firebase_core (#1443)

---
 packages/firebase_core/CHANGELOG.md                    | 5 +++++
 packages/firebase_core/android/build.gradle            | 3 ++-
 packages/firebase_core/example/android/settings.gradle | 2 ++
 packages/firebase_core/pubspec.yaml                    | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md
index 99ea4b61983f..f88a5775e9a2 100644
--- a/packages/firebase_core/CHANGELOG.md
+++ b/packages/firebase_core/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.2
+
+* Move Android dependency to Gradle BoM to help maintain compatability
+  with other FlutterFire plugins.
+
 ## 0.3.1+1
 
 * Add nil check on static functions to prevent crashes or unwanted behaviors.
diff --git a/packages/firebase_core/android/build.gradle b/packages/firebase_core/android/build.gradle
index 9aaf4bf3d7a6..64b8aebcfc78 100644
--- a/packages/firebase_core/android/build.gradle
+++ b/packages/firebase_core/android/build.gradle
@@ -45,6 +45,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-core:16.0.4'
+        implementation 'com.google.firebase:firebase-bom:17.0.0'
+        api 'com.google.firebase:firebase-core'
     }
 }
diff --git a/packages/firebase_core/example/android/settings.gradle b/packages/firebase_core/example/android/settings.gradle
index 115da6cb4f4d..af2a7074fa7d 100644
--- a/packages/firebase_core/example/android/settings.gradle
+++ b/packages/firebase_core/example/android/settings.gradle
@@ -13,3 +13,5 @@ plugins.each { name, path ->
     include ":$name"
     project(":$name").projectDir = pluginDirectory
 }
+
+enableFeaturePreview('IMPROVED_POM_SUPPORT')
diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml
index 2f215ff691eb..87675f6cacea 100644
--- a/packages/firebase_core/pubspec.yaml
+++ b/packages/firebase_core/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Core, enabling connecting to multiple
   Firebase apps.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_core
-version: 0.3.1+1
+version: 0.3.2
 
 flutter:
   plugin:

From b06ed4782f8c36c23e67a788a2c9c12e151166bd Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Fri, 5 Apr 2019 12:09:27 -0700
Subject: [PATCH 296/410] [firebase_crashlytics] Added a simple integration
 test (#1444)

* Added a simple integration test for Crashlytics
---
 packages/firebase_crashlytics/CHANGELOG.md    |  4 +++
 .../firebase_crashlytics/example/pubspec.yaml |  6 ++++
 .../example/test_driver/crashlytics.dart      | 29 +++++++++++++++++++
 .../example/test_driver/crashlytics_test.dart | 13 +++++++++
 packages/firebase_crashlytics/pubspec.yaml    |  4 ++-
 5 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 packages/firebase_crashlytics/example/test_driver/crashlytics.dart
 create mode 100644 packages/firebase_crashlytics/example/test_driver/crashlytics_test.dart

diff --git a/packages/firebase_crashlytics/CHANGELOG.md b/packages/firebase_crashlytics/CHANGELOG.md
index dd0f42590dc6..0899d126c2ff 100644
--- a/packages/firebase_crashlytics/CHANGELOG.md
+++ b/packages/firebase_crashlytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.4+1
+
+* Added an integration test.
+
 ## 0.0.4
 
 * Initialize Fabric automatically, preventing crashes that could occur when setting user data.
diff --git a/packages/firebase_crashlytics/example/pubspec.yaml b/packages/firebase_crashlytics/example/pubspec.yaml
index 43bfc8159f98..8a12ba4d4bd6 100644
--- a/packages/firebase_crashlytics/example/pubspec.yaml
+++ b/packages/firebase_crashlytics/example/pubspec.yaml
@@ -13,5 +13,11 @@ dependencies:
   firebase_crashlytics:
     path: ../
 
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  flutter_driver:
+    sdk: flutter
+
 flutter:
   uses-material-design: true
diff --git a/packages/firebase_crashlytics/example/test_driver/crashlytics.dart b/packages/firebase_crashlytics/example/test_driver/crashlytics.dart
new file mode 100644
index 000000000000..b40b396f59c8
--- /dev/null
+++ b/packages/firebase_crashlytics/example/test_driver/crashlytics.dart
@@ -0,0 +1,29 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter/widgets.dart';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:firebase_crashlytics/firebase_crashlytics.dart';
+
+void main() {
+  final Completer<String> allTestsCompleter = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => allTestsCompleter.future);
+  tearDownAll(() => allTestsCompleter.complete(null));
+
+  test('onError', () async {
+    // This is currently only testing that we can log errors without crashing.
+    await Crashlytics.instance.setUserName('testing');
+    await Crashlytics.instance.setUserIdentifier('hello');
+    Crashlytics.instance.log('testing');
+    await Crashlytics.instance.onError(
+      FlutterErrorDetails(
+        exception: 'testing',
+        stack: StackTrace.fromString(''),
+      ),
+    );
+  });
+}
diff --git a/packages/firebase_crashlytics/example/test_driver/crashlytics_test.dart b/packages/firebase_crashlytics/example/test_driver/crashlytics_test.dart
new file mode 100644
index 000000000000..b0d3305cd652
--- /dev/null
+++ b/packages/firebase_crashlytics/example/test_driver/crashlytics_test.dart
@@ -0,0 +1,13 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter_driver/flutter_driver.dart';
+
+Future<void> main() async {
+  final FlutterDriver driver = await FlutterDriver.connect();
+  await driver.requestData(null, timeout: const Duration(minutes: 1));
+  driver.close();
+}
diff --git a/packages/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/pubspec.yaml
index 624e7a742c75..3e276708753f 100644
--- a/packages/firebase_crashlytics/pubspec.yaml
+++ b/packages/firebase_crashlytics/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_crashlytics
 description: Flutter plugin for Firebase Crashlytics. It reports uncaught errors to the
   Firebase console.
-version: 0.0.4
+version: 0.0.4+1
 author: Flutter Team <flutter-dev@google.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_crashlytics
 
@@ -17,6 +17,8 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   test: ^1.5.1
+  flutter_driver:
+    sdk: flutter
 
 flutter:
   plugin:

From 121b9df48e63c526867211972af3e674c60a7ec2 Mon Sep 17 00:00:00 2001
From: Andrea Bizzotto <bizz84@gmail.com>
Date: Fri, 5 Apr 2019 22:32:54 +0100
Subject: [PATCH 297/410] [firebase_auth] Enable passwordless sign in (#1159)

* Implement sendLinkToEmail, isSignInWithEmailLink and signInWithEmailAndLink in Flutter
---
 packages/firebase_auth/CHANGELOG.md           |   4 +
 .../firebaseauth/FirebaseAuthPlugin.java      |  47 +++++++
 .../example/lib/signin_page.dart              | 125 ++++++++++++++++++
 packages/firebase_auth/example/pubspec.yaml   |   1 +
 .../example/test/firebase_auth.dart           |  12 ++
 .../ios/Classes/FirebaseAuthPlugin.m          |  27 ++++
 .../firebase_auth/lib/src/firebase_auth.dart  |  65 +++++++++
 packages/firebase_auth/pubspec.yaml           |   3 +-
 .../test/firebase_auth_test.dart              |  59 +++++++++
 9 files changed, 342 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index eb751dee4dda..9cbeb3c82136 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.4
+
+* Adds support for email link authentication.
+
 ## 0.8.3
 
 * Make providerId 'const String' to use in 'case' statement.
diff --git a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
index 3a9872e8f17d..52680b7db259 100755
--- a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
+++ b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
@@ -15,6 +15,7 @@
 import com.google.firebase.FirebaseException;
 import com.google.firebase.FirebaseNetworkException;
 import com.google.firebase.FirebaseTooManyRequestsException;
+import com.google.firebase.auth.ActionCodeSettings;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
@@ -95,6 +96,15 @@ public void onMethodCall(MethodCall call, Result result) {
       case "sendPasswordResetEmail":
         handleSendPasswordResetEmail(call, result, getAuth(call));
         break;
+      case "sendLinkToEmail":
+        handleSendLinkToEmail(call, result, getAuth(call));
+        break;
+      case "isSignInWithEmailLink":
+        handleIsSignInWithEmailLink(call, result, getAuth(call));
+        break;
+      case "signInWithEmailAndLink":
+        handleSignInWithEmailAndLink(call, result, getAuth(call));
+        break;
       case "sendEmailVerification":
         handleSendEmailVerification(call, result, getAuth(call));
         break;
@@ -326,6 +336,43 @@ private void handleSendPasswordResetEmail(
         .addOnCompleteListener(new TaskVoidCompleteListener(result));
   }
 
+  private void handleSendLinkToEmail(MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, Object> arguments = call.arguments();
+    String email = arguments.get("email").toString();
+    ActionCodeSettings actionCodeSettings =
+        ActionCodeSettings.newBuilder()
+            .setUrl(arguments.get("url").toString())
+            .setHandleCodeInApp((Boolean) arguments.get("handleCodeInApp"))
+            .setIOSBundleId(arguments.get("iOSBundleID").toString())
+            .setAndroidPackageName(
+                arguments.get("androidPackageName").toString(),
+                (Boolean) arguments.get("androidInstallIfNotAvailable"),
+                arguments.get("androidMinimumVersion").toString())
+            .build();
+
+    firebaseAuth
+        .sendSignInLinkToEmail(email, actionCodeSettings)
+        .addOnCompleteListener(new TaskVoidCompleteListener(result));
+  }
+
+  private void handleIsSignInWithEmailLink(
+      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
+    String link = arguments.get("link");
+    Boolean isSignInWithEmailLink = firebaseAuth.isSignInWithEmailLink(link);
+    result.success(isSignInWithEmailLink);
+  }
+
+  private void handleSignInWithEmailAndLink(
+      MethodCall call, Result result, FirebaseAuth firebaseAuth) {
+    Map<String, String> arguments = call.arguments();
+    String email = arguments.get("email");
+    String link = arguments.get("link");
+    firebaseAuth
+        .signInWithEmailLink(email, link)
+        .addOnCompleteListener(new SignInCompleteListener(result));
+  }
+
   private void handleSendEmailVerification(
       @SuppressWarnings("unused") MethodCall call, Result result, FirebaseAuth firebaseAuth) {
     final FirebaseUser currentUser = firebaseAuth.getCurrentUser();
diff --git a/packages/firebase_auth/example/lib/signin_page.dart b/packages/firebase_auth/example/lib/signin_page.dart
index 411a9f433d40..c8f39757c1be 100644
--- a/packages/firebase_auth/example/lib/signin_page.dart
+++ b/packages/firebase_auth/example/lib/signin_page.dart
@@ -2,6 +2,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:google_sign_in/google_sign_in.dart';
+import 'package:firebase_dynamic_links/firebase_dynamic_links.dart';
 
 final FirebaseAuth _auth = FirebaseAuth.instance;
 final GoogleSignIn _googleSignIn = GoogleSignIn();
@@ -46,6 +47,7 @@ class SignInPageState extends State<SignInPage> {
           scrollDirection: Axis.vertical,
           children: <Widget>[
             _EmailPasswordForm(),
+            _EmailLinkSignInSection(),
             _AnonymouslySignInSection(),
             _GoogleSignInSection(),
             _PhoneSignInSection(Scaffold.of(context)),
@@ -156,6 +158,129 @@ class _EmailPasswordFormState extends State<_EmailPasswordForm> {
   }
 }
 
+class _EmailLinkSignInSection extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() => _EmailLinkSignInSectionState();
+}
+
+class _EmailLinkSignInSectionState extends State<_EmailLinkSignInSection>
+    with WidgetsBindingObserver {
+  final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
+  final TextEditingController _emailController = TextEditingController();
+
+  bool _success;
+  String _userEmail;
+  String _userID;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+  }
+
+  @override
+  void dispose() {
+    _emailController.dispose();
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) async {
+    if (state == AppLifecycleState.resumed) {
+      final Uri link = await _retrieveDynamicLink();
+
+      if (link != null) {
+        final FirebaseUser user = await _auth.signInWithEmailAndLink(
+          email: _userEmail,
+          link: link.toString(),
+        );
+
+        if (user != null) {
+          _userID = user.uid;
+          _success = true;
+        } else {
+          _success = false;
+        }
+      } else {
+        _success = false;
+      }
+
+      setState(() {});
+    }
+  }
+
+  Future<Uri> _retrieveDynamicLink() async {
+    final PendingDynamicLinkData data =
+        await FirebaseDynamicLinks.instance.retrieveDynamicLink();
+    return data?.link;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Form(
+      key: _formKey,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
+          Container(
+            child: const Text('Test sign in with email and link'),
+            padding: const EdgeInsets.all(16),
+            alignment: Alignment.center,
+          ),
+          TextFormField(
+            controller: _emailController,
+            decoration: InputDecoration(labelText: 'Email'),
+            validator: (String value) {
+              if (value.isEmpty) {
+                return 'Please enter your email.';
+              }
+            },
+          ),
+          Container(
+            padding: const EdgeInsets.symmetric(vertical: 16.0),
+            alignment: Alignment.center,
+            child: RaisedButton(
+              onPressed: () async {
+                if (_formKey.currentState.validate()) {
+                  _signInWithEmailAndLink();
+                }
+              },
+              child: const Text('Submit'),
+            ),
+          ),
+          Container(
+            alignment: Alignment.center,
+            padding: const EdgeInsets.symmetric(horizontal: 16),
+            child: Text(
+              _success == null
+                  ? ''
+                  : (_success
+                      ? 'Successfully signed in, uid: ' + _userID
+                      : 'Sign in failed'),
+              style: TextStyle(color: Colors.red),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+
+  Future<void> _signInWithEmailAndLink() async {
+    _userEmail = _emailController.text;
+
+    return await _auth.sendSignInWithEmailLink(
+      email: _userEmail,
+      url: '<Url with domain from your Firebase project>',
+      handleCodeInApp: true,
+      iOSBundleID: 'io.flutter.plugins.firebaseAuthExample',
+      androidPackageName: 'io.flutter.plugins.firebaseauthexample',
+      androidInstallIfNotAvailable: true,
+      androidMinimumVersion: "1",
+    );
+  }
+}
+
 class _AnonymouslySignInSection extends StatefulWidget {
   @override
   State<StatefulWidget> createState() => _AnonymouslySignInSectionState();
diff --git a/packages/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/example/pubspec.yaml
index 879f53968a41..4236d11cafb0 100755
--- a/packages/firebase_auth/example/pubspec.yaml
+++ b/packages/firebase_auth/example/pubspec.yaml
@@ -9,6 +9,7 @@ dependencies:
     path: ../
   google_sign_in: ^4.0.0
   firebase_core: ^0.3.0
+  firebase_dynamic_links: ^0.2.0+3
 
 dev_dependencies:
   flutter_driver:
diff --git a/packages/firebase_auth/example/test/firebase_auth.dart b/packages/firebase_auth/example/test/firebase_auth.dart
index 74976da6aa9e..2c4f4c8ede32 100644
--- a/packages/firebase_auth/example/test/firebase_auth.dart
+++ b/packages/firebase_auth/example/test/firebase_auth.dart
@@ -20,5 +20,17 @@ void main() {
       expect(user.uid, isNotNull);
       expect(user.isAnonymous, isTrue);
     });
+
+    test('isSignInWithEmailLink', () async {
+      final String emailLink1 = 'https://www.example.com/action?mode=signIn&'
+          'oobCode=oobCode&apiKey=API_KEY';
+      final String emailLink2 =
+          'https://www.example.com/action?mode=verifyEmail&'
+          'oobCode=oobCode&apiKey=API_KEY';
+      final String emailLink3 = 'https://www.example.com/action?mode=signIn';
+      expect(await auth.isSignInWithEmailLink(emailLink1), true);
+      expect(await auth.isSignInWithEmailLink(emailLink2), false);
+      expect(await auth.isSignInWithEmailLink(emailLink3), false);
+    });
   });
 }
diff --git a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
index b9b2191d3e38..c49d4ce7af6e 100644
--- a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
+++ b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
@@ -117,6 +117,33 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
                                                             forObject:nil
                                                                 error:error];
                                                    }];
+  } else if ([@"sendLinkToEmail" isEqualToString:call.method]) {
+    NSString *email = call.arguments[@"email"];
+    FIRActionCodeSettings *actionCodeSettings = [FIRActionCodeSettings new];
+    actionCodeSettings.URL = [NSURL URLWithString:call.arguments[@"url"]];
+    actionCodeSettings.handleCodeInApp = call.arguments[@"handleCodeInApp"];
+    [actionCodeSettings setIOSBundleID:call.arguments[@"iOSBundleID"]];
+    [actionCodeSettings setAndroidPackageName:call.arguments[@"androidPackageName"]
+                        installIfNotAvailable:call.arguments[@"androidInstallIfNotAvailable"]
+                               minimumVersion:call.arguments[@"androidMinimumVersion"]];
+    [[self getAuth:call.arguments] sendSignInLinkToEmail:email
+                                      actionCodeSettings:actionCodeSettings
+                                              completion:^(NSError *_Nullable error) {
+                                                [self sendResult:result forObject:nil error:error];
+                                              }];
+  } else if ([@"isSignInWithEmailLink" isEqualToString:call.method]) {
+    NSString *link = call.arguments[@"link"];
+    BOOL status = [[self getAuth:call.arguments] isSignInWithEmailLink:link];
+    [self sendResult:result forObject:[NSNumber numberWithBool:status] error:nil];
+  } else if ([@"signInWithEmailAndLink" isEqualToString:call.method]) {
+    NSString *email = call.arguments[@"email"];
+    NSString *link = call.arguments[@"link"];
+    [[self getAuth:call.arguments]
+        signInWithEmail:email
+                   link:link
+             completion:^(FIRAuthDataResult *_Nullable authResult, NSError *_Nullable error) {
+               [self sendResult:result forUser:authResult.user error:error];
+             }];
   } else if ([@"signInWithEmailAndPassword" isEqualToString:call.method]) {
     NSString *email = call.arguments[@"email"];
     NSString *password = call.arguments[@"password"];
diff --git a/packages/firebase_auth/lib/src/firebase_auth.dart b/packages/firebase_auth/lib/src/firebase_auth.dart
index 98b7720ba01d..f15fcc08efce 100644
--- a/packages/firebase_auth/lib/src/firebase_auth.dart
+++ b/packages/firebase_auth/lib/src/firebase_auth.dart
@@ -156,6 +156,71 @@ class FirebaseAuth {
     );
   }
 
+  /// Sends a sign in with email link to provided email address.
+  Future<void> sendSignInWithEmailLink({
+    @required String email,
+    @required String url,
+    @required bool handleCodeInApp,
+    @required String iOSBundleID,
+    @required String androidPackageName,
+    @required bool androidInstallIfNotAvailable,
+    @required String androidMinimumVersion,
+  }) async {
+    assert(email != null);
+    assert(url != null);
+    assert(handleCodeInApp != null);
+    assert(iOSBundleID != null);
+    assert(androidPackageName != null);
+    assert(androidInstallIfNotAvailable != null);
+    assert(androidMinimumVersion != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    await channel.invokeMethod(
+      'sendLinkToEmail',
+      <String, dynamic>{
+        'email': email,
+        'url': url,
+        'handleCodeInApp': handleCodeInApp,
+        'iOSBundleID': iOSBundleID,
+        'androidPackageName': androidPackageName,
+        'androidInstallIfNotAvailable': androidInstallIfNotAvailable,
+        'androidMinimumVersion': androidMinimumVersion,
+        'app': app.name,
+      },
+    );
+  }
+
+  /// Checks if link is an email sign-in link.
+  Future<bool> isSignInWithEmailLink(String link) async {
+    return await channel.invokeMethod(
+      'isSignInWithEmailLink',
+      <String, String>{'link': link, 'app': app.name},
+    );
+  }
+
+  /// Signs in using an email address and email sign-in link.
+  ///
+  /// Errors:
+  ///   • `ERROR_NOT_ALLOWED` - Indicates that email and email sign-in link
+  ///      accounts are not enabled. Enable them in the Auth section of the
+  ///      Firebase console.
+  ///   • `ERROR_DISABLED` - Indicates the user's account is disabled.
+  ///   • `ERROR_INVALID` - Indicates the email address is invalid.
+  Future<FirebaseUser> signInWithEmailAndLink(
+      {String email, String link}) async {
+    final Map<dynamic, dynamic> data = await channel.invokeMethod(
+      'signInWithEmailAndLink',
+      <String, dynamic>{
+        'app': app.name,
+        'email': email,
+        'link': link,
+      },
+    );
+    final FirebaseUser currentUser = FirebaseUser._(data, app);
+    return currentUser;
+  }
+
   /// Tries to sign in a user with the given email address and password.
   ///
   /// If successful, it also signs the user in into the app and updates
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index aa9953f60837..b888b930ee67 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.3"
+version: "0.8.4"
 
 flutter:
   plugin:
@@ -21,6 +21,7 @@ dependencies:
 
 dev_dependencies:
   google_sign_in: ^3.0.4
+  firebase_dynamic_links: ^0.2.0+3
   test: ^1.3.0
   flutter_test:
     sdk: flutter
diff --git a/packages/firebase_auth/test/firebase_auth_test.dart b/packages/firebase_auth/test/firebase_auth_test.dart
index 3eb3db28a7a4..d6e74de327ab 100755
--- a/packages/firebase_auth/test/firebase_auth_test.dart
+++ b/packages/firebase_auth/test/firebase_auth_test.dart
@@ -43,9 +43,12 @@ void main() {
           case "getIdToken":
             return kMockIdToken;
             break;
+          case "isSignInWithEmailLink":
+            return true;
           case "startListeningAuthState":
             return mockHandleId++;
             break;
+          case "sendLinkToEmail":
           case "sendPasswordResetEmail":
           case "updateEmail":
           case "updatePassword":
@@ -114,6 +117,62 @@ void main() {
       );
     });
 
+    test('sendSignInWithEmailLink', () async {
+      await auth.sendSignInWithEmailLink(
+        email: 'test@example.com',
+        url: 'http://www.example.com/',
+        handleCodeInApp: true,
+        iOSBundleID: 'com.example.app',
+        androidPackageName: 'com.example.app',
+        androidInstallIfNotAvailable: false,
+        androidMinimumVersion: "12",
+      );
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall('sendLinkToEmail', arguments: <String, dynamic>{
+            'email': 'test@example.com',
+            'url': 'http://www.example.com/',
+            'handleCodeInApp': true,
+            'iOSBundleID': 'com.example.app',
+            'androidPackageName': 'com.example.app',
+            'androidInstallIfNotAvailable': false,
+            'androidMinimumVersion': '12',
+            'app': auth.app.name,
+          }),
+        ],
+      );
+    });
+
+    test('isSignInWithEmailLink', () async {
+      final bool result = await auth.isSignInWithEmailLink('foo');
+      expect(result, true);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall('isSignInWithEmailLink',
+              arguments: <String, String>{'link': 'foo', 'app': auth.app.name}),
+        ],
+      );
+    });
+
+    test('signInWithEmailAndLink', () async {
+      await auth.signInWithEmailAndLink(
+        email: 'test@example.com',
+        link: '<Url with domain from your Firebase project>',
+      );
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall('signInWithEmailAndLink', arguments: <String, dynamic>{
+            'email': 'test@example.com',
+            'link': '<Url with domain from your Firebase project>',
+            'app': auth.app.name,
+          }),
+        ],
+      );
+    });
+
     test('createUserWithEmailAndPassword', () async {
       final FirebaseUser user = await auth.createUserWithEmailAndPassword(
         email: kMockEmail,

From 73186d17e918d38c5a48e671007d2868f0602bdf Mon Sep 17 00:00:00 2001
From: Ben Bieker <mail@ben-bieker.de>
Date: Sat, 6 Apr 2019 00:22:42 +0200
Subject: [PATCH 298/410] [image_picker] Check camera permissions and return
 error (#1440)

Under iOS, the camera permissions have not been correctly checked. If the user did not allow camera access, the camera view was launched and displayed a black screen. It was then also possible to make a photo of the black screen and use it. The camera view controller is now only launched, when the user has granted permissions. Otherwise it will not launch and flutter will also receive an error.
flutter/flutter#30378
---
 packages/image_picker/CHANGELOG.md            |  5 ++
 .../ios/Classes/ImagePickerPlugin.m           | 64 +++++++++++++++++--
 packages/image_picker/pubspec.yaml            |  2 +-
 3 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 1c4f0ce1bc28..3a6dccfe1bbd 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.5.2
+
+* Check iOS camera authorizationStatus and return an error, if the access was
+  denied.
+
 ## 0.5.1
 
 * Android: Do not delete original image after scaling if the image is from gallery.
diff --git a/packages/image_picker/ios/Classes/ImagePickerPlugin.m b/packages/image_picker/ios/Classes/ImagePickerPlugin.m
index da2a3ca6ba71..946cb1be3b56 100644
--- a/packages/image_picker/ios/Classes/ImagePickerPlugin.m
+++ b/packages/image_picker/ios/Classes/ImagePickerPlugin.m
@@ -4,6 +4,7 @@
 
 #import "ImagePickerPlugin.h"
 
+#import <AVFoundation/AVFoundation.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <Photos/Photos.h>
 #import <UIKit/UIKit.h>
@@ -61,7 +62,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
 
     switch (imageSource) {
       case SOURCE_CAMERA:
-        [self showCamera];
+        [self checkAuthorization];
         break;
       case SOURCE_GALLERY:
         [self showPhotoLibrary];
@@ -88,7 +89,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
 
     switch (imageSource) {
       case SOURCE_CAMERA:
-        [self showCamera];
+        [self checkAuthorization];
         break;
       case SOURCE_GALLERY:
         [self showPhotoLibrary];
@@ -105,6 +106,11 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
 }
 
 - (void)showCamera {
+  @synchronized(self) {
+    if (_imagePickerController.beingPresented) {
+      return;
+    }
+  }
   // Camera is not available on simulators
   if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
     _imagePickerController.sourceType = UIImagePickerControllerSourceTypeCamera;
@@ -118,6 +124,53 @@ - (void)showCamera {
   }
 }
 
+- (void)checkAuthorization {
+  AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
+
+  switch (status) {
+    case AVAuthorizationStatusAuthorized:
+      [self showCamera];
+      break;
+    case AVAuthorizationStatusNotDetermined: {
+      [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo
+                               completionHandler:^(BOOL granted) {
+                                 if (granted) {
+                                   dispatch_async(dispatch_get_main_queue(), ^{
+                                     if (granted) {
+                                       [self showCamera];
+                                     }
+                                   });
+                                 } else {
+                                   dispatch_async(dispatch_get_main_queue(), ^{
+                                     [self errorNoAccess:AVAuthorizationStatusDenied];
+                                   });
+                                 }
+                               }];
+    }; break;
+    case AVAuthorizationStatusDenied:
+    case AVAuthorizationStatusRestricted:
+    default:
+      [self errorNoAccess:status];
+      break;
+  }
+}
+
+- (void)errorNoAccess:(AVAuthorizationStatus)status {
+  switch (status) {
+    case AVAuthorizationStatusRestricted:
+      _result([FlutterError errorWithCode:@"camera_access_restricted"
+                                  message:@"The user is not allowed to use the camera."
+                                  details:nil]);
+      break;
+    case AVAuthorizationStatusDenied:
+    default:
+      _result([FlutterError errorWithCode:@"camera_access_denied"
+                                  message:@"The user did not allow camera access."
+                                  details:nil]);
+      break;
+  }
+}
+
 - (void)showPhotoLibrary {
   // No need to check if SourceType is available. It always is.
   _imagePickerController.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
@@ -129,9 +182,10 @@ - (void)imagePickerController:(UIImagePickerController *)picker
   NSURL *videoURL = [info objectForKey:UIImagePickerControllerMediaURL];
   UIImage *image = [info objectForKey:UIImagePickerControllerEditedImage];
   [_imagePickerController dismissViewControllerAnimated:YES completion:nil];
-  // The method dismissViewControllerAnimated does not immediately prevent further
-  // didFinishPickingMediaWithInfo invocations. A nil check is necessary to prevent below code to
-  // be unwantly executed multiple times and cause a crash.
+  // The method dismissViewControllerAnimated does not immediately prevent
+  // further didFinishPickingMediaWithInfo invocations. A nil check is necessary
+  // to prevent below code to be unwantly executed multiple times and cause a
+  // crash.
   if (!_result) {
     return;
   }
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 741777f3ebb6..fe6e4ef9fcb5 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.1
+version: 0.5.2
 
 flutter:
   plugin:

From 57c575e82eab2c50532e5e26195f56f3ef08e7c7 Mon Sep 17 00:00:00 2001
From: Arthur Thompson <arthur.thompson.jr@gmail.com>
Date: Fri, 5 Apr 2019 16:56:55 -0700
Subject: [PATCH 299/410] Use Gradle BoM with cloud_firestore (#1453)

---
 packages/cloud_firestore/CHANGELOG.md                    | 5 +++++
 packages/cloud_firestore/android/build.gradle            | 3 ++-
 packages/cloud_firestore/example/android/settings.gradle | 2 ++
 packages/cloud_firestore/example/pubspec.yaml            | 2 +-
 packages/cloud_firestore/pubspec.yaml                    | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index fb056969a2a1..1dcf5d818bda 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.9.12
+
+* Move Android dependency to Gradle BoM to help maintain compatibility
+  with other FlutterFire plugins.
+
 ## 0.9.11
 
 * Bump Android dependencies to latest.
diff --git a/packages/cloud_firestore/android/build.gradle b/packages/cloud_firestore/android/build.gradle
index c0283007130d..b67aa6051ca5 100755
--- a/packages/cloud_firestore/android/build.gradle
+++ b/packages/cloud_firestore/android/build.gradle
@@ -47,7 +47,8 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-firestore:18.2.0'
+        implementation 'com.google.firebase:firebase-bom:17.0.0'
+        api 'com.google.firebase:firebase-firestore'
         implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/cloud_firestore/example/android/settings.gradle b/packages/cloud_firestore/example/android/settings.gradle
index 115da6cb4f4d..af2a7074fa7d 100755
--- a/packages/cloud_firestore/example/android/settings.gradle
+++ b/packages/cloud_firestore/example/android/settings.gradle
@@ -13,3 +13,5 @@ plugins.each { name, path ->
     include ":$name"
     project(":$name").projectDir = pluginDirectory
 }
+
+enableFeaturePreview('IMPROVED_POM_SUPPORT')
diff --git a/packages/cloud_firestore/example/pubspec.yaml b/packages/cloud_firestore/example/pubspec.yaml
index 7180f0d9b9dc..8463f1deb2f5 100755
--- a/packages/cloud_firestore/example/pubspec.yaml
+++ b/packages/cloud_firestore/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   cloud_firestore:
     path: ../
-  firebase_core: "^0.3.0"
+  firebase_core: "^0.3.2"
 
 dev_dependencies:
   flutter_driver:
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index f77def0aa209..40b573cd02e8 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.11
+version: 0.9.12
 
 flutter:
   plugin:

From 477e0a1a9795ba3bcbff2ce753d121dea338e133 Mon Sep 17 00:00:00 2001
From: Miguel Ruivo <miguel@miguelruivo.com>
Date: Sat, 6 Apr 2019 03:06:04 +0100
Subject: [PATCH 300/410] [google_maps_flutter] adds support for custom icon
 from a byte array (PNG) (#815)

* Merge branch 'master' into GoogleMapsFlutter-SupportCustomIconMarker

        # Conflicts:
        #       packages/google_maps_flutter/ios/Classes/GoogleMapController.m

* Update AUTHORS

* Add an example and fix my cr comments

* Added a test asset

* Update changelog and pubspec
---
 AUTHORS                                       |   1 +
 packages/google_maps_flutter/CHANGELOG.md     |   4 ++
 .../flutter/plugins/googlemaps/Convert.java   |  28 +++++++++++
 .../example/assets/red_square.png             | Bin 0 -> 4383 bytes
 .../example/lib/place_marker.dart             |  44 ++++++++++++++++++
 .../google_maps_flutter/example/pubspec.yaml  |   4 +-
 .../ios/Classes/GoogleMapMarkerController.m   |  20 ++++++++
 .../lib/google_maps_flutter.dart              |   1 +
 .../google_maps_flutter/lib/src/bitmap.dart   |   6 +++
 packages/google_maps_flutter/pubspec.yaml     |   2 +-
 10 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 packages/google_maps_flutter/example/assets/red_square.png

diff --git a/AUTHORS b/AUTHORS
index 0bcd6a07881c..a52eea4db702 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,6 +22,7 @@ Thomas Danner <thmsdnnr@gmail.com>
 Diego Velásquez <diego.velasquez.lopez@gmail.com>
 Hajime Nakamura <nkmrhj@gmail.com>
 Tuyển Vũ Xuân <netsoft1985@gmail.com>
+Miguel Ruivo <miguel@miguelruivo.com>
 Sarthak Verma <sarthak@artiosys.com>
 Mike Diarmid <mike@invertase.io>
 Invertase <oss@invertase.io>
diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 2da38c850f6e..41034ae530da 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.3
+
+* Added support setting marker icons from bytes.
+
 ## 0.5.2
 
 * Added onTap for callback for GoogleMap.
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
index db430feceaa6..d2983f9e79fd 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
@@ -4,6 +4,8 @@
 
 package io.flutter.plugins.googlemaps;
 
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Point;
 import com.google.android.gms.maps.CameraUpdate;
 import com.google.android.gms.maps.CameraUpdateFactory;
@@ -38,11 +40,27 @@ private static BitmapDescriptor toBitmapDescriptor(Object o) {
           return BitmapDescriptorFactory.fromAsset(
               FlutterMain.getLookupKeyForAsset(toString(data.get(1)), toString(data.get(2))));
         }
+      case "fromBytes":
+        return getBitmapFromBytes(data);
       default:
         throw new IllegalArgumentException("Cannot interpret " + o + " as BitmapDescriptor");
     }
   }
 
+  private static BitmapDescriptor getBitmapFromBytes(List<?> data) {
+    if (data.size() == 2) {
+      try {
+        Bitmap bitmap = toBitmap(data.get(1));
+        return BitmapDescriptorFactory.fromBitmap(bitmap);
+      } catch (Exception e) {
+        throw new IllegalArgumentException("Unable to interpret bytes as a valid image.", e);
+      }
+    } else {
+      throw new IllegalArgumentException(
+          "fromBytes should have exactly one argument, the bytes. Got: " + data.size());
+    }
+  }
+
   private static boolean toBoolean(Object o) {
     return (Boolean) o;
   }
@@ -160,6 +178,16 @@ private static int toPixels(Object o, float density) {
     return (int) toFractionalPixels(o, density);
   }
 
+  private static Bitmap toBitmap(Object o) {
+    byte[] bmpData = (byte[]) o;
+    Bitmap bitmap = BitmapFactory.decodeByteArray(bmpData, 0, bmpData.length);
+    if (bitmap == null) {
+      throw new IllegalArgumentException("Unable to decode bytes as a valid bitmap.");
+    } else {
+      return bitmap;
+    }
+  }
+
   private static Point toPoint(Object o, float density) {
     final List<?> data = toList(o);
     return new Point(toPixels(data.get(0), density), toPixels(data.get(1), density));
diff --git a/packages/google_maps_flutter/example/assets/red_square.png b/packages/google_maps_flutter/example/assets/red_square.png
new file mode 100644
index 0000000000000000000000000000000000000000..af570f4f58b4e5c325590edafffe9bacc322cae5
GIT binary patch
literal 4383
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
SEzg`@XAKoybm2{_(0>7_n48=H

literal 0
HcmV?d00001

diff --git a/packages/google_maps_flutter/example/lib/place_marker.dart b/packages/google_maps_flutter/example/lib/place_marker.dart
index 83479008be3f..1487ddfe2a49 100644
--- a/packages/google_maps_flutter/example/lib/place_marker.dart
+++ b/packages/google_maps_flutter/example/lib/place_marker.dart
@@ -2,7 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
 import 'dart:math';
+import 'dart:typed_data';
+import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
@@ -212,6 +215,37 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
     });
   }
 
+  void _setMarkerIcon(BitmapDescriptor assetIcon) {
+    if (selectedMarker == null) {
+      return;
+    }
+
+    final Marker marker = markers[selectedMarker];
+    setState(() {
+      markers[selectedMarker] = marker.copyWith(
+        iconParam: assetIcon,
+      );
+    });
+  }
+
+  Future<BitmapDescriptor> _getAssetIcon(BuildContext context) async {
+    final Completer<BitmapDescriptor> bitmapIcon =
+        Completer<BitmapDescriptor>();
+    final ImageConfiguration config = createLocalImageConfiguration(context);
+
+    const AssetImage("assets/red_square.png")
+        .resolve(config)
+        .addListener((ImageInfo image, bool sync) async {
+      final ByteData bytes =
+          await image.image.toByteData(format: ImageByteFormat.png);
+      final BitmapDescriptor bitmap =
+          BitmapDescriptor.fromBytes(bytes.buffer.asUint8List());
+      bitmapIcon.complete(bitmap);
+    });
+
+    return await bitmapIcon.future;
+  }
+
   @override
   Widget build(BuildContext context) {
     return Column(
@@ -296,6 +330,16 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
                           child: const Text('change zIndex'),
                           onPressed: _changeZIndex,
                         ),
+                        FlatButton(
+                          child: const Text('set marker icon'),
+                          onPressed: () {
+                            _getAssetIcon(context).then(
+                              (BitmapDescriptor icon) {
+                                _setMarkerIcon(icon);
+                              },
+                            );
+                          },
+                        ),
                       ],
                     ),
                   ],
diff --git a/packages/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/example/pubspec.yaml
index 2f49ef6470d2..e804e2880393 100644
--- a/packages/google_maps_flutter/example/pubspec.yaml
+++ b/packages/google_maps_flutter/example/pubspec.yaml
@@ -28,8 +28,8 @@ flutter:
   uses-material-design: true
 
   # To add assets to your application, add an assets section, like this:
-  # assets:
-  #  - images/a_dot_burr.jpeg
+  assets:
+    - assets/red_square.png
   #  - images/a_dot_ham.jpeg
 
   # An image asset can refer to one or more resolution-specific "variants", see
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
index 42c23b36ff9a..569531ff69f7 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
@@ -164,7 +164,27 @@ static void InterpretInfoWindow(id<FLTGoogleMapMarkerOptionsSink> sink, NSDictio
       image = [UIImage imageNamed:[registrar lookupKeyForAsset:iconData[1]
                                                    fromPackage:iconData[2]]];
     }
+  } else if ([iconData[0] isEqualToString:@"fromBytes"]) {
+    if (iconData.count == 2) {
+      @try {
+        FlutterStandardTypedData* byteData = iconData[1];
+        image = [UIImage imageWithData:[byteData data]];
+      } @catch (NSException* exception) {
+        @throw [NSException exceptionWithName:@"InvalidByteDescriptor"
+                                       reason:@"Unable to interpret bytes as a valid image."
+                                     userInfo:nil];
+      }
+    } else {
+      NSString* error = [NSString
+          stringWithFormat:@"fromBytes should have exactly one argument, the bytes. Got: %lu",
+                           iconData.count];
+      NSException* exception = [NSException exceptionWithName:@"InvalidByteDescriptor"
+                                                       reason:error
+                                                     userInfo:nil];
+      @throw exception;
+    }
   }
+
   return image;
 }
 
diff --git a/packages/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/lib/google_maps_flutter.dart
index 13e2a9828358..1ee7cb898210 100644
--- a/packages/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/lib/google_maps_flutter.dart
@@ -5,6 +5,7 @@
 library google_maps_flutter;
 
 import 'dart:async';
+import 'dart:typed_data';
 import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
diff --git a/packages/google_maps_flutter/lib/src/bitmap.dart b/packages/google_maps_flutter/lib/src/bitmap.dart
index 94be095be6d3..e64147df7d23 100644
--- a/packages/google_maps_flutter/lib/src/bitmap.dart
+++ b/packages/google_maps_flutter/lib/src/bitmap.dart
@@ -43,6 +43,12 @@ class BitmapDescriptor {
     }
   }
 
+  /// Creates a BitmapDescriptor using an array of bytes that must be encoded
+  /// as PNG.
+  static BitmapDescriptor fromBytes(Uint8List byteData) {
+    return BitmapDescriptor._(<dynamic>['fromBytes', byteData]);
+  }
+
   final dynamic _json;
 
   dynamic _toJson() => _json;
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index a3ec53290bf7..2c58dcdbed5a 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.2
+version: 0.5.3
 
 dependencies:
   flutter:

From 4d9243320d92550418d3c6fa4334f48570bfffab Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Sat, 6 Apr 2019 12:10:29 -0700
Subject: [PATCH 301/410] [connectivity]Added integration test. (#1455)

Add test driver to the plugin.
---
 packages/connectivity/CHANGELOG.md            |  4 +++
 packages/connectivity/example/pubspec.yaml    |  5 +++
 .../example/test_driver/connectivity.dart     | 31 +++++++++++++++++++
 .../test_driver/connectivity_test.dart        | 10 ++++++
 packages/connectivity/pubspec.yaml            |  5 ++-
 5 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 packages/connectivity/example/test_driver/connectivity.dart
 create mode 100644 packages/connectivity/example/test_driver/connectivity_test.dart

diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md
index 1295b57346f0..65270ebfa150 100644
--- a/packages/connectivity/CHANGELOG.md
+++ b/packages/connectivity/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.2+2
+
+* Add integration test.
+
 ## 0.4.2+1
 
 * Bump the minimum Flutter version to 1.2.0.
diff --git a/packages/connectivity/example/pubspec.yaml b/packages/connectivity/example/pubspec.yaml
index d03e3e29aba5..c364782e786c 100644
--- a/packages/connectivity/example/pubspec.yaml
+++ b/packages/connectivity/example/pubspec.yaml
@@ -7,5 +7,10 @@ dependencies:
   connectivity:
     path: ../
 
+dev_dependencies:
+  flutter_driver:
+    sdk: flutter
+  test: any
+
 flutter:
   uses-material-design: true
diff --git a/packages/connectivity/example/test_driver/connectivity.dart b/packages/connectivity/example/test_driver/connectivity.dart
new file mode 100644
index 000000000000..634a00985d8a
--- /dev/null
+++ b/packages/connectivity/example/test_driver/connectivity.dart
@@ -0,0 +1,31 @@
+import 'dart:async';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:connectivity/connectivity.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('Connectivity test driver', () {
+    Connectivity _connectivity;
+
+    setUpAll(() async {
+      _connectivity = Connectivity();
+    });
+
+    test('test connectivity result', () async {
+      final ConnectivityResult result = await _connectivity.checkConnectivity();
+      expect(result, isNotNull);
+      switch (result) {
+        case ConnectivityResult.wifi:
+          expect((_connectivity.getWifiName()), completes);
+          expect((await _connectivity.getWifiIP()), isNotNull);
+          break;
+        default:
+          break;
+      }
+    });
+  });
+}
diff --git a/packages/connectivity/example/test_driver/connectivity_test.dart b/packages/connectivity/example/test_driver/connectivity_test.dart
new file mode 100644
index 000000000000..2b89c8f2f7bb
--- /dev/null
+++ b/packages/connectivity/example/test_driver/connectivity_test.dart
@@ -0,0 +1,10 @@
+import 'package:flutter_driver/flutter_driver.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('connectivity', () async {
+    final FlutterDriver driver = await FlutterDriver.connect();
+    await driver.requestData(null, timeout: const Duration(minutes: 1));
+    driver.close();
+  });
+}
diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml
index eb2dbb6b3a9f..8eff3e6e2bff 100644
--- a/packages/connectivity/pubspec.yaml
+++ b/packages/connectivity/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi &
   mobile/cellular) connectivity on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
-version: 0.4.2+1
+version: 0.4.2+2
 
 flutter:
   plugin:
@@ -19,6 +19,9 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  test: any
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"

From 2bb66c2e385e88518f11aee1dfb0c1d57131d238 Mon Sep 17 00:00:00 2001
From: Arthur Thompson <arthur.thompson.jr@gmail.com>
Date: Sun, 7 Apr 2019 18:16:59 -0700
Subject: [PATCH 302/410] Remove BoM to avoid Gradle issues (#1462)

---
 packages/cloud_firestore/CHANGELOG.md                    | 4 ++++
 packages/cloud_firestore/android/build.gradle            | 3 +--
 packages/cloud_firestore/example/android/settings.gradle | 2 --
 packages/cloud_firestore/pubspec.yaml                    | 2 +-
 packages/firebase_core/CHANGELOG.md                      | 4 ++++
 packages/firebase_core/android/build.gradle              | 3 +--
 packages/firebase_core/example/android/settings.gradle   | 1 -
 packages/firebase_core/pubspec.yaml                      | 2 +-
 8 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 1dcf5d818bda..cdad057548ce 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.13
+
+* Remove Gradle BoM to avoid Gradle version issues. 
+
 ## 0.9.12
 
 * Move Android dependency to Gradle BoM to help maintain compatibility
diff --git a/packages/cloud_firestore/android/build.gradle b/packages/cloud_firestore/android/build.gradle
index b67aa6051ca5..c0283007130d 100755
--- a/packages/cloud_firestore/android/build.gradle
+++ b/packages/cloud_firestore/android/build.gradle
@@ -47,8 +47,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        implementation 'com.google.firebase:firebase-bom:17.0.0'
-        api 'com.google.firebase:firebase-firestore'
+        api 'com.google.firebase:firebase-firestore:18.2.0'
         implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/cloud_firestore/example/android/settings.gradle b/packages/cloud_firestore/example/android/settings.gradle
index af2a7074fa7d..115da6cb4f4d 100755
--- a/packages/cloud_firestore/example/android/settings.gradle
+++ b/packages/cloud_firestore/example/android/settings.gradle
@@ -13,5 +13,3 @@ plugins.each { name, path ->
     include ":$name"
     project(":$name").projectDir = pluginDirectory
 }
-
-enableFeaturePreview('IMPROVED_POM_SUPPORT')
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 40b573cd02e8..22b0b162814c 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.12
+version: 0.9.13
 
 flutter:
   plugin:
diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md
index f88a5775e9a2..7552e0508c31 100644
--- a/packages/firebase_core/CHANGELOG.md
+++ b/packages/firebase_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.3
+
+* Remove Gradle BoM to avoid Gradle version issues.
+
 ## 0.3.2
 
 * Move Android dependency to Gradle BoM to help maintain compatability
diff --git a/packages/firebase_core/android/build.gradle b/packages/firebase_core/android/build.gradle
index 64b8aebcfc78..46555b9b55bf 100644
--- a/packages/firebase_core/android/build.gradle
+++ b/packages/firebase_core/android/build.gradle
@@ -45,7 +45,6 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        implementation 'com.google.firebase:firebase-bom:17.0.0'
-        api 'com.google.firebase:firebase-core'
+        api 'com.google.firebase:firebase-core:16.0.8'
     }
 }
diff --git a/packages/firebase_core/example/android/settings.gradle b/packages/firebase_core/example/android/settings.gradle
index af2a7074fa7d..840d7be6e176 100644
--- a/packages/firebase_core/example/android/settings.gradle
+++ b/packages/firebase_core/example/android/settings.gradle
@@ -14,4 +14,3 @@ plugins.each { name, path ->
     project(":$name").projectDir = pluginDirectory
 }
 
-enableFeaturePreview('IMPROVED_POM_SUPPORT')
diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml
index 87675f6cacea..141c850bcbac 100644
--- a/packages/firebase_core/pubspec.yaml
+++ b/packages/firebase_core/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Core, enabling connecting to multiple
   Firebase apps.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_core
-version: 0.3.2
+version: 0.3.3
 
 flutter:
   plugin:

From 6eb5d634249ae49226509686c5050de33bd66b56 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Sun, 7 Apr 2019 20:40:12 -0700
Subject: [PATCH 303/410] Fix firebase_core build incompatibility errors
 (#1464)

---
 packages/firebase_core/CHANGELOG.md         | 4 ++++
 packages/firebase_core/android/build.gradle | 2 +-
 packages/firebase_core/pubspec.yaml         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md
index 7552e0508c31..9a341b2128ab 100644
--- a/packages/firebase_core/CHANGELOG.md
+++ b/packages/firebase_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.4
+
+* Updates Android firebase-core dependency to a version that is compatible with other Flutterfire plugins.
+
 ## 0.3.3
 
 * Remove Gradle BoM to avoid Gradle version issues.
diff --git a/packages/firebase_core/android/build.gradle b/packages/firebase_core/android/build.gradle
index 46555b9b55bf..9aaf4bf3d7a6 100644
--- a/packages/firebase_core/android/build.gradle
+++ b/packages/firebase_core/android/build.gradle
@@ -45,6 +45,6 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-core:16.0.8'
+        api 'com.google.firebase:firebase-core:16.0.4'
     }
 }
diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml
index 141c850bcbac..861c2109678a 100644
--- a/packages/firebase_core/pubspec.yaml
+++ b/packages/firebase_core/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Core, enabling connecting to multiple
   Firebase apps.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_core
-version: 0.3.3
+version: 0.3.4
 
 flutter:
   plugin:

From 5f385af696f9603379dd05ef9e019ceeac1ded63 Mon Sep 17 00:00:00 2001
From: creativecreatorormaybenot
 <19204050+creativecreatorormaybenot@users.noreply.github.com>
Date: Mon, 8 Apr 2019 04:42:56 +0000
Subject: [PATCH 304/410] [firebase_auth] AuthCredential for email and link
 (#1458)

* Add `getCredentialWithLink`
---
 packages/firebase_auth/CHANGELOG.md           |  4 +
 .../firebaseauth/FirebaseAuthPlugin.java      |  9 ++-
 .../ios/Classes/FirebaseAuthPlugin.m          |  9 ++-
 .../auth_provider/email_auth_provider.dart    | 10 +++
 .../firebase_auth/lib/src/firebase_auth.dart  |  4 +
 packages/firebase_auth/pubspec.yaml           |  2 +-
 .../test/firebase_auth_test.dart              | 76 +++++++++++++++++++
 7 files changed, 109 insertions(+), 5 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index 9cbeb3c82136..464144bd8d52 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.4+1
+
+* Adds credential for email authentication with link.
+
 ## 0.8.4
 
 * Adds support for email link authentication.
diff --git a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
index 52680b7db259..6e194fb5a025 100755
--- a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
+++ b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
@@ -416,8 +416,13 @@ private AuthCredential getCredential(Map<String, Object> arguments) {
       case EmailAuthProvider.PROVIDER_ID:
         {
           String email = data.get("email");
-          String password = data.get("password");
-          credential = EmailAuthProvider.getCredential(email, password);
+          if (data.containsKey("password")) {
+            String password = data.get("password");
+            credential = EmailAuthProvider.getCredential(email, password);
+          } else {
+            String link = data.get("link");
+            credential = EmailAuthProvider.getCredentialWithLink(email, link);
+          }
           break;
         }
       case GoogleAuthProvider.PROVIDER_ID:
diff --git a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
index c49d4ce7af6e..3490bc9f9de7 100644
--- a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
+++ b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
@@ -353,8 +353,13 @@ - (FIRAuthCredential *)getCredential:(NSDictionary *)arguments {
   FIRAuthCredential *credential;
   if ([FIREmailAuthProviderID isEqualToString:provider]) {
     NSString *email = data[@"email"];
-    NSString *password = data[@"password"];
-    credential = [FIREmailAuthProvider credentialWithEmail:email password:password];
+    if ([data objectForKey:@"password"]) {
+      NSString *password = data[@"password"];
+      credential = [FIREmailAuthProvider credentialWithEmail:email password:password];
+    } else {
+      NSString *link = data[@"link"];
+      credential = [FIREmailAuthProvider credentialWithEmail:email link:link];
+    }
   } else if ([FIRGoogleAuthProviderID isEqualToString:provider]) {
     NSString *idToken = data[@"idToken"];
     NSString *accessToken = data[@"accessToken"];
diff --git a/packages/firebase_auth/lib/src/auth_provider/email_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/email_auth_provider.dart
index 6150f0043f44..97094529f259 100644
--- a/packages/firebase_auth/lib/src/auth_provider/email_auth_provider.dart
+++ b/packages/firebase_auth/lib/src/auth_provider/email_auth_provider.dart
@@ -16,4 +16,14 @@ class EmailAuthProvider {
       'password': password,
     });
   }
+
+  static AuthCredential getCredentialWithLink({
+    String email,
+    String link,
+  }) {
+    return AuthCredential._(providerId, <String, String>{
+      'email': email,
+      'link': link,
+    });
+  }
 }
diff --git a/packages/firebase_auth/lib/src/firebase_auth.dart b/packages/firebase_auth/lib/src/firebase_auth.dart
index f15fcc08efce..385a4e315181 100644
--- a/packages/firebase_auth/lib/src/firebase_auth.dart
+++ b/packages/firebase_auth/lib/src/firebase_auth.dart
@@ -268,6 +268,8 @@ class FirebaseAuth {
   ///       Resolve this case by calling [fetchSignInMethodsForEmail] and then asking the user to sign in using one of them.
   ///       This error will only be thrown if the "One account per email address" setting is enabled in the Firebase console (recommended).
   ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that Google accounts are not enabled.
+  ///   • `ERROR_INVALID_ACTION_CODE` - If the action code in the link is malformed, expired, or has already been used.
+  ///       This can only occur when using [EmailAuthProvider.getCredentialWithLink] to obtain the credential.
   Future<FirebaseUser> signInWithCredential(AuthCredential credential) async {
     assert(credential != null);
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
@@ -428,6 +430,8 @@ class FirebaseAuth {
   ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
   ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has an account of this type linked.
   ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that this type of account is not enabled.
+  ///   • `ERROR_INVALID_ACTION_CODE` - If the action code in the link is malformed, expired, or has already been used.
+  ///       This can only occur when using [EmailAuthProvider.getCredentialWithLink] to obtain the credential.
   Future<FirebaseUser> linkWithCredential(AuthCredential credential) async {
     assert(credential != null);
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index b888b930ee67..367423767fa8 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.4"
+version: "0.8.4+1"
 
 flutter:
   plugin:
diff --git a/packages/firebase_auth/test/firebase_auth_test.dart b/packages/firebase_auth/test/firebase_auth_test.dart
index d6e74de327ab..45b2a05749d9 100755
--- a/packages/firebase_auth/test/firebase_auth_test.dart
+++ b/packages/firebase_auth/test/firebase_auth_test.dart
@@ -213,6 +213,82 @@ void main() {
       );
     });
 
+    test('EmailAuthProvider (withLink) linkWithCredential', () async {
+      final AuthCredential credential = EmailAuthProvider.getCredentialWithLink(
+        email: 'test@example.com',
+        link: '<Url with domain from your Firebase project>',
+      );
+      final FirebaseUser user = await auth.linkWithCredential(credential);
+      verifyUser(user);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'linkWithCredential',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+              'provider': 'password',
+              'data': <String, String>{
+                'email': 'test@example.com',
+                'link': '<Url with domain from your Firebase project>',
+              },
+            },
+          ),
+        ],
+      );
+    });
+
+    test('EmailAuthProvider (withLink) signInWithCredential', () async {
+      final AuthCredential credential = EmailAuthProvider.getCredentialWithLink(
+        email: 'test@example.com',
+        link: '<Url with domain from your Firebase project>',
+      );
+      final FirebaseUser user = await auth.signInWithCredential(credential);
+      verifyUser(user);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'signInWithCredential',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+              'provider': 'password',
+              'data': <String, String>{
+                'email': 'test@example.com',
+                'link': '<Url with domain from your Firebase project>',
+              },
+            },
+          ),
+        ],
+      );
+    });
+
+    test('EmailAuthProvider (withLink) reauthenticateWithCredential', () async {
+      final FirebaseUser user = await auth.currentUser();
+      log.clear();
+      final AuthCredential credential = EmailAuthProvider.getCredentialWithLink(
+        email: 'test@example.com',
+        link: '<Url with domain from your Firebase project>',
+      );
+      await user.reauthenticateWithCredential(credential);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'reauthenticateWithCredential',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+              'provider': 'password',
+              'data': <String, String>{
+                'email': 'test@example.com',
+                'link': '<Url with domain from your Firebase project>',
+              }
+            },
+          ),
+        ],
+      );
+    });
+
     test('TwitterAuthProvider linkWithCredential', () async {
       final AuthCredential credential = TwitterAuthProvider.getCredential(
         authToken: kMockIdToken,

From 45f3515fe2c74240cda106c992681043be3fed70 Mon Sep 17 00:00:00 2001
From: Makoto Yamazaki <makoto1975@gmail.com>
Date: Mon, 8 Apr 2019 13:49:54 +0900
Subject: [PATCH 305/410] [firebase_auth] fix error code in doc of
 createUserWithEmailAndPassword() (#1343)

---
 packages/firebase_auth/CHANGELOG.md               | 4 ++++
 packages/firebase_auth/lib/src/firebase_auth.dart | 2 +-
 packages/firebase_auth/pubspec.yaml               | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index 464144bd8d52..98e06a18f06c 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.4+2
+
+* Fixes an error in the documentation of createUserWithEmailAndPassword.
+
 ## 0.8.4+1
 
 * Adds credential for email authentication with link.
diff --git a/packages/firebase_auth/lib/src/firebase_auth.dart b/packages/firebase_auth/lib/src/firebase_auth.dart
index 385a4e315181..44b916897c86 100644
--- a/packages/firebase_auth/lib/src/firebase_auth.dart
+++ b/packages/firebase_auth/lib/src/firebase_auth.dart
@@ -94,7 +94,7 @@ class FirebaseAuth {
   ///
   /// Errors:
   ///   • `ERROR_WEAK_PASSWORD` - If the password is not strong enough.
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the email address is malformed.
+  ///   • `ERROR_INVALID_EMAIL` - If the email address is malformed.
   ///   • `ERROR_EMAIL_ALREADY_IN_USE` - If the email is already in use by a different account.
   Future<FirebaseUser> createUserWithEmailAndPassword({
     @required String email,
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 367423767fa8..e0b3ba3952c7 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.4+1"
+version: "0.8.4+2"
 
 flutter:
   plugin:

From bb9b0093a96186ee1bf584fc8edf501cc2c927c5 Mon Sep 17 00:00:00 2001
From: Sarbagya Dhaubanjar <sarbagyastha@gmail.com>
Date: Mon, 8 Apr 2019 11:37:14 +0545
Subject: [PATCH 306/410] [share] Changed compileSdkVersion of share plugin to
 28 (#1237)

---
 AUTHORS                             | 3 ++-
 packages/share/CHANGELOG.md         | 4 ++++
 packages/share/android/build.gradle | 2 +-
 packages/share/pubspec.yaml         | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a52eea4db702..0ab7d0298832 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,4 +28,5 @@ Mike Diarmid <mike@invertase.io>
 Invertase <oss@invertase.io>
 Elliot Hesp <elliot@invertase.io>
 Katarina Sheremet <katarina@sheremet.ch>
-Thomas Stockx <thomas@stockxit.com>
\ No newline at end of file
+Thomas Stockx <thomas@stockxit.com>
+Sarbagya Dhaubanjar <sarbagyastha@gmail.com>
diff --git a/packages/share/CHANGELOG.md b/packages/share/CHANGELOG.md
index 802a5e34a113..e66adfe2255e 100644
--- a/packages/share/CHANGELOG.md
+++ b/packages/share/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.1
+
+* Updated Android compileSdkVersion to 28 to match other plugins.
+
 ## 0.6.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/share/android/build.gradle b/packages/share/android/build.gradle
index 7e3700549674..3b265e6c5ca7 100644
--- a/packages/share/android/build.gradle
+++ b/packages/share/android/build.gradle
@@ -35,7 +35,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
diff --git a/packages/share/pubspec.yaml b/packages/share/pubspec.yaml
index e3b161b0ff87..0e74ad152ecf 100644
--- a/packages/share/pubspec.yaml
+++ b/packages/share/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for sharing content via the platform share UI, using
   the ACTION_SEND intent on Android and UIActivityViewController on iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/share
-version: 0.6.0+1
+version: 0.6.1
 
 flutter:
   plugin:

From 80233db68d222f71c242fb0cb791458851b5e375 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Mon, 8 Apr 2019 11:16:10 -0700
Subject: [PATCH 307/410] [in_app_purchase] Add references to the original
 object for PurchaseDetails and ProductDetails (#1448)

Add the references back so user can access the detailed information if they need to.
---
 .../purchase_wrapper.dart                     |  1 +
 .../sku_details_wrapper.dart                  |  1 +
 .../app_store_connection.dart                 |  3 +-
 .../google_play_connection.dart               |  9 ++----
 .../in_app_purchase_connection.dart           | 25 +++++++++++++----
 .../product_details.dart                      | 28 +++++++++++++++----
 .../sk_payment_transaction_wrappers.dart      |  1 +
 .../sk_product_wrapper.dart                   |  1 +
 .../purchase_wrapper_test.dart                |  2 ++
 .../sku_details_wrapper_test.dart             |  2 ++
 .../app_store_connection_test.dart            |  4 +--
 .../google_play_connection_test.dart          | 23 ++-------------
 .../store_kit_wrappers/sk_product_test.dart   |  4 +++
 13 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
index 1d1c1e87bc95..847ad80e0915 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
@@ -103,6 +103,7 @@ class PurchaseWrapper {
           serverVerificationData: purchaseToken,
           source: PurchaseSource.GooglePlay),
       transactionDate: purchaseTime.toString(),
+      billingClientPurchase: this,
     );
   }
 }
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
index 132fd0b3a3a8..a22992d098dc 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
@@ -133,6 +133,7 @@ class SkuDetailsWrapper {
       title: title,
       description: description,
       price: price,
+      skuDetail: this,
     );
   }
 }
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
index ca72ee36543d..d7f431fa3a0a 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
@@ -70,8 +70,7 @@ class AppStoreConnection implements InAppPurchaseConnection {
   }
 
   @override
-  Future<PurchaseVerificationData> refreshPurchaseVerificationData(
-      PurchaseDetails purchase) async {
+  Future<PurchaseVerificationData> refreshPurchaseVerificationData() async {
     await SKRequestMaker().startRefreshReceiptRequest();
     String receipt = await SKReceiptManager.retrieveReceiptData();
     return PurchaseVerificationData(
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
index 03f832ce5edc..cbdfef2bbde0 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
@@ -70,13 +70,10 @@ class GooglePlayConnection
     );
   }
 
-  /// This is a non-op.
-  ///
-  /// There is no refreshing verification data on Google Play.
   @override
-  Future<PurchaseVerificationData> refreshPurchaseVerificationData(
-      PurchaseDetails purchase) async {
-    return purchase.verificationData;
+  Future<PurchaseVerificationData> refreshPurchaseVerificationData() async {
+    throw Exception(
+        'The method <refreshPurchaseVerificationData> only works on iOS.');
   }
 
   @override
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
index cf9da2e8a0b9..b990bb342f19 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
@@ -8,6 +8,8 @@ import 'app_store_connection.dart';
 import 'google_play_connection.dart';
 import 'product_details.dart';
 import 'package:flutter/foundation.dart';
+import 'package:in_app_purchase/store_kit_wrappers.dart';
+import 'package:in_app_purchase/billing_client_wrappers.dart';
 
 /// Represents the data that is used to verify purchases.
 ///
@@ -72,6 +74,9 @@ class PurchaseError {
 }
 
 /// Represents the transaction details of a purchase.
+///
+/// This class unifies the BillingClient's [PurchaseWrapper] and StoreKit's [SKPaymentTransactionWrapper]. You can use the common attributes in
+/// This class for simple operations. If you would like to see the detailed representation of the product, instead,  use [PurchaseWrapper] on Android and [SKPaymentTransactionWrapper] on iOS.
 class PurchaseDetails {
   /// A unique identifier of the purchase.
   final String purchaseID;
@@ -90,11 +95,23 @@ class PurchaseDetails {
   /// Milliseconds since epoch.
   final String transactionDate;
 
+  /// Points back to the `StoreKits`'s [SKPaymentTransactionWrapper] object that generated this [PurchaseDetails] object.
+  ///
+  /// This is null on Android.
+  final SKPaymentTransactionWrapper skPaymentTransaction;
+
+  /// Points back to the `BillingClient`'s [PurchaseWrapper] object that generated this [PurchaseDetails] object.
+  ///
+  /// This is null on Android.
+  final PurchaseWrapper billingClientPurchase;
+
   PurchaseDetails({
     @required this.purchaseID,
     @required this.productId,
     @required this.verificationData,
     @required this.transactionDate,
+    this.skPaymentTransaction = null,
+    this.billingClientPurchase = null,
   });
 }
 
@@ -132,12 +149,10 @@ abstract class InAppPurchaseConnection {
   Future<QueryPurchaseDetailsResponse> queryPastPurchases(
       {String applicationUserName});
 
-  /// A utility method in case there is an issue with getting the verification data originally.
+  /// A utility method in case there is an issue with getting the verification data originally on iOS.
   ///
-  /// On Android, it is a non-op. We directly return the verification data in the `purchase` that is passed in.
-  /// See [PurchaseVerificationData] for more details on when to use this.
-  Future<PurchaseVerificationData> refreshPurchaseVerificationData(
-      PurchaseDetails purchase);
+  /// Throws an [Exception] on Android.
+  Future<PurchaseVerificationData> refreshPurchaseVerificationData();
 
   /// The [InAppPurchaseConnection] implemented for this platform.
   ///
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart
index 6ffc87fb105c..3860327b79f0 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart
@@ -3,15 +3,21 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart';
+import 'package:in_app_purchase/store_kit_wrappers.dart';
+import 'package:in_app_purchase/billing_client_wrappers.dart';
 
 /// The class represents the information of a product.
+///
+/// This class unifies the BillingClient's [SkuDetailsWrapper] and StoreKit's [SKProductWrapper]. You can use the common attributes in
+/// This class for simple operations. If you would like to see the detailed representation of the product, instead,  use [skuDetails] on Android and [skProduct] on iOS.
 class ProductDetails {
-  ProductDetails({
-    @required this.id,
-    @required this.title,
-    @required this.description,
-    @required this.price,
-  });
+  ProductDetails(
+      {@required this.id,
+      @required this.title,
+      @required this.description,
+      @required this.price,
+      this.skProduct = null,
+      this.skuDetail = null});
 
   /// The identifier of the product, specified in App Store Connect or Sku in Google Play console.
   final String id;
@@ -25,6 +31,16 @@ class ProductDetails {
   /// The price of the product, specified in the App Store Connect or Sku in Google Play console based on the platform.
   /// Formatted with currency symbol ("$0.99").
   final String price;
+
+  /// Points back to the `StoreKits`'s [SKProductWrapper] object that generated this [ProductDetails] object.
+  ///
+  /// This is null on Android.
+  final SKProductWrapper skProduct;
+
+  /// Points back to the `BillingClient1`'s [SkuDetailsWrapper] object that generated this [ProductDetails] object.
+  ///
+  /// This is null on Android.
+  final SkuDetailsWrapper skuDetail;
 }
 
 /// The response returned by [InAppPurchaseConnection.queryProductDetails].
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
index a30f015998f1..1dd93e70c493 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
@@ -115,6 +115,7 @@ class SKPaymentTransactionWrapper {
           serverVerificationData: base64EncodedReceipt,
           source: PurchaseSource.AppStore),
       transactionDate: (transactionTimeStamp * 1000).toInt().toString(),
+      skPaymentTransaction: this,
     );
   }
 
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
index b748d483cee3..90d8486392df 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
@@ -305,6 +305,7 @@ class SKProductWrapper {
       title: localizedTitle,
       description: localizedDescription,
       price: priceLocale.currencySymbol + price,
+      skProduct: this,
     );
   }
 }
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
index 342d3e76037e..b62ba175dcdd 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
@@ -38,6 +38,8 @@ void main() {
           dummyPurchase.originalJson);
       expect(details.verificationData.serverVerificationData,
           dummyPurchase.purchaseToken);
+      expect(details.skPaymentTransaction, null);
+      expect(details.billingClientPurchase, dummyPurchase);
     });
   });
 
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
index 61b1d53fa881..54e4dd535f54 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
@@ -66,6 +66,8 @@ void main() {
       expect(product.description, wrapper.description);
       expect(product.id, wrapper.sku);
       expect(product.price, wrapper.price);
+      expect(product.skuDetail, wrapper);
+      expect(product.skProduct, null);
     });
 
     test('handles empty list of skuDetails', () {
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
index e1dede583289..4634ea1ac75a 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
@@ -110,8 +110,8 @@ void main() {
 
   group('refresh receipt data', () {
     test('should refresh receipt data', () async {
-      PurchaseVerificationData receiptData = await AppStoreConnection.instance
-          .refreshPurchaseVerificationData(null);
+      PurchaseVerificationData receiptData =
+          await AppStoreConnection.instance.refreshPurchaseVerificationData();
       expect(receiptData.source, PurchaseSource.AppStore);
       expect(receiptData.localVerificationData, 'refreshed receipt data');
       expect(receiptData.serverVerificationData, 'refreshed receipt data');
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index 40c99dc5a3b3..8a496148b05b 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -151,26 +151,9 @@ void main() {
   });
 
   group('refresh receipt data', () {
-    final String queryMethodName =
-        'BillingClient#queryPurchaseHistoryAsync(String, PurchaseHistoryResponseListener)';
-    test('should refresh receipt data', () async {
-      final BillingResponse responseCode = BillingResponse.ok;
-      stubPlatform.addResponse(name: queryMethodName, value: <String, dynamic>{
-        'responseCode': BillingResponseConverter().toJson(responseCode),
-        'purchasesList': <Map<String, dynamic>>[
-          buildPurchaseMap(dummyPurchase),
-        ]
-      });
-      final QueryPurchaseDetailsResponse response =
-          await connection.queryPastPurchases();
-
-      PurchaseVerificationData receiptData = await GooglePlayConnection.instance
-          .refreshPurchaseVerificationData(response.pastPurchases.first);
-      expect(receiptData.source, PurchaseSource.GooglePlay);
-      expect(receiptData.localVerificationData,
-          response.pastPurchases.first.verificationData.localVerificationData);
-      expect(receiptData.serverVerificationData,
-          response.pastPurchases.first.verificationData.serverVerificationData);
+    test('should throw on android', () {
+      expect(GooglePlayConnection.instance.refreshPurchaseVerificationData(),
+          throwsException);
     });
   });
 }
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
index 3df284e0db9d..5fcdb47f191e 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
@@ -80,6 +80,8 @@ void main() {
       expect(product.id, wrapper.productIdentifier);
       expect(product.price,
           wrapper.priceLocale.currencySymbol + wrapper.price.toString());
+      expect(product.skProduct, wrapper);
+      expect(product.skuDetail, null);
     });
 
     test('SKProductResponse wrapper should match', () {
@@ -142,6 +144,8 @@ void main() {
       expect(details.verificationData.localVerificationData, 'receipt data');
       expect(details.verificationData.serverVerificationData, 'receipt data');
       expect(details.verificationData.source, PurchaseSource.AppStore);
+      expect(details.skPaymentTransaction, dummyTransaction);
+      expect(details.billingClientPurchase, null);
     });
     test('Should generate correct map of the payment object', () {
       Map map = dummyPayment.toMap();

From a961c1645a6a8d37c58ca9508caed554fd1c4c63 Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Mon, 8 Apr 2019 13:13:42 -0700
Subject: [PATCH 308/410] [google_maps_flutter] Add method getVisibleRegion
 (#1352)

---
 packages/google_maps_flutter/CHANGELOG.md     |  4 +
 .../flutter/plugins/googlemaps/Convert.java   |  7 ++
 .../googlemaps/GoogleMapController.java       | 13 +++
 .../google_maps_flutter/example/lib/main.dart |  2 +
 .../example/lib/map_coordinates.dart          | 96 +++++++++++++++++++
 .../example/test_driver/google_maps.dart      | 72 +++++++++++++-
 .../ios/Classes/GoogleMapController.m         | 22 +++++
 .../lib/src/controller.dart                   | 13 +++
 .../google_maps_flutter/lib/src/location.dart | 18 ++++
 packages/google_maps_flutter/pubspec.yaml     |  2 +-
 10 files changed, 247 insertions(+), 2 deletions(-)
 create mode 100644 packages/google_maps_flutter/example/lib/map_coordinates.dart

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 41034ae530da..ab74c1f6e5f1 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.4
+
+* Add method getVisibleRegion for get the latlng bounds of the visible map area.
+
 ## 0.5.3
 
 * Added support setting marker icons from bytes.
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
index d2983f9e79fd..5ced8142beb6 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
@@ -149,6 +149,13 @@ static Object toJson(LatLng latLng) {
     return Arrays.asList(latLng.latitude, latLng.longitude);
   }
 
+  public static Object toJson(LatLngBounds latLngBounds) {
+    final Map<String, Object> arguments = new HashMap<>(2);
+    arguments.put("southwest", toJson(latLngBounds.southwest));
+    arguments.put("northeast", toJson(latLngBounds.northeast));
+    return arguments;
+  }
+
   private static LatLng toLatLng(Object o) {
     final List<?> data = toList(o);
     return new LatLng(toDouble(data.get(0)), toDouble(data.get(1)));
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index 20a19cdd787b..e7a92c6773c1 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -179,6 +179,19 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
           result.success(Convert.toJson(getCameraPosition()));
           break;
         }
+      case "map#getVisibleRegion":
+        {
+          if (googleMap != null) {
+            LatLngBounds latLngBounds = googleMap.getProjection().getVisibleRegion().latLngBounds;
+            result.success(Convert.toJson(latLngBounds));
+          } else {
+            result.error(
+                "GoogleMap uninitialized",
+                "getVisibleRegion called prior to map initialization",
+                null);
+          }
+          break;
+        }
       case "camera#move":
         {
           final CameraUpdate cameraUpdate =
diff --git a/packages/google_maps_flutter/example/lib/main.dart b/packages/google_maps_flutter/example/lib/main.dart
index d76a3f802a88..dc86ab40e0b5 100644
--- a/packages/google_maps_flutter/example/lib/main.dart
+++ b/packages/google_maps_flutter/example/lib/main.dart
@@ -4,6 +4,7 @@
 
 import 'package:flutter/material.dart';
 import 'animate_camera.dart';
+import 'map_coordinates.dart';
 import 'map_ui.dart';
 import 'move_camera.dart';
 import 'page.dart';
@@ -12,6 +13,7 @@ import 'scrolling_map.dart';
 
 final List<Page> _allPages = <Page>[
   MapUiPage(),
+  MapCoordinatesPage(),
   AnimateCameraPage(),
   MoveCameraPage(),
   PlaceMarkerPage(),
diff --git a/packages/google_maps_flutter/example/lib/map_coordinates.dart b/packages/google_maps_flutter/example/lib/map_coordinates.dart
new file mode 100644
index 000000000000..fd707fba9313
--- /dev/null
+++ b/packages/google_maps_flutter/example/lib/map_coordinates.dart
@@ -0,0 +1,96 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+import 'page.dart';
+
+const CameraPosition _kInitialPosition =
+    CameraPosition(target: LatLng(-33.852, 151.211), zoom: 11.0);
+
+class MapCoordinatesPage extends Page {
+  MapCoordinatesPage() : super(const Icon(Icons.map), 'Map coordinates');
+
+  @override
+  Widget build(BuildContext context) {
+    return const _MapCoordinatesBody();
+  }
+}
+
+class _MapCoordinatesBody extends StatefulWidget {
+  const _MapCoordinatesBody();
+
+  @override
+  State<StatefulWidget> createState() => _MapCoordinatesBodyState();
+}
+
+class _MapCoordinatesBodyState extends State<_MapCoordinatesBody> {
+  _MapCoordinatesBodyState();
+
+  GoogleMapController mapController;
+  LatLngBounds _visibleRegion = LatLngBounds(
+    southwest: const LatLng(0, 0),
+    northeast: const LatLng(0, 0),
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    final GoogleMap googleMap = GoogleMap(
+      onMapCreated: onMapCreated,
+      initialCameraPosition: _kInitialPosition,
+    );
+
+    final List<Widget> columnChildren = <Widget>[
+      Padding(
+        padding: const EdgeInsets.all(10.0),
+        child: Center(
+          child: SizedBox(
+            width: 300.0,
+            height: 200.0,
+            child: googleMap,
+          ),
+        ),
+      ),
+    ];
+
+    if (mapController != null) {
+      final String currentVisibleRegion = 'VisibleRegion:'
+          '\nnortheast: ${_visibleRegion.northeast},'
+          '\nsouthwest: ${_visibleRegion.southwest}';
+      columnChildren.add(Center(child: Text(currentVisibleRegion)));
+      columnChildren.add(_getVisibleRegionButton());
+    }
+
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.start,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: columnChildren,
+    );
+  }
+
+  void onMapCreated(GoogleMapController controller) async {
+    final LatLngBounds visibleRegion = await controller.getVisibleRegion();
+    setState(() {
+      mapController = controller;
+      _visibleRegion = visibleRegion;
+    });
+  }
+
+  Widget _getVisibleRegionButton() {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: RaisedButton(
+        child: const Text('Get Visible Region Bounds'),
+        onPressed: () async {
+          final LatLngBounds visibleRegion =
+              await mapController.getVisibleRegion();
+          setState(() {
+            _visibleRegion = visibleRegion;
+          });
+        },
+      ),
+    );
+  }
+}
diff --git a/packages/google_maps_flutter/example/test_driver/google_maps.dart b/packages/google_maps_flutter/example/test_driver/google_maps.dart
index 65235619db67..be13dbce90d6 100644
--- a/packages/google_maps_flutter/example/test_driver/google_maps.dart
+++ b/packages/google_maps_flutter/example/test_driver/google_maps.dart
@@ -12,8 +12,9 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'google_map_inspector.dart';
 import 'test_widgets.dart';
 
+const LatLng _kInitialMapCenter = LatLng(0, 0);
 const CameraPosition _kInitialCameraPosition =
-    CameraPosition(target: LatLng(0, 0));
+    CameraPosition(target: _kInitialMapCenter);
 
 void main() {
   final Completer<String> allTestsCompleter = Completer<String>();
@@ -263,4 +264,73 @@ void main() {
     scrollGesturesEnabled = await inspector.isScrollGesturesEnabled();
     expect(scrollGesturesEnabled, true);
   });
+
+  test('testGetVisibleRegion', () async {
+    final Key key = GlobalKey();
+    final LatLngBounds zeroLatLngBounds = LatLngBounds(
+        southwest: const LatLng(0, 0), northeast: const LatLng(0, 0));
+
+    final Completer<GoogleMapController> mapControllerCompleter =
+        Completer<GoogleMapController>();
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        onMapCreated: (GoogleMapController controller) {
+          mapControllerCompleter.complete(controller);
+        },
+      ),
+    ));
+    final GoogleMapController mapController =
+        await mapControllerCompleter.future;
+
+    // We suspected a bug in the iOS Google Maps SDK caused the camera is not properly positioned at
+    // initialization. https://github.com/flutter/flutter/issues/24806
+    // This temporary workaround fix is provided while the actual fix in the Google Maps SDK is
+    // still being investigated.
+    // TODO(cyanglaz): Remove this temporary fix once the Maps SDK issue is resolved.
+    // https://github.com/flutter/flutter/issues/27550
+    await Future<dynamic>.delayed(Duration(seconds: 3));
+
+    final LatLngBounds firstVisibleRegion =
+        await mapController.getVisibleRegion();
+
+    expect(firstVisibleRegion, isNotNull);
+    expect(firstVisibleRegion.southwest, isNotNull);
+    expect(firstVisibleRegion.northeast, isNotNull);
+    expect(firstVisibleRegion, isNot(zeroLatLngBounds));
+    expect(firstVisibleRegion.contains(_kInitialMapCenter), isTrue);
+
+    const LatLng southWest = LatLng(60, 75);
+    const LatLng northEast = LatLng(65, 80);
+    final LatLng newCenter = LatLng(
+      (northEast.latitude + southWest.latitude) / 2,
+      (northEast.longitude + southWest.longitude) / 2,
+    );
+
+    expect(firstVisibleRegion.contains(northEast), isFalse);
+    expect(firstVisibleRegion.contains(southWest), isFalse);
+
+    final LatLngBounds latLngBounds =
+        LatLngBounds(southwest: southWest, northeast: northEast);
+
+    // TODO(iskakaushik): non-zero padding is needed for some device configurations
+    // https://github.com/flutter/flutter/issues/30575
+    final double padding = 0;
+    await mapController
+        .moveCamera(CameraUpdate.newLatLngBounds(latLngBounds, padding));
+
+    final LatLngBounds secondVisibleRegion =
+        await mapController.getVisibleRegion();
+
+    expect(secondVisibleRegion, isNotNull);
+    expect(secondVisibleRegion.southwest, isNotNull);
+    expect(secondVisibleRegion.northeast, isNotNull);
+    expect(secondVisibleRegion, isNot(zeroLatLngBounds));
+
+    expect(firstVisibleRegion, isNot(secondVisibleRegion));
+    expect(secondVisibleRegion.contains(newCenter), isTrue);
+  });
 }
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index 788ba6a08ab0..246ece0248b5 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -12,6 +12,7 @@
 static GMSCameraPosition* ToOptionalCameraPosition(NSDictionary* json);
 static GMSCoordinateBounds* ToOptionalBounds(NSArray* json);
 static GMSCameraUpdate* ToCameraUpdate(NSArray* data);
+static NSDictionary* GMSCoordinateBoundsToJson(GMSCoordinateBounds* bounds);
 static void InterpretMapOptions(NSDictionary* data, id<FLTGoogleMapOptionsSink> sink);
 static double ToDouble(NSNumber* data) { return [FLTGoogleMapJsonConversions toDouble:data]; }
 
@@ -110,6 +111,17 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   } else if ([call.method isEqualToString:@"map#update"]) {
     InterpretMapOptions(call.arguments[@"options"], self);
     result(PositionToJson([self cameraPosition]));
+  } else if ([call.method isEqualToString:@"map#getVisibleRegion"]) {
+    if (_mapView != nil) {
+      GMSVisibleRegion visibleRegion = _mapView.projection.visibleRegion;
+      GMSCoordinateBounds* bounds = [[GMSCoordinateBounds alloc] initWithRegion:visibleRegion];
+
+      result(GMSCoordinateBoundsToJson(bounds));
+    } else {
+      result([FlutterError errorWithCode:@"GoogleMap uninitialized"
+                                 message:@"getVisibleRegion called prior to map initialization"
+                                 details:nil]);
+    }
   } else if ([call.method isEqualToString:@"map#waitForMap"]) {
     result(nil);
   } else if ([call.method isEqualToString:@"markers#update"]) {
@@ -282,6 +294,16 @@ - (void)mapView:(GMSMapView*)mapView didTapAtCoordinate:(CLLocationCoordinate2D)
   };
 }
 
+static NSDictionary* GMSCoordinateBoundsToJson(GMSCoordinateBounds* bounds) {
+  if (!bounds) {
+    return nil;
+  }
+  return @{
+    @"southwest" : LocationToJson([bounds southWest]),
+    @"northeast" : LocationToJson([bounds northEast]),
+  };
+}
+
 static float ToFloat(NSNumber* data) { return [FLTGoogleMapJsonConversions toFloat:data]; }
 
 static CLLocationCoordinate2D ToLocation(NSArray* data) {
diff --git a/packages/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/lib/src/controller.dart
index c16c8384fc85..93304a64f21c 100644
--- a/packages/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/lib/src/controller.dart
@@ -132,4 +132,17 @@ class GoogleMapController {
       'cameraUpdate': cameraUpdate._toJson(),
     });
   }
+
+  /// Return [LatLngBounds] defining the region that is visible in a map.
+  Future<LatLngBounds> getVisibleRegion() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    final Map<dynamic, dynamic> latLngBounds =
+        await channel.invokeMethod('map#getVisibleRegion');
+    final LatLng southwest = LatLng._fromJson(latLngBounds['southwest']);
+    final LatLng northeast = LatLng._fromJson(latLngBounds['northeast']);
+
+    return LatLngBounds(northeast: northeast, southwest: southwest);
+  }
 }
diff --git a/packages/google_maps_flutter/lib/src/location.dart b/packages/google_maps_flutter/lib/src/location.dart
index d59412e2137b..f0c6b623ab71 100644
--- a/packages/google_maps_flutter/lib/src/location.dart
+++ b/packages/google_maps_flutter/lib/src/location.dart
@@ -77,6 +77,24 @@ class LatLngBounds {
     return <dynamic>[southwest._toJson(), northeast._toJson()];
   }
 
+  /// Returns whether this rectangle contains the given [LatLng].
+  bool contains(LatLng point) {
+    return _containsLatitude(point.latitude) &&
+        _containsLongitude(point.longitude);
+  }
+
+  bool _containsLatitude(double lat) {
+    return (southwest.latitude <= lat) && (lat <= northeast.latitude);
+  }
+
+  bool _containsLongitude(double lng) {
+    if (southwest.longitude <= northeast.longitude) {
+      return southwest.longitude <= lng && lng <= northeast.longitude;
+    } else {
+      return southwest.longitude <= lng || lng <= northeast.longitude;
+    }
+  }
+
   @visibleForTesting
   static LatLngBounds fromList(dynamic json) {
     if (json == null) {
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 2c58dcdbed5a..06829ba61be1 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.3
+version: 0.5.4
 
 dependencies:
   flutter:

From 77edf4e51c0503dd4fba277f97d1cbc4e77df013 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Mon, 8 Apr 2019 14:05:37 -0700
Subject: [PATCH 309/410] remove white spaces (#1466)

---
 packages/cloud_firestore/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index cdad057548ce..4feb3324cdc3 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 0.9.13
 
-* Remove Gradle BoM to avoid Gradle version issues. 
+* Remove Gradle BoM to avoid Gradle version issues.
 
 ## 0.9.12
 

From 39e73f8c518cb5040cbd32b6e5c603e8795b734b Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Mon, 8 Apr 2019 14:12:20 -0700
Subject: [PATCH 310/410] remove blank line (#1467)

---
 packages/cloud_firestore/example/android/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cloud_firestore/example/android/settings.gradle b/packages/cloud_firestore/example/android/settings.gradle
index 115da6cb4f4d..6cb349eef1b6 100755
--- a/packages/cloud_firestore/example/android/settings.gradle
+++ b/packages/cloud_firestore/example/android/settings.gradle
@@ -12,4 +12,4 @@ plugins.each { name, path ->
     def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
     include ":$name"
     project(":$name").projectDir = pluginDirectory
-}
+}
\ No newline at end of file

From 7c1e8b8a921c0dd3bec6ce3738638ce9aa256d6b Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Mon, 8 Apr 2019 17:41:04 -0700
Subject: [PATCH 311/410] [in_app_purchase]make payment unified APIs (#1421)

Add unified APIs for making a payment.
Accompanying making a payment, also add finishPurchase and consumePurchase APIs.
Add a `purchaseUpdatedStream` in the `InAppPurchaseConnection` for user to listen for purchase updating events.
Update example app for make purchase functionalities.

flutter/flutter#26327
flutter/flutter#26328
flutter/flutter#26329
flutter/flutter#26331
---
 .../inapppurchase/InAppPurchasePlugin.java    |  22 ++
 .../InAppPurchasePluginTest.java              |  25 ++
 .../in_app_purchase/example/lib/main.dart     | 228 ++++++++++++----
 .../lib/in_app_purchase_connection.dart       |   1 +
 .../billing_client_wrapper.dart               |  36 ++-
 .../purchase_wrapper.dart                     |   4 +-
 .../app_store_connection.dart                 | 122 ++++++---
 .../google_play_connection.dart               | 101 ++++++-
 .../in_app_purchase_connection.dart           | 222 ++++++++--------
 .../product_details.dart                      |   2 +-
 .../purchase_details.dart                     | 181 +++++++++++++
 .../store_kit_wrappers/enum_converters.dart   |  16 ++
 .../sk_payment_transaction_wrappers.dart      |   8 +-
 .../billing_client_wrapper_test.dart          |  20 +-
 .../purchase_wrapper_test.dart                |   4 +-
 .../app_store_connection_test.dart            | 246 ++++++++++++++++--
 .../google_play_connection_test.dart          | 199 +++++++++++++-
 .../store_kit_wrappers/sk_product_test.dart   |   4 +-
 .../test/stub_in_app_purchase_platform.dart   |  18 +-
 19 files changed, 1197 insertions(+), 262 deletions(-)
 create mode 100644 packages/in_app_purchase/lib/src/in_app_purchase_connection/purchase_details.dart

diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
index a9f46e703f65..12792af4507e 100644
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
@@ -15,6 +15,7 @@
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClientStateListener;
 import com.android.billingclient.api.BillingFlowParams;
+import com.android.billingclient.api.ConsumeResponseListener;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.PurchaseHistoryResponseListener;
 import com.android.billingclient.api.PurchasesUpdatedListener;
@@ -54,6 +55,8 @@ static final class MethodNames {
     static final String QUERY_PURCHASES = "BillingClient#queryPurchases(String)";
     static final String QUERY_PURCHASE_HISTORY_ASYNC =
         "BillingClient#queryPurchaseHistoryAsync(String, PurchaseHistoryResponseListener)";
+    static final String CONSUME_PURCHASE_ASYNC =
+        "BillingClient#consumeAsync(String, ConsumeResponseListener)";
 
     private MethodNames() {};
   }
@@ -100,6 +103,9 @@ public void onMethodCall(MethodCall call, Result result) {
       case MethodNames.QUERY_PURCHASE_HISTORY_ASYNC:
         queryPurchaseHistoryAsync((String) call.argument("skuType"), result);
         break;
+      case MethodNames.CONSUME_PURCHASE_ASYNC:
+        consumeAsync((String) call.argument("purchaseToken"), result);
+        break;
       default:
         result.notImplemented();
     }
@@ -195,6 +201,22 @@ private void launchBillingFlow(String sku, @Nullable String accountId, Result re
     result.success(billingClient.launchBillingFlow(activity, paramsBuilder.build()));
   }
 
+  private void consumeAsync(String purchaseToken, final Result result) {
+    if (billingClientError(result)) {
+      return;
+    }
+
+    ConsumeResponseListener listener =
+        new ConsumeResponseListener() {
+          @Override
+          public void onConsumeResponse(
+              @BillingClient.BillingResponse int responseCode, String outToken) {
+            result.success(responseCode);
+          }
+        };
+    billingClient.consumeAsync(purchaseToken, listener);
+  }
+
   private void queryPurchases(String skuType, Result result) {
     if (billingClientError(result)) {
       return;
diff --git a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
index 582e277d2ce0..d3491e46a5e1 100644
--- a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
+++ b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
@@ -1,5 +1,6 @@
 package io.flutter.plugins.inapppurchase;
 
+import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.CONSUME_PURCHASE_ASYNC;
 import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.END_CONNECTION;
 import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.IS_READY;
 import static io.flutter.plugins.inapppurchase.InAppPurchasePlugin.MethodNames.LAUNCH_BILLING_FLOW;
@@ -33,6 +34,7 @@
 import com.android.billingclient.api.BillingClient.SkuType;
 import com.android.billingclient.api.BillingClientStateListener;
 import com.android.billingclient.api.BillingFlowParams;
+import com.android.billingclient.api.ConsumeResponseListener;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.Purchase.PurchasesResult;
 import com.android.billingclient.api.PurchaseHistoryResponseListener;
@@ -379,6 +381,29 @@ public void onPurchasesUpdatedListener() {
     assertEquals(fromPurchasesList(purchasesList), resultData.get("purchasesList"));
   }
 
+  @Test
+  public void consumeAsync() {
+    establishConnectedBillingClient(null, null);
+    ArgumentCaptor<BillingResponse> resultCaptor = ArgumentCaptor.forClass(BillingResponse.class);
+    int responseCode = BillingResponse.OK;
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("purchaseToken", "mockToken");
+    ArgumentCaptor<ConsumeResponseListener> listenerCaptor =
+        ArgumentCaptor.forClass(ConsumeResponseListener.class);
+
+    plugin.onMethodCall(new MethodCall(CONSUME_PURCHASE_ASYNC, arguments), result);
+
+    // Verify we pass the data to result
+    verify(mockBillingClient).consumeAsync(eq("mockToken"), listenerCaptor.capture());
+
+    listenerCaptor.getValue().onConsumeResponse(responseCode, "mockToken");
+    verify(result).success(resultCaptor.capture());
+
+    // Verify we pass the response code to result
+    verify(result, never()).error(any(), any(), any());
+    verify(result, times(1)).success(responseCode);
+  }
+
   private void establishConnectedBillingClient(
       @Nullable Map<String, Integer> arguments, @Nullable Result result) {
     if (arguments == null) {
diff --git a/packages/in_app_purchase/example/lib/main.dart b/packages/in_app_purchase/example/lib/main.dart
index 02bc7d448240..2ac2872a5361 100644
--- a/packages/in_app_purchase/example/lib/main.dart
+++ b/packages/in_app_purchase/example/lib/main.dart
@@ -3,10 +3,16 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:in_app_purchase/in_app_purchase_connection.dart';
 
-void main() => runApp(MyApp());
+void main() {
+  runApp(MyApp());
+}
+
+// Switch this to true if you want to try out auto consume when buying a consumable.
+const bool kAutoConsume = false;
 
 const List<String> _kProductIds = <String>[
   'consumable',
@@ -20,54 +26,93 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> {
+  StreamSubscription<List<PurchaseDetails>> _subscription;
+
+  bool _purchasePending = false;
   @override
   void initState() {
+    Stream purchaseUpdated =
+        InAppPurchaseConnection.instance.purchaseUpdatedStream;
+    _subscription = purchaseUpdated.listen((purchaseDetailsList) {
+      _listenToPurchaseUpdated(purchaseDetailsList);
+    }, onDone: () {
+      _subscription.cancel();
+    }, onError: (error) {
+      // handle error here.
+    });
     super.initState();
   }
 
+  @override
+  void dispose() {
+    _subscription.cancel();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
+    List<Widget> stack = [];
+    stack.add(
+      ListView(
+        children: [
+          FutureBuilder(
+            future: _buildConnectionCheckTile(),
+            builder: (BuildContext context, AsyncSnapshot snapshot) {
+              if (snapshot.error != null) {
+                return buildListCard(ListTile(
+                    title: Text(
+                        'Error connecting: ' + snapshot.error.toString())));
+              } else if (!snapshot.hasData) {
+                return Card(
+                    child: ListTile(title: const Text('Trying to connect...')));
+              }
+              return snapshot.data;
+            },
+          ),
+          FutureBuilder(
+            future: _buildProductList(),
+            builder: (BuildContext context, AsyncSnapshot snapshot) {
+              if (snapshot.error != null) {
+                return Center(
+                  child: buildListCard(ListTile(
+                      title:
+                          Text('Error fetching products ${snapshot.error}'))),
+                );
+              } else if (!snapshot.hasData) {
+                return Card(
+                    child: (ListTile(
+                        leading: CircularProgressIndicator(),
+                        title: Text('Fetching products...'))));
+              }
+              return snapshot.data;
+            },
+          ),
+        ],
+      ),
+    );
+    if (_purchasePending) {
+      stack.add(
+        Stack(
+          children: [
+            new Opacity(
+              opacity: 0.3,
+              child: const ModalBarrier(dismissible: false, color: Colors.grey),
+            ),
+            new Center(
+              child: new CircularProgressIndicator(),
+            ),
+          ],
+        ),
+      );
+    }
+
     return MaterialApp(
       home: Scaffold(
         appBar: AppBar(
           title: const Text('IAP Example'),
         ),
-        body: ListView(
-          children: [
-            FutureBuilder(
-              future: _buildConnectionCheckTile(),
-              builder: (BuildContext context, AsyncSnapshot snapshot) {
-                if (snapshot.error != null) {
-                  return buildListCard(ListTile(
-                      title: Text(
-                          'Error connecting: ' + snapshot.error.toString())));
-                } else if (!snapshot.hasData) {
-                  return Card(
-                      child:
-                          ListTile(title: const Text('Trying to connect...')));
-                }
-                return snapshot.data;
-              },
-            ),
-            FutureBuilder(
-              future: _buildProductList(),
-              builder: (BuildContext context, AsyncSnapshot snapshot) {
-                if (snapshot.error != null) {
-                  print(snapshot.error);
-                  return Center(
-                    child: buildListCard(
-                        ListTile(title: Text('Error fetching products'))),
-                  );
-                } else if (!snapshot.hasData) {
-                  return Card(
-                      child: (ListTile(
-                          leading: CircularProgressIndicator(),
-                          title: Text('Fetching products...'))));
-                }
-                return snapshot.data;
-              },
-            ),
-          ],
+        body: Stack(
+          children: stack,
         ),
       ),
     );
@@ -120,26 +165,48 @@ class _MyAppState extends State<MyApp> {
     // This loading previous purchases code is just a demo. Please do not use this as it is.
     // In your app you should always verify the purchase data using the `verificationData` inside the [PurchaseDetails] object before trusting it.
     // We recommend that you use your own server to verity the purchase data.
-    Map<String, PurchaseDetails> purchases = Map.fromEntries(((await connection
-                .queryPastPurchases())
-            .pastPurchases)
-        .map((PurchaseDetails purchase) =>
-            MapEntry<String, PurchaseDetails>(purchase.productId, purchase)));
-
+    Map<String, PurchaseDetails> purchases = Map.fromEntries(
+        ((await connection.queryPastPurchases()).pastPurchases)
+            .map((PurchaseDetails purchase) {
+      if (Platform.isIOS) {
+        InAppPurchaseConnection.instance.completePurchase(purchase);
+      }
+      if (Platform.isAndroid && purchase.productID == 'consumable') {
+        InAppPurchaseConnection.instance.consumePurchase(purchase);
+      }
+      return MapEntry<String, PurchaseDetails>(purchase.productID, purchase);
+    }));
     productList.addAll(response.productDetails.map(
       (ProductDetails productDetails) {
         PurchaseDetails previousPurchase = purchases[productDetails.id];
         return ListTile(
-          title: Text(
-            productDetails.title,
-          ),
-          subtitle: Text(
-            productDetails.description,
-          ),
-          trailing: previousPurchase != null
-              ? Icon(Icons.check)
-              : Text(productDetails.price),
-        );
+            title: Text(
+              productDetails.title,
+            ),
+            subtitle: Text(
+              productDetails.description,
+            ),
+            trailing: previousPurchase != null
+                ? Icon(Icons.check)
+                : FlatButton(
+                    child: Text(productDetails.price),
+                    color: Colors.green[800],
+                    textColor: Colors.white,
+                    onPressed: () {
+                      PurchaseParam purchaseParam = PurchaseParam(
+                          productDetails: productDetails,
+                          applicationUserName: null,
+                          sandboxTesting: true);
+                      if (productDetails.id == 'consumable') {
+                        connection.buyConsumable(
+                            purchaseParam: purchaseParam,
+                            autoConsume: kAutoConsume || Platform.isIOS);
+                      } else {
+                        connection.buyNonConsumable(
+                            purchaseParam: purchaseParam);
+                      }
+                    },
+                  ));
       },
     ));
 
@@ -148,6 +215,61 @@ class _MyAppState extends State<MyApp> {
             Column(children: <Widget>[productHeader, Divider()] + productList));
   }
 
+  void showPendingUI() {
+    setState(() {
+      _purchasePending = true;
+    });
+  }
+
+  void deliverProduct(PurchaseDetails purchaseDetails) {
+    // IMPORTANT!! Always verify a purchase purchase details before deliver the product.
+    setState(() {
+      _purchasePending = false;
+    });
+  }
+
+  void handleError(PurchaseError error) {
+    setState(() {
+      _purchasePending = false;
+    });
+  }
+
+  Future<bool> _verifyPurchase(PurchaseDetails purchaseDetails) {
+    // IMPORTANT!! Always verify a purchase before delivering the product.
+    // For the purpose of an example, we directly return true.
+    return Future<bool>.value(true);
+  }
+
+  void _handleInvalidPurchase(PurchaseDetails purchaseDetails) {
+    // handle invalid purchase here if  _verifyPurchase` failed.
+  }
+
   static ListTile buildListCard(ListTile innerTile) =>
       ListTile(title: Card(child: innerTile));
+
+  void _listenToPurchaseUpdated(List<PurchaseDetails> purchaseDetailsList) {
+    purchaseDetailsList.forEach((PurchaseDetails purchaseDetails) async {
+      if (purchaseDetails.status == PurchaseStatus.pending) {
+        showPendingUI();
+      } else {
+        if (purchaseDetails.status == PurchaseStatus.error) {
+          handleError(purchaseDetails.error);
+        } else if (purchaseDetails.status == PurchaseStatus.purchased) {
+          bool valid = await _verifyPurchase(purchaseDetails);
+          if (valid) {
+            deliverProduct(purchaseDetails);
+          } else {
+            _handleInvalidPurchase(purchaseDetails);
+          }
+        }
+        if (Platform.isIOS) {
+          InAppPurchaseConnection.instance.completePurchase(purchaseDetails);
+        } else if (Platform.isAndroid) {
+          if (!kAutoConsume && purchaseDetails.productID == 'consumable') {
+            InAppPurchaseConnection.instance.consumePurchase(purchaseDetails);
+          }
+        }
+      }
+    });
+  }
 }
diff --git a/packages/in_app_purchase/lib/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/in_app_purchase_connection.dart
index 121038536996..52010e2441d2 100644
--- a/packages/in_app_purchase/lib/in_app_purchase_connection.dart
+++ b/packages/in_app_purchase/lib/in_app_purchase_connection.dart
@@ -4,3 +4,4 @@
 
 export 'src/in_app_purchase_connection/in_app_purchase_connection.dart';
 export 'src/in_app_purchase_connection/product_details.dart';
+export 'src/in_app_purchase_connection/purchase_details.dart';
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
index da1915f8e6c6..501a34f504c1 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
@@ -11,7 +11,8 @@ import 'purchase_wrapper.dart';
 import 'sku_details_wrapper.dart';
 import 'enum_converters.dart';
 
-const String _kOnPurchasesUpdated =
+@visibleForTesting
+const String kOnPurchasesUpdated =
     'PurchasesUpdatedListener#onPurchasesUpdated(int, List<Purchase>)';
 const String _kOnBillingServiceDisconnected =
     'BillingClientStateListener#onBillingServiceDisconnected()';
@@ -49,8 +50,8 @@ typedef void PurchasesUpdatedListener(PurchasesResultWrapper purchasesResult);
 class BillingClient {
   BillingClient(PurchasesUpdatedListener onPurchasesUpdated) {
     assert(onPurchasesUpdated != null);
-    channel.setMethodCallHandler(_callHandler);
-    _callbacks[_kOnPurchasesUpdated] = [onPurchasesUpdated];
+    channel.setMethodCallHandler(callHandler);
+    _callbacks[kOnPurchasesUpdated] = [onPurchasesUpdated];
   }
 
   // Occasionally methods in the native layer require a Dart callback to be
@@ -146,10 +147,10 @@ class BillingClient {
   /// and [the given
   /// accountId](https://developer.android.com/reference/com/android/billingclient/api/BillingFlowParams.Builder.html#setAccountId(java.lang.String)).
   Future<BillingResponse> launchBillingFlow(
-      {@required SkuDetailsWrapper skuDetails, String accountId}) async {
-    assert(skuDetails != null);
+      {@required String sku, String accountId}) async {
+    assert(sku != null);
     final Map<String, dynamic> arguments = <String, dynamic>{
-      'sku': skuDetails.sku,
+      'sku': sku,
       'accountId': accountId,
     };
     return BillingResponseConverter().fromJson(await channel.invokeMethod(
@@ -194,13 +195,28 @@ class BillingClient {
         <String, dynamic>{'skuType': SkuTypeConverter().toJson(skuType)}));
   }
 
-  Future<void> _callHandler(MethodCall call) async {
+  /// Consumes a given in-app product.
+  ///
+  /// Consuming can only be done on an item that's owned, and as a result of consumption, the user will no longer own it.
+  /// Consumption is done asynchronously. The method returns a Future containing a [BillingResponse].
+  ///
+  /// This wraps [`BillingClient#consumeAsync(String, ConsumeResponseListener)`](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.html#consumeAsync(java.lang.String,%20com.android.billingclient.api.ConsumeResponseListener))
+  Future<BillingResponse> consumeAsync(String purchaseToken) async {
+    assert(purchaseToken != null);
+    return BillingResponseConverter().fromJson(await channel.invokeMethod(
+      'BillingClient#consumeAsync(String, ConsumeResponseListener)',
+      <String, String>{'purchaseToken': purchaseToken},
+    ));
+  }
+
+  @visibleForTesting
+  Future<void> callHandler(MethodCall call) async {
     switch (call.method) {
-      case _kOnPurchasesUpdated:
+      case kOnPurchasesUpdated:
         // The purchases updated listener is a singleton.
-        assert(_callbacks[_kOnPurchasesUpdated].length == 1);
+        assert(_callbacks[kOnPurchasesUpdated].length == 1);
         final PurchasesUpdatedListener listener =
-            _callbacks[_kOnPurchasesUpdated].first;
+            _callbacks[kOnPurchasesUpdated].first;
         listener(PurchasesResultWrapper.fromJson(call.arguments));
         break;
       case _kOnBillingServiceDisconnected:
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
index 847ad80e0915..767d75d9714b 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
@@ -4,8 +4,8 @@
 
 import 'dart:ui' show hashValues;
 import 'package:flutter/foundation.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/in_app_purchase_connection.dart';
 import 'enum_converters.dart';
 import 'billing_client_wrapper.dart';
 
@@ -97,7 +97,7 @@ class PurchaseWrapper {
   PurchaseDetails toPurchaseDetails() {
     return PurchaseDetails(
       purchaseID: orderId,
-      productId: sku,
+      productID: sku,
       verificationData: PurchaseVerificationData(
           localVerificationData: originalJson,
           serverVerificationData: purchaseToken,
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
index d7f431fa3a0a..03f551d631f5 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
@@ -5,10 +5,13 @@
 import 'dart:async';
 
 import 'package:flutter/foundation.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
 
 import 'in_app_purchase_connection.dart';
 import 'product_details.dart';
 import 'package:in_app_purchase/store_kit_wrappers.dart';
+import 'package:in_app_purchase/src/store_kit_wrappers/enum_converters.dart';
+import '../../billing_client_wrappers.dart';
 
 /// An [InAppPurchaseConnection] that wraps StoreKit.
 ///
@@ -20,6 +23,9 @@ class AppStoreConnection implements InAppPurchaseConnection {
   static SKPaymentQueueWrapper _skPaymentQueueWrapper;
   static _TransactionObserver _observer;
 
+  Stream<List<PurchaseDetails>> get purchaseUpdatedStream =>
+      _observer.purchaseUpdatedController.stream;
+
   static SKTransactionObserverWrapper get observer => _observer;
 
   static AppStoreConnection _getOrCreateInstance() {
@@ -29,7 +35,7 @@ class AppStoreConnection implements InAppPurchaseConnection {
 
     _instance = AppStoreConnection();
     _skPaymentQueueWrapper = SKPaymentQueueWrapper();
-    _observer = _TransactionObserver();
+    _observer = _TransactionObserver(StreamController.broadcast());
     _skPaymentQueueWrapper.setTransactionObserver(observer);
     return _instance;
   }
@@ -37,6 +43,34 @@ class AppStoreConnection implements InAppPurchaseConnection {
   @override
   Future<bool> isAvailable() => SKPaymentQueueWrapper.canMakePayments();
 
+  @override
+  void buyNonConsumable({@required PurchaseParam purchaseParam}) {
+    _skPaymentQueueWrapper.addPayment(SKPaymentWrapper(
+        productIdentifier: purchaseParam.productDetails.id,
+        quantity: 1,
+        applicationUsername: purchaseParam.applicationUserName,
+        simulatesAskToBuyInSandbox: purchaseParam.sandboxTesting,
+        requestData: null));
+  }
+
+  @override
+  void buyConsumable(
+      {@required PurchaseParam purchaseParam, bool autoConsume = true}) {
+    assert(autoConsume == true, 'On iOS, we should always auto consume');
+    buyNonConsumable(purchaseParam: purchaseParam);
+  }
+
+  @override
+  Future<void> completePurchase(PurchaseDetails purchase) {
+    return _skPaymentQueueWrapper
+        .finishTransaction(purchase.skPaymentTransaction);
+  }
+
+  @override
+  Future<BillingResponse> consumePurchase(PurchaseDetails purchase) {
+    throw UnsupportedError('consume purchase is not available on Android');
+  }
+
   @override
   Future<QueryPurchaseDetailsResponse> queryPastPurchases(
       {String applicationUserName}) async {
@@ -44,23 +78,27 @@ class AppStoreConnection implements InAppPurchaseConnection {
     List<PurchaseDetails> pastPurchases = [];
 
     try {
-      String receiptData;
-      try {
-        receiptData = await SKReceiptManager.retrieveReceiptData();
-      } catch (e) {
-        receiptData = null;
-      }
+      String receiptData = await _observer.getReceiptData();
       final List<SKPaymentTransactionWrapper> restoredTransactions =
           await _observer.getRestoredTransactions(
               queue: _skPaymentQueueWrapper,
               applicationUserName: applicationUserName);
       _observer.cleanUpRestoredTransactions();
-      if (restoredTransactions != null) {
-        pastPurchases = restoredTransactions
-            .map((SKPaymentTransactionWrapper wrapper) =>
-                wrapper.toPurchaseDetails(receiptData))
-            .toList();
-      }
+      pastPurchases =
+          restoredTransactions.map((SKPaymentTransactionWrapper transaction) {
+        assert(transaction.transactionState ==
+            SKPaymentTransactionStateWrapper.restored);
+        return transaction.toPurchaseDetails(receiptData)
+          ..status = SKTransactionStatusConverter()
+              .toPurchaseStatus(transaction.transactionState)
+          ..error = transaction.error != null
+              ? PurchaseError(
+                  source: PurchaseSource.AppStore,
+                  code: kPurchaseErrorCode,
+                  message: transaction.error.userInfo,
+                )
+              : null;
+      }).toList();
     } catch (e) {
       error = PurchaseError(
           source: PurchaseSource.AppStore, code: e.domain, message: e.userInfo);
@@ -84,6 +122,7 @@ class AppStoreConnection implements InAppPurchaseConnection {
   /// This method only returns [ProductDetailsResponse].
   /// To get detailed Store Kit product list, use [SkProductResponseWrapper.startProductRequest]
   /// to get the [SKProductResponseWrapper].
+  @override
   Future<ProductDetailsResponse> queryProductDetails(
       Set<String> identifiers) async {
     final SKRequestMaker requestMaker = SKRequestMaker();
@@ -102,8 +141,13 @@ class AppStoreConnection implements InAppPurchaseConnection {
 }
 
 class _TransactionObserver implements SKTransactionObserverWrapper {
+  final StreamController<List<PurchaseDetails>> purchaseUpdatedController;
+
   Completer<List<SKPaymentTransactionWrapper>> _restoreCompleter;
   List<SKPaymentTransactionWrapper> _restoredTransactions;
+  String _receiptData;
+
+  _TransactionObserver(this.purchaseUpdatedController);
 
   Future<List<SKPaymentTransactionWrapper>> getRestoredTransactions(
       {@required SKPaymentQueueWrapper queue, String applicationUserName}) {
@@ -118,22 +162,39 @@ class _TransactionObserver implements SKTransactionObserverWrapper {
     _restoreCompleter = null;
   }
 
-  /// Triggered when any transactions are updated.
-  void updatedTransactions({List<SKPaymentTransactionWrapper> transactions}) {
+  void updatedTransactions(
+      {List<SKPaymentTransactionWrapper> transactions}) async {
     if (_restoreCompleter != null) {
       if (_restoredTransactions == null) {
         _restoredTransactions = [];
       }
-      _restoredTransactions.addAll(transactions
-          .where((SKPaymentTransactionWrapper wrapper) {
+      _restoredTransactions
+          .addAll(transactions.where((SKPaymentTransactionWrapper wrapper) {
         return wrapper.transactionState ==
             SKPaymentTransactionStateWrapper.restored;
-      }).map((SKPaymentTransactionWrapper wrapper) =>
-              wrapper.originalTransaction));
+      }).map((SKPaymentTransactionWrapper wrapper) => wrapper));
+      return;
     }
+
+    String receiptData = await getReceiptData();
+    purchaseUpdatedController
+        .add(transactions.map((SKPaymentTransactionWrapper transaction) {
+      PurchaseDetails purchaseDetails = transaction.toPurchaseDetails(
+        receiptData,
+      )
+        ..status = SKTransactionStatusConverter()
+            .toPurchaseStatus(transaction.transactionState)
+        ..error = transaction.error != null
+            ? PurchaseError(
+                source: PurchaseSource.AppStore,
+                code: kPurchaseErrorCode,
+                message: transaction.error.userInfo,
+              )
+            : null;
+      return purchaseDetails;
+    }).toList());
   }
 
-  /// Triggered when any transactions are removed from the payment queue.
   void removedTransactions({List<SKPaymentTransactionWrapper> transactions}) {}
 
   /// Triggered when there is an error while restoring transactions.
@@ -141,23 +202,24 @@ class _TransactionObserver implements SKTransactionObserverWrapper {
     _restoreCompleter.completeError(error);
   }
 
-  /// Triggered when payment queue has finished sending restored transactions.
   void paymentQueueRestoreCompletedTransactionsFinished() {
-    _restoreCompleter.complete(_restoredTransactions);
+    _restoreCompleter.complete(_restoredTransactions ?? []);
   }
 
-  /// Triggered when any download objects are updated.
   void updatedDownloads({List<SKDownloadWrapper> downloads}) {}
 
-  /// Triggered when a user initiated an in-app purchase from App Store.
-  ///
-  /// Return `true` to continue the transaction in your app. If you have multiple [SKTransactionObserverWrapper]s, the transaction
-  /// will continue if one [SKTransactionObserverWrapper] has [shouldAddStorePayment] returning `true`.
-  /// Return `false` to defer or cancel the transaction. For example, you may need to defer a transaction if the user is in the middle of onboarding.
-  /// You can also continue the transaction later by calling
-  /// [addPayment] with the [SKPaymentWrapper] object you get from this method.
   bool shouldAddStorePayment(
       {SKPaymentWrapper payment, SKProductWrapper product}) {
+    // In this unified API, we always return true to keep it consistent with the behavior on Google Play.
     return true;
   }
+
+  Future<String> getReceiptData() async {
+    try {
+      _receiptData = await SKReceiptManager.retrieveReceiptData();
+    } catch (e) {
+      _receiptData = null;
+    }
+    return _receiptData;
+  }
 }
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
index cbdfef2bbde0..2760647375ed 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
@@ -5,6 +5,7 @@
 import 'dart:async';
 
 import 'package:flutter/widgets.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
 import '../../billing_client_wrappers.dart';
 import 'in_app_purchase_connection.dart';
 import 'product_details.dart';
@@ -17,29 +18,70 @@ class GooglePlayConnection
     with WidgetsBindingObserver
     implements InAppPurchaseConnection {
   GooglePlayConnection._()
-      : _billingClient = BillingClient((PurchasesResultWrapper _) {
-          // TODO(mklim): wire this in to the generic interface
+      : billingClient = BillingClient((PurchasesResultWrapper resultWrapper) {
+          _purchaseUpdatedController
+              .add(_getPurchaseDetailsFromResult(resultWrapper));
         }) {
     _readyFuture = _connect();
     WidgetsBinding.instance.addObserver(this);
+    _purchaseUpdatedController = StreamController.broadcast();
+    ;
   }
   static GooglePlayConnection get instance => _getOrCreateInstance();
   static GooglePlayConnection _instance;
-  final BillingClient _billingClient;
+
+  Stream<List<PurchaseDetails>> get purchaseUpdatedStream =>
+      _purchaseUpdatedController.stream;
+  static StreamController<List<PurchaseDetails>> _purchaseUpdatedController;
+
+  @visibleForTesting
+  final BillingClient billingClient;
+
   Future<void> _readyFuture;
+  static Set<String> _productIDsToConsume;
 
   @override
   Future<bool> isAvailable() async {
     await _readyFuture;
-    return _billingClient.isReady();
+    return billingClient.isReady();
+  }
+
+  @override
+  void buyNonConsumable({@required PurchaseParam purchaseParam}) {
+    billingClient.launchBillingFlow(
+        sku: purchaseParam.productDetails.id,
+        accountId: purchaseParam.applicationUserName);
+  }
+
+  @override
+  void buyConsumable(
+      {@required PurchaseParam purchaseParam, bool autoConsume = true}) {
+    if (autoConsume == true) {
+      if (_productIDsToConsume == null) {
+        _productIDsToConsume = Set<String>();
+        _productIDsToConsume.add(purchaseParam.productDetails.id);
+      }
+    }
+    buyNonConsumable(purchaseParam: purchaseParam);
+  }
+
+  @override
+  Future<void> completePurchase(PurchaseDetails purchase) {
+    throw UnsupportedError('complete purchase is not available on Android');
+  }
+
+  @override
+  Future<BillingResponse> consumePurchase(PurchaseDetails purchase) {
+    return billingClient
+        .consumeAsync(purchase.verificationData.serverVerificationData);
   }
 
   @override
   Future<QueryPurchaseDetailsResponse> queryPastPurchases(
       {String applicationUserName}) async {
     final List<PurchasesResultWrapper> responses = await Future.wait([
-      _billingClient.queryPurchaseHistory(SkuType.inapp),
-      _billingClient.queryPurchaseHistory(SkuType.subs)
+      billingClient.queryPurchaseHistory(SkuType.inapp),
+      billingClient.queryPurchaseHistory(SkuType.subs)
     ]);
 
     Set errorCodeSet = responses
@@ -64,7 +106,7 @@ class GooglePlayConnection
       error: errorMessage != null
           ? PurchaseError(
               source: PurchaseSource.GooglePlay,
-              code: 'restore_transactions_failed',
+              code: kRestoredPurchaseErrorCode,
               message: {'message': errorMessage})
           : null,
     );
@@ -72,7 +114,7 @@ class GooglePlayConnection
 
   @override
   Future<PurchaseVerificationData> refreshPurchaseVerificationData() async {
-    throw Exception(
+    throw UnsupportedError(
         'The method <refreshPurchaseVerificationData> only works on iOS.');
   }
 
@@ -101,10 +143,14 @@ class GooglePlayConnection
     return _instance;
   }
 
+  static _consume(PurchaseDetails purchase) {
+    instance.consumePurchase(purchase);
+  }
+
   Future<void> _connect() =>
-      _billingClient.startConnection(onBillingServiceDisconnected: () {});
+      billingClient.startConnection(onBillingServiceDisconnected: () {});
 
-  Future<void> _disconnect() => _billingClient.endConnection();
+  Future<void> _disconnect() => billingClient.endConnection();
 
   /// Query the product detail list.
   ///
@@ -114,9 +160,9 @@ class GooglePlayConnection
   Future<ProductDetailsResponse> queryProductDetails(
       Set<String> identifiers) async {
     List<SkuDetailsResponseWrapper> responses = await Future.wait([
-      _billingClient.querySkuDetails(
+      billingClient.querySkuDetails(
           skuType: SkuType.inapp, skusList: identifiers.toList()),
-      _billingClient.querySkuDetails(
+      billingClient.querySkuDetails(
           skuType: SkuType.subs, skusList: identifiers.toList())
     ]);
     List<ProductDetails> productDetails =
@@ -132,4 +178,35 @@ class GooglePlayConnection
     return ProductDetailsResponse(
         productDetails: productDetails, notFoundIDs: notFoundIDS);
   }
+
+  static List<PurchaseDetails> _getPurchaseDetailsFromResult(
+      PurchasesResultWrapper resultWrapper) {
+    return resultWrapper.purchasesList.map(
+      (PurchaseWrapper purchase) {
+        PurchaseError error = null;
+        if (resultWrapper.responseCode != BillingResponse.ok) {
+          error = PurchaseError(
+            source: PurchaseSource.GooglePlay,
+            code: kRestoredPurchaseErrorCode,
+            message: {'message': resultWrapper.responseCode.toString()},
+          );
+        }
+        PurchaseDetails purchaseDetails = purchase.toPurchaseDetails()
+          ..status = resultWrapper.responseCode == BillingResponse.ok
+              ? PurchaseStatus.purchased
+              : PurchaseStatus.error
+          ..error = error;
+        // auto consume logic for buyConsumable.
+        if (_productIDsToConsume != null &&
+            _productIDsToConsume.contains(purchaseDetails.productID)) {
+          _consume(purchaseDetails);
+          _productIDsToConsume.remove(purchaseDetails.productID);
+          if (_productIDsToConsume.isEmpty) {
+            _productIDsToConsume = null;
+          }
+        }
+        return purchaseDetails;
+      },
+    ).toList();
+  }
 }
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
index b990bb342f19..3adcd7699f01 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
@@ -8,150 +8,138 @@ import 'app_store_connection.dart';
 import 'google_play_connection.dart';
 import 'product_details.dart';
 import 'package:flutter/foundation.dart';
-import 'package:in_app_purchase/store_kit_wrappers.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
+import './purchase_details.dart';
 
-/// Represents the data that is used to verify purchases.
-///
-/// The property [source] helps you to determine the method to verify purchases.
-/// Different source of purchase has different methods of verifying purchases.
-///
-/// Both platforms have 2 ways to verify purchase data. You can either choose to verify the data locally using [localVerificationData]
-/// or verify the data using your own server with [serverVerificationData].
-///
-/// For details on how to verify your purchase on iOS,
-/// you can refer to Apple's document about [`About Receipt Validation`](https://developer.apple.com/library/archive/releasenotes/General/ValidateAppStoreReceipt/Introduction.html#//apple_ref/doc/uid/TP40010573-CH105-SW1).
-///
-/// On Android, all purchase information should also be verified manually. See [`Verify a purchase`](https://developer.android.com/google/play/billing/billing_library_overview#Verify).
-///
-/// It is preferable to verify purchases using a server with [serverVerificationData].
-///
-/// If the platform is iOS, it is possible the data can be null or your validation of this data turns out invalid. When this happens,
-/// Call [InAppPurchaseConnection.refreshPurchaseVerificationData] to get a new [PurchaseVerificationData] object. And then you can
-/// validate the receipt data again using one of the methods mentioned in [`Receipt Validation`](https://developer.apple.com/library/archive/releasenotes/General/ValidateAppStoreReceipt/Introduction.html#//apple_ref/doc/uid/TP40010573-CH105-SW1).
-///
-/// You should never use any purchase data until verified.
-class PurchaseVerificationData {
-  /// The data used for local verification.
-  ///
-  /// If the [source] is [PurchaseSource.AppStore], this data is a based64 encoded string. The structure of the payload is defined using ASN.1.
-  /// If the [source] is [PurchaseSource.GooglePlay], this data is a JSON String.
-  final String localVerificationData;
-
-  /// The data used for server verification.
-  ///
-  /// If the platform is iOS, this data is identical to [localVerificationData].
-  final String serverVerificationData;
-
-  /// Indicates the source of the purchase.
-  final PurchaseSource source;
-
-  PurchaseVerificationData(
-      {@required this.localVerificationData,
-      @required this.serverVerificationData,
-      @required this.source});
-}
-
-/// Which platform the purchase is on.
-enum PurchaseSource { GooglePlay, AppStore }
-
-/// Error of a purchase process.
-///
-/// The error can happen during the purchase, or restoring a purchase.
-/// Errors from restoring a purchase are not indicative of any errors during the original purchase.
-class PurchaseError {
-  PurchaseError(
-      {@required this.source, @required this.code, @required this.message});
+/// Basic generic API for making in app purchases across multiple platforms.
+abstract class InAppPurchaseConnection {
+  /// Listen to this broadcast stream to get real time update for purchases.
+  ///
+  /// This stream would never close when the APP is active.
+  ///
+  /// Purchase updates can happen in several situations:
+  /// * When a purchase is triggered by user in the APP.
+  /// * When a purchase is triggered by user from App Store or Google Play.
+  /// * If a purchase is not completed([completePurchase] is not called on the purchase object) from the last APP session. Purchase updates will happen when a new APP session starts.
+  ///
+  /// IMPORTANT! To Avoid losing information on purchase updates, You should listen to this stream as soon as your APP launches, preferably before returning your main App Widget in main().
+  /// We recommend to have a single subscription listening to the stream at a given time. If you choose to have multiple subscription at the same time, you should be careful at the fact that each subscription will receive all the events after they start to listen.
+  Stream<List<PurchaseDetails>> get purchaseUpdatedStream => _getStream();
 
-  /// Which source is the error on.
-  final PurchaseSource source;
+  Stream<List<PurchaseDetails>> _purchaseUpdatedStream;
 
-  /// The error code.
-  final String code;
+  Stream<List<PurchaseDetails>> _getStream() {
+    if (_purchaseUpdatedStream != null) {
+      return _purchaseUpdatedStream;
+    }
 
-  /// A map containing the detailed error message.
-  final Map<String, dynamic> message;
-}
+    if (Platform.isAndroid) {
+      _purchaseUpdatedStream =
+          GooglePlayConnection.instance.purchaseUpdatedStream;
+    } else if (Platform.isIOS) {
+      _purchaseUpdatedStream =
+          AppStoreConnection.instance.purchaseUpdatedStream;
+    } else {
+      throw UnsupportedError(
+          'InAppPurchase plugin only works on Android and iOS.');
+    }
+    return _purchaseUpdatedStream;
+  }
 
-/// Represents the transaction details of a purchase.
-///
-/// This class unifies the BillingClient's [PurchaseWrapper] and StoreKit's [SKPaymentTransactionWrapper]. You can use the common attributes in
-/// This class for simple operations. If you would like to see the detailed representation of the product, instead,  use [PurchaseWrapper] on Android and [SKPaymentTransactionWrapper] on iOS.
-class PurchaseDetails {
-  /// A unique identifier of the purchase.
-  final String purchaseID;
+  /// Returns true if the payment platform is ready and available.
+  Future<bool> isAvailable();
 
-  /// The product identifier of the purchase.
-  final String productId;
+  /// Query product details list that match the given set of identifiers.
+  Future<ProductDetailsResponse> queryProductDetails(Set<String> identifiers);
 
-  /// The verification data of the purchase.
+  /// Buy a non consumable product or subscription.
   ///
-  /// Use this to verify the purchase. See [PurchaseVerificationData] for details on how to verify purchase use this data.
-  /// You should never use any purchase data until verified.
-  final PurchaseVerificationData verificationData;
-
-  /// The timestamp of the transaction.
+  /// Non consumable items are the items that user can only buy once, for example, a purchase that unlocks a special content in your APP.
+  /// Subscriptions are also non consumable products.
   ///
-  /// Milliseconds since epoch.
-  final String transactionDate;
-
-  /// Points back to the `StoreKits`'s [SKPaymentTransactionWrapper] object that generated this [PurchaseDetails] object.
+  /// You need to restore all the non consumable products for user when they switch their phones.
   ///
-  /// This is null on Android.
-  final SKPaymentTransactionWrapper skPaymentTransaction;
-
-  /// Points back to the `BillingClient`'s [PurchaseWrapper] object that generated this [PurchaseDetails] object.
+  /// On iOS, you can define your product as a non consumable items in the [App Store Connect](https://appstoreconnect.apple.com/login).
+  /// Unfortunately, [Google Play Console](https://play.google.com/) defaults all the products as non consumable. You have to consume the consumable items manually calling [consumePurchase].
   ///
-  /// This is null on Android.
-  final PurchaseWrapper billingClientPurchase;
-
-  PurchaseDetails({
-    @required this.purchaseID,
-    @required this.productId,
-    @required this.verificationData,
-    @required this.transactionDate,
-    this.skPaymentTransaction = null,
-    this.billingClientPurchase = null,
-  });
-}
-
-/// The response object for fetching the past purchases.
-///
-/// An instance of this class is returned in [InAppPurchaseConnection.queryPastPurchases].
-class QueryPurchaseDetailsResponse {
-  QueryPurchaseDetailsResponse({@required this.pastPurchases, this.error});
-
-  /// A list of successfully fetched past purchases.
+  /// This method does not return anything. Instead, after triggering this method, purchase updates will be sent to [purchaseUpdatedStream].
+  /// You should [Stream.listen] to [purchaseUpdatedStream] to get [PurchaseDetails] objects in different [PurchaseDetails.status] and
+  /// update your UI accordingly. When the [PurchaseDetails.status] is [PurchaseStatus.purchased] or [PurchaseStatus.error], you should deliver the content or handle the error, then call
+  /// [completePurchase] to finish the purchasing process.
+  ///
+  /// You can find more details on testing payments on iOS [here](https://developer.apple.com/library/archive/documentation/NetworkingInternet/Conceptual/StoreKitGuide/Chapters/ShowUI.html#//apple_ref/doc/uid/TP40008267-CH3-SW11).
+  /// You can find more details on testing payments on Android [here](https://developer.android.com/google/play/billing/billing_testing).
+  ///
+  /// See also:
   ///
-  /// If there are no past purchases, or there is an [error] fetching past purchases,
-  /// this variable is an empty List.
-  /// You should verify the purchase data using [PurchaseDetails.verificationData] before using the [PurchaseDetails] object.
-  final List<PurchaseDetails> pastPurchases;
+  ///  * [buyConsumable], for buying a consumable product.
+  ///  * [queryPastPurchases], for restoring non consumable products.
+  ///
+  /// Calling this method for consumable items will cause unwanted behaviors!
+  void buyNonConsumable({@required PurchaseParam purchaseParam});
 
-  /// The error when fetching past purchases.
+  /// Buy a consumable product.
   ///
-  /// If the fetch is successful, the value is null.
-  final PurchaseError error;
-}
+  /// Non consumable items are the items that user can buy multiple times, for example, a health potion.
+  ///
+  /// It is not mandatory to restore non consumable products for user when they switch their phones. If you'd like to restore non consumable purchases, you should keep track of those purchase on your own server
+  /// and restore the purchase for your users.
+  ///
+  /// On iOS, you can define your product as a consumable items in the [App Store Connect](https://appstoreconnect.apple.com/login).
+  /// Unfortunately, [Google Play Console](https://play.google.com/) defaults all the products as non consumable. You have to consume the consumable items manually calling [consumePurchase].
+  ///
+  /// The `autoConsume` is for Android only since iOS will automatically consume your purchase if the product is categorized as `consumable` on `App Store Connect`.
+  /// The `autoConsume` if `true` by default, and we will call [consumePurchase] after a successful purchase for you. If you'd like to have an advance purchase flow management. You should set it to `false` and
+  /// consume the purchase when you see fit. Fail to consume a purchase will cause user never be able to buy the same item again. Setting this to `false` on iOS will throw an `Exception`.
+  ///
+  /// This method does not return anything. Instead, after triggering this method, purchase updates will be sent to [purchaseUpdatedStream].
+  /// You should [Stream.listen] to [purchaseUpdatedStream] to get [PurchaseDetails] objects in different [PurchaseDetails.status] and
+  /// update your UI accordingly. When the [PurchaseDetails.status] is [PurchaseStatus.purchased] or [PurchaseStatus.error], you should deliver the content or handle the error, then call
+  /// [completePurchase] to finish the purchasing process.
+  ///
+  /// You can find more details on testing payments on iOS [here](https://developer.apple.com/library/archive/documentation/NetworkingInternet/Conceptual/StoreKitGuide/Chapters/ShowUI.html#//apple_ref/doc/uid/TP40008267-CH3-SW11).
+  /// You can find more details on testing payments on Android [here](https://developer.android.com/google/play/billing/billing_testing).
+  ///
+  /// See also:
+  ///
+  ///  * [buyNonConsumable], for buying a non consumable product or subscription.
+  ///  * [queryPastPurchases], for restoring non consumable products.
+  ///  * [consumePurchase], for consume consumable products on Android.
+  ///
+  /// Calling this method for non consumable items will cause unwanted behaviors!
+  void buyConsumable(
+      {@required PurchaseParam purchaseParam, bool autoConsume = true});
 
-/// Basic generic API for making in app purchases across multiple platforms.
-abstract class InAppPurchaseConnection {
-  /// Returns true if the payment platform is ready and available.
-  Future<bool> isAvailable();
+  /// Completes a purchase either after delivering the content or the purchase is failed. (iOS only).
+  ///
+  /// You are responsible to complete every [PurchaseDetails] whose [PurchaseDetails.status] is [PurchaseStatus.purchased] or [[PurchaseStatus.error].
+  /// Completing a [PurchaseStatus.pending] purchase will cause exception.
+  ///
+  /// It throws an [UnsupportedError] on Android.
+  Future<void> completePurchase(PurchaseDetails purchase);
 
-  /// Query product details list that match the given set of identifiers.
-  Future<ProductDetailsResponse> queryProductDetails(Set<String> identifiers);
+  /// Consume a product that is purchased with `purchase` so user can buy it again. (Android only).
+  ///
+  /// You are responsible to consume purchases for consumable product after delivery the product.
+  /// The user cannot buy the same product again until the purchase of the product is consumed.
+  ///
+  /// It throws an [UnsupportedError] on iOS.
+  Future<BillingResponse> consumePurchase(PurchaseDetails purchase);
 
   /// Query all the past purchases.
   ///
   /// The `applicationUserName` is required if you also passed this in when making a purchase.
   /// If you did not use a `applicationUserName` when creating payments, you can ignore this parameter.
+  ///
+  /// For example, when a user installs your APP on a different phone, you want to restore the past purchases and deliver the products that they previously purchased.
+  /// It is mandatory to restore non-consumable and subscription for them; however, for consumable product, it is up to you to decide if you should restore those.
+  /// If you want to restore the consumable product as well, you need to persist consumable product information for your user on your own server and deliver it to them.
   Future<QueryPurchaseDetailsResponse> queryPastPurchases(
       {String applicationUserName});
 
   /// A utility method in case there is an issue with getting the verification data originally on iOS.
   ///
-  /// Throws an [Exception] on Android.
+  /// Throws an [UnsupportedError] on Android.
   Future<PurchaseVerificationData> refreshPurchaseVerificationData();
 
   /// The [InAppPurchaseConnection] implemented for this platform.
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart
index 3860327b79f0..e98b53c322e9 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart
@@ -39,7 +39,7 @@ class ProductDetails {
 
   /// Points back to the `BillingClient1`'s [SkuDetailsWrapper] object that generated this [ProductDetails] object.
   ///
-  /// This is null on Android.
+  /// This is null on iOS.
   final SkuDetailsWrapper skuDetail;
 }
 
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/purchase_details.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/purchase_details.dart
new file mode 100644
index 000000000000..f88c32754a26
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/purchase_details.dart
@@ -0,0 +1,181 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/foundation.dart';
+import 'package:in_app_purchase/src/billing_client_wrappers/purchase_wrapper.dart';
+import 'package:in_app_purchase/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart';
+import './product_details.dart';
+
+final String kPurchaseErrorCode = 'purchase_error';
+final String kRestoredPurchaseErrorCode = 'restore_transactions_failed';
+
+/// Represents the data that is used to verify purchases.
+///
+/// The property [source] helps you to determine the method to verify purchases.
+/// Different source of purchase has different methods of verifying purchases.
+///
+/// Both platforms have 2 ways to verify purchase data. You can either choose to verify the data locally using [localVerificationData]
+/// or verify the data using your own server with [serverVerificationData].
+///
+/// For details on how to verify your purchase on iOS,
+/// you can refer to Apple's document about [`About Receipt Validation`](https://developer.apple.com/library/archive/releasenotes/General/ValidateAppStoreReceipt/Introduction.html#//apple_ref/doc/uid/TP40010573-CH105-SW1).
+///
+/// On Android, all purchase information should also be verified manually. See [`Verify a purchase`](https://developer.android.com/google/play/billing/billing_library_overview#Verify).
+///
+/// It is preferable to verify purchases using a server with [serverVerificationData].
+///
+/// If the platform is iOS, it is possible the data can be null or your validation of this data turns out invalid. When this happens,
+/// Call [InAppPurchaseConnection.refreshPurchaseVerificationData] to get a new [PurchaseVerificationData] object. And then you can
+/// validate the receipt data again using one of the methods mentioned in [`Receipt Validation`](https://developer.apple.com/library/archive/releasenotes/General/ValidateAppStoreReceipt/Introduction.html#//apple_ref/doc/uid/TP40010573-CH105-SW1).
+///
+/// You should never use any purchase data until verified.
+class PurchaseVerificationData {
+  /// The data used for local verification.
+  ///
+  /// If the [source] is [PurchaseSource.AppStore], this data is a based64 encoded string. The structure of the payload is defined using ASN.1.
+  /// If the [source] is [PurchaseSource.GooglePlay], this data is a JSON String.
+  final String localVerificationData;
+
+  /// The data used for server verification.
+  ///
+  /// If the platform is iOS, this data is identical to [localVerificationData].
+  final String serverVerificationData;
+
+  /// Indicates the source of the purchase.
+  final PurchaseSource source;
+
+  PurchaseVerificationData(
+      {@required this.localVerificationData,
+      @required this.serverVerificationData,
+      @required this.source});
+}
+
+/// Which platform the purchase is on.
+enum PurchaseSource { GooglePlay, AppStore }
+
+enum PurchaseStatus {
+  /// The purchase process is pending.
+  ///
+  /// You can update UI to let your users know the purchase is pending.
+  pending,
+
+  /// The purchase is finished and successful.
+  ///
+  /// Update your UI to indicate the purchase is finished and deliver the product.
+  /// On Android, the google play store is handling the purchase, so we set the status to
+  /// `purchased` as long as we can successfully launch play store purchase flow.
+  purchased,
+
+  /// Some error occurred in the purchase. The purchasing process if aborted.
+  error
+}
+
+/// Error of a purchase process.
+///
+/// The error can happen during the purchase, or restoring a purchase.
+/// Errors from restoring a purchase are not indicative of any errors during the original purchase.
+class PurchaseError {
+  PurchaseError(
+      {@required this.source, @required this.code, @required this.message});
+
+  /// Which source is the error on.
+  final PurchaseSource source;
+
+  /// The error code.
+  final String code;
+
+  /// A map containing the detailed error message.
+  final Map<String, dynamic> message;
+}
+
+/// The parameter object for generating a purchase.
+class PurchaseParam {
+  PurchaseParam(
+      {@required this.productDetails,
+      this.applicationUserName,
+      this.sandboxTesting});
+
+  /// The product to create payment for.
+  ///
+  /// It has to match one of the valid [ProductDetails] objects that you get from [ProductDetailsResponse] after calling [InAppPurchaseConnection.queryProductDetails].
+  final ProductDetails productDetails;
+
+  /// An opaque id for the user's account that's unique to your app. (Optional)
+  ///
+  /// Used to help the store detect irregular activity.
+  /// Do not pass in a clear text, your developer ID, the user’s Apple ID, or the
+  /// user's Google ID for this field.
+  /// For example, you can use a one-way hash of the user’s account name on your server.
+  final String applicationUserName;
+
+  /// The 'sandboxTesting' is only available on iOS, set it to `true` for testing in AppStore's sandbox environment. The default value is `false`.
+  final bool sandboxTesting;
+}
+
+/// Represents the transaction details of a purchase.
+///
+/// This class unifies the BillingClient's [PurchaseWrapper] and StoreKit's [SKPaymentTransactionWrapper]. You can use the common attributes in
+/// This class for simple operations. If you would like to see the detailed representation of the product, instead,  use [PurchaseWrapper] on Android and [SKPaymentTransactionWrapper] on iOS.
+class PurchaseDetails {
+  /// A unique identifier of the purchase.
+  final String purchaseID;
+
+  /// The product identifier of the purchase.
+  final String productID;
+
+  /// The verification data of the purchase.
+  ///
+  /// Use this to verify the purchase. See [PurchaseVerificationData] for details on how to verify purchase use this data.
+  /// You should never use any purchase data until verified.
+  final PurchaseVerificationData verificationData;
+
+  /// The timestamp of the transaction.
+  ///
+  /// Milliseconds since epoch.
+  final String transactionDate;
+
+  /// The status that this [PurchaseDetails] is currently on.
+  PurchaseStatus status;
+
+  /// The error is only available when [status] is [PurchaseStatus.error].
+  PurchaseError error;
+
+  /// Points back to the `StoreKits`'s [SKPaymentTransactionWrapper] object that generated this [PurchaseDetails] object.
+  ///
+  /// This is null on Android.
+  final SKPaymentTransactionWrapper skPaymentTransaction;
+
+  /// Points back to the `BillingClient`'s [PurchaseWrapper] object that generated this [PurchaseDetails] object.
+  ///
+  /// This is null on Android.
+  final PurchaseWrapper billingClientPurchase;
+
+  PurchaseDetails({
+    @required this.purchaseID,
+    @required this.productID,
+    @required this.verificationData,
+    @required this.transactionDate,
+    this.skPaymentTransaction = null,
+    this.billingClientPurchase = null,
+  });
+}
+
+/// The response object for fetching the past purchases.
+///
+/// An instance of this class is returned in [InAppPurchaseConnection.queryPastPurchases].
+class QueryPurchaseDetailsResponse {
+  QueryPurchaseDetailsResponse({@required this.pastPurchases, this.error});
+
+  /// A list of successfully fetched past purchases.
+  ///
+  /// If there are no past purchases, or there is an [error] fetching past purchases,
+  /// this variable is an empty List.
+  /// You should verify the purchase data using [PurchaseDetails.verificationData] before using the [PurchaseDetails] object.
+  final List<PurchaseDetails> pastPurchases;
+
+  /// The error when fetching past purchases.
+  ///
+  /// If the fetch is successful, the value is null.
+  final PurchaseError error;
+}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart
index cfbe16d57e89..b2cb99d3aaee 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart
@@ -1,5 +1,6 @@
 import 'package:in_app_purchase/store_kit_wrappers.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:in_app_purchase/in_app_purchase_connection.dart';
 
 part 'enum_converters.g.dart';
 
@@ -18,6 +19,21 @@ class SKTransactionStatusConverter
               .cast<SKPaymentTransactionStateWrapper, dynamic>(),
           json);
 
+  PurchaseStatus toPurchaseStatus(SKPaymentTransactionStateWrapper object) {
+    switch (object) {
+      case SKPaymentTransactionStateWrapper.purchasing:
+      case SKPaymentTransactionStateWrapper.deferred:
+        return PurchaseStatus.pending;
+      case SKPaymentTransactionStateWrapper.purchased:
+      case SKPaymentTransactionStateWrapper.restored:
+        return PurchaseStatus.purchased;
+      case SKPaymentTransactionStateWrapper.failed:
+        return PurchaseStatus.error;
+    }
+
+    throw ArgumentError('$object isn\'t mapped to PurchaseStatus');
+  }
+
   @override
   int toJson(SKPaymentTransactionStateWrapper object) =>
       _$SKPaymentTransactionStateWrapperEnumMap[object];
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
index 1dd93e70c493..105d7f4fd8c0 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
@@ -4,12 +4,12 @@
 
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'sk_product_wrapper.dart';
 import 'sk_download_wrapper.dart';
 import 'sk_payment_queue_wrapper.dart';
 import 'enum_converters.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/in_app_purchase_connection.dart';
 
 part 'sk_payment_transaction_wrappers.g.dart';
 
@@ -109,12 +109,14 @@ class SKPaymentTransactionWrapper {
   PurchaseDetails toPurchaseDetails(String base64EncodedReceipt) {
     return PurchaseDetails(
       purchaseID: transactionIdentifier,
-      productId: payment.productIdentifier,
+      productID: payment.productIdentifier,
       verificationData: PurchaseVerificationData(
           localVerificationData: base64EncodedReceipt,
           serverVerificationData: base64EncodedReceipt,
           source: PurchaseSource.AppStore),
-      transactionDate: (transactionTimeStamp * 1000).toInt().toString(),
+      transactionDate: transactionTimeStamp != null
+          ? (transactionTimeStamp * 1000).toInt().toString()
+          : null,
       skPaymentTransaction: this,
     );
   }
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
index 36d8058a3bfd..f5c5a5b8a73c 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/billing_client_wrapper_test.dart
@@ -115,7 +115,7 @@ void main() {
       final String accountId = "hashedAccountId";
 
       final BillingResponse receivedCode = await billingClient
-          .launchBillingFlow(skuDetails: skuDetails, accountId: accountId);
+          .launchBillingFlow(sku: skuDetails.sku, accountId: accountId);
 
       expect(receivedCode, equals(sentCode));
       Map<dynamic, dynamic> arguments =
@@ -132,7 +132,7 @@ void main() {
       final SkuDetailsWrapper skuDetails = dummySkuDetails;
 
       final BillingResponse receivedCode =
-          await billingClient.launchBillingFlow(skuDetails: skuDetails);
+          await billingClient.launchBillingFlow(sku: skuDetails.sku);
 
       expect(receivedCode, equals(sentCode));
       Map<dynamic, dynamic> arguments =
@@ -232,4 +232,20 @@ void main() {
       expect(response.purchasesList, isEmpty);
     });
   });
+
+  group('consume purchases', () {
+    const String consumeMethodName =
+        'BillingClient#consumeAsync(String, ConsumeResponseListener)';
+    test('consume purchase async success', () async {
+      final BillingResponse expectedCode = BillingResponse.ok;
+      stubPlatform.addResponse(
+          name: consumeMethodName,
+          value: BillingResponseConverter().toJson(expectedCode));
+
+      final BillingResponse responseCode =
+          await billingClient.consumeAsync('dummy token');
+
+      expect(responseCode, equals(expectedCode));
+    });
+  });
 }
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
index b62ba175dcdd..ffb04276747a 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
 import 'package:test/test.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/in_app_purchase_connection.dart';
 
 final PurchaseWrapper dummyPurchase = PurchaseWrapper(
   orderId: 'orderId',
@@ -31,7 +31,7 @@ void main() {
     test('toPurchaseDetails() should return correct PurchaseDetail object', () {
       final PurchaseDetails details = dummyPurchase.toPurchaseDetails();
       expect(details.purchaseID, dummyPurchase.orderId);
-      expect(details.productId, dummyPurchase.sku);
+      expect(details.productID, dummyPurchase.sku);
       expect(details.transactionDate, dummyPurchase.purchaseTime.toString());
       expect(details.verificationData.source, PurchaseSource.GooglePlay);
       expect(details.verificationData.localVerificationData,
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
index 4634ea1ac75a..2dc32f782ee6 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
@@ -3,14 +3,15 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:io';
 
 import 'package:flutter/services.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
 import 'package:test/test.dart';
 
 import 'package:in_app_purchase/src/channel.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/app_store_connection.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/in_app_purchase_connection.dart';
 import 'package:in_app_purchase/store_kit_wrappers.dart';
 import '../store_kit_wrappers/sk_test_stub_objects.dart';
 
@@ -22,6 +23,10 @@ void main() {
         .setMockMethodCallHandler(fakeIOSPlatform.onMethodCall);
   });
 
+  setUp(() => fakeIOSPlatform.reset());
+
+  tearDown(() => fakeIOSPlatform.reset());
+
   group('isAvailable', () {
     test('true', () async {
       expect(await AppStoreConnection.instance.isAvailable(), isTrue);
@@ -54,14 +59,14 @@ void main() {
       QueryPurchaseDetailsResponse response =
           await AppStoreConnection.instance.queryPastPurchases();
       expect(response.pastPurchases.length, 2);
-      expect(
-          response.pastPurchases.first.purchaseID,
-          fakeIOSPlatform
-              .transactions.first.originalTransaction.transactionIdentifier);
-      expect(
-          response.pastPurchases.last.purchaseID,
-          fakeIOSPlatform
-              .transactions.last.originalTransaction.transactionIdentifier);
+      expect(response.pastPurchases.first.purchaseID,
+          fakeIOSPlatform.transactions.first.transactionIdentifier);
+      expect(response.pastPurchases.last.purchaseID,
+          fakeIOSPlatform.transactions.last.transactionIdentifier);
+      expect(response.pastPurchases.first.purchaseID,
+          fakeIOSPlatform.transactions.first.transactionIdentifier);
+      expect(response.pastPurchases.last.purchaseID,
+          fakeIOSPlatform.transactions.last.transactionIdentifier);
       expect(
           response.pastPurchases.first.verificationData.localVerificationData,
           'dummy base64data');
@@ -90,7 +95,6 @@ void main() {
       expect(response.pastPurchases, isEmpty);
       expect(response.error.source, PurchaseSource.AppStore);
       expect(response.error.message['message'], 'errorMessage');
-      fakeIOSPlatform.testRestoredError = null;
     });
 
     test('receipt error should populate null to verificationData.data',
@@ -104,7 +108,6 @@ void main() {
       expect(
           response.pastPurchases.first.verificationData.serverVerificationData,
           null);
-      fakeIOSPlatform.receiptData = 'dummy base64data';
     });
   });
 
@@ -115,7 +118,139 @@ void main() {
       expect(receiptData.source, PurchaseSource.AppStore);
       expect(receiptData.localVerificationData, 'refreshed receipt data');
       expect(receiptData.serverVerificationData, 'refreshed receipt data');
-      fakeIOSPlatform.receiptData = 'dummy base64data';
+    });
+  });
+
+  group('make payment', () {
+    test(
+        'buying non consumable, should get purchase objects in the purchase update callback',
+        () async {
+      List<PurchaseDetails> details = [];
+      Completer completer = Completer();
+      Stream<List<PurchaseDetails>> stream =
+          AppStoreConnection.instance.purchaseUpdatedStream;
+
+      StreamSubscription subscription;
+      subscription = stream.listen((purchaseDetailsList) {
+        details.addAll(purchaseDetailsList);
+        if (purchaseDetailsList.first.status == PurchaseStatus.purchased) {
+          completer.complete(details);
+          subscription.cancel();
+        }
+      });
+      final PurchaseParam purchaseParam = PurchaseParam(
+          productDetails: dummyProductWrapper.toProductDetails(),
+          applicationUserName: 'appName');
+      await AppStoreConnection.instance
+          .buyNonConsumable(purchaseParam: purchaseParam);
+
+      List<PurchaseDetails> result = await completer.future;
+      expect(result.length, 2);
+      expect(result.first.productID, dummyProductWrapper.productIdentifier);
+    });
+
+    test(
+        'buying consumable, should get purchase objects in the purchase update callback',
+        () async {
+      List<PurchaseDetails> details = [];
+      Completer completer = Completer();
+      Stream<List<PurchaseDetails>> stream =
+          AppStoreConnection.instance.purchaseUpdatedStream;
+
+      StreamSubscription subscription;
+      subscription = stream.listen((purchaseDetailsList) {
+        details.addAll(purchaseDetailsList);
+        if (purchaseDetailsList.first.status == PurchaseStatus.purchased) {
+          completer.complete(details);
+          subscription.cancel();
+        }
+      });
+      final PurchaseParam purchaseParam = PurchaseParam(
+          productDetails: dummyProductWrapper.toProductDetails(),
+          applicationUserName: 'appName');
+      await AppStoreConnection.instance
+          .buyConsumable(purchaseParam: purchaseParam);
+
+      List<PurchaseDetails> result = await completer.future;
+      expect(result.length, 2);
+      expect(result.first.productID, dummyProductWrapper.productIdentifier);
+    });
+
+    test('buying consumable, should throw when autoConsume is false', () async {
+      final PurchaseParam purchaseParam = PurchaseParam(
+          productDetails: dummyProductWrapper.toProductDetails(),
+          applicationUserName: 'appName');
+      expect(
+          () => AppStoreConnection.instance
+              .buyConsumable(purchaseParam: purchaseParam, autoConsume: false),
+          throwsA(TypeMatcher<AssertionError>()));
+    });
+
+    test('should get failed purchase status', () async {
+      fakeIOSPlatform.testTransactionFail = true;
+      List<PurchaseDetails> details = [];
+      Completer completer = Completer();
+      PurchaseError error;
+
+      Stream<List<PurchaseDetails>> stream =
+          AppStoreConnection.instance.purchaseUpdatedStream;
+      StreamSubscription subscription;
+      subscription = stream.listen((purchaseDetailsList) {
+        details.addAll(purchaseDetailsList);
+        purchaseDetailsList.forEach((purchaseDetails) {
+          if (purchaseDetails.status == PurchaseStatus.error) {
+            error = purchaseDetails.error;
+            completer.complete(error);
+            subscription.cancel();
+          }
+        });
+      });
+      final PurchaseParam purchaseParam = PurchaseParam(
+          productDetails: dummyProductWrapper.toProductDetails(),
+          applicationUserName: 'appName');
+      await AppStoreConnection.instance
+          .buyNonConsumable(purchaseParam: purchaseParam);
+
+      PurchaseError completerError = await completer.future;
+      expect(completerError.code, kPurchaseErrorCode);
+      expect(completerError.source, PurchaseSource.AppStore);
+      expect(completerError.message, {'message': 'an error message'});
+    });
+  });
+
+  group('complete purchase', () {
+    test('should complete purchase', () async {
+      List<PurchaseDetails> details = [];
+      Completer completer = Completer();
+      Stream<List<PurchaseDetails>> stream =
+          AppStoreConnection.instance.purchaseUpdatedStream;
+      StreamSubscription subscription;
+      subscription = stream.listen((purchaseDetailsList) {
+        details.addAll(purchaseDetailsList);
+        purchaseDetailsList.forEach((purchaseDetails) {
+          if (purchaseDetails.status == PurchaseStatus.purchased) {
+            AppStoreConnection.instance.completePurchase(purchaseDetails);
+            completer.complete(details);
+            subscription.cancel();
+          }
+        });
+      });
+      final PurchaseParam purchaseParam = PurchaseParam(
+          productDetails: dummyProductWrapper.toProductDetails(),
+          applicationUserName: 'appName');
+      await AppStoreConnection.instance
+          .buyNonConsumable(purchaseParam: purchaseParam);
+      List<PurchaseDetails> result = await completer.future;
+      expect(result.length, 2);
+      expect(result.first.productID, dummyProductWrapper.productIdentifier);
+      expect(fakeIOSPlatform.finishedTransactions.length, 1);
+    });
+  });
+
+  group('consume purchase', () {
+    test('should throw when calling consume purchase on iOS', () async {
+      expect(() => AppStoreConnection.instance.consumePurchase(null),
+          throwsUnsupportedError);
     });
   });
 }
@@ -123,18 +258,23 @@ void main() {
 class FakeIOSPlatform {
   FakeIOSPlatform() {
     channel.setMockMethodCallHandler(onMethodCall);
-    preConfigure();
   }
 
   // pre-configured store informations
-  String receiptData = 'dummy base64data';
-  Set<String> validProductIDs = ['123', '456'].toSet();
-  Map<String, SKProductWrapper> validProducts = Map();
-  List<SKPaymentTransactionWrapper> transactions = [];
-  bool testRestoredTransactionsNull = false;
-  SKError testRestoredError = null;
-
-  void preConfigure() {
+  String receiptData;
+  Set<String> validProductIDs;
+  Map<String, SKProductWrapper> validProducts;
+  List<SKPaymentTransactionWrapper> transactions;
+  List<SKPaymentTransactionWrapper> finishedTransactions;
+  bool testRestoredTransactionsNull;
+  bool testTransactionFail;
+  SKError testRestoredError;
+
+  void reset() {
+    transactions = [];
+    receiptData = 'dummy base64data';
+    validProductIDs = ['123', '456'].toSet();
+    validProducts = Map();
     for (String validID in validProductIDs) {
       Map productWrapperMap = buildProductMap(dummyProductWrapper);
       productWrapperMap['productIdentifier'] = validID;
@@ -161,6 +301,47 @@ class FakeIOSPlatform {
     );
 
     transactions.addAll([tran1, tran2]);
+    finishedTransactions = [];
+    testRestoredTransactionsNull = false;
+    testTransactionFail = false;
+    testRestoredError = null;
+  }
+
+  SKPaymentTransactionWrapper createPendingTransactionWithProductID(String id) {
+    return SKPaymentTransactionWrapper(
+        payment: SKPaymentWrapper(productIdentifier: id),
+        transactionState: SKPaymentTransactionStateWrapper.purchasing,
+        transactionTimeStamp: 123123.121,
+        transactionIdentifier: id,
+        error: null,
+        downloads: null,
+        originalTransaction: null);
+  }
+
+  SKPaymentTransactionWrapper createPurchasedTransactionWithProductID(
+      String id) {
+    return SKPaymentTransactionWrapper(
+        payment: SKPaymentWrapper(productIdentifier: id),
+        transactionState: SKPaymentTransactionStateWrapper.purchased,
+        transactionTimeStamp: 123123.121,
+        transactionIdentifier: id,
+        error: null,
+        downloads: null,
+        originalTransaction: null);
+  }
+
+  SKPaymentTransactionWrapper createFailedTransactionWithProductID(String id) {
+    return SKPaymentTransactionWrapper(
+        payment: SKPaymentWrapper(productIdentifier: id),
+        transactionState: SKPaymentTransactionStateWrapper.failed,
+        transactionTimeStamp: 123123.121,
+        transactionIdentifier: id,
+        error: SKError(
+            code: 0,
+            domain: 'ios_domain',
+            userInfo: {'message': 'an error message'}),
+        downloads: null,
+        originalTransaction: null);
   }
 
   Future<dynamic> onMethodCall(MethodCall call) {
@@ -207,6 +388,29 @@ class FakeIOSPlatform {
       case '-[InAppPurchasePlugin refreshReceipt:result:]':
         receiptData = 'refreshed receipt data';
         return Future<void>.sync(() {});
+      case '-[InAppPurchasePlugin addPayment:result:]':
+        String id = call.arguments['productIdentifier'];
+        SKPaymentTransactionWrapper transaction =
+            createPendingTransactionWithProductID(id);
+        AppStoreConnection.observer
+            .updatedTransactions(transactions: [transaction]);
+        sleep(const Duration(milliseconds: 30));
+        if (testTransactionFail) {
+          SKPaymentTransactionWrapper transaction_failed =
+              createFailedTransactionWithProductID(id);
+          AppStoreConnection.observer
+              .updatedTransactions(transactions: [transaction_failed]);
+        } else {
+          SKPaymentTransactionWrapper transaction_finished =
+              createPurchasedTransactionWithProductID(id);
+          AppStoreConnection.observer
+              .updatedTransactions(transactions: [transaction_finished]);
+        }
+        break;
+      case '-[InAppPurchasePlugin finishTransaction:result:]':
+        finishedTransactions
+            .add(createPurchasedTransactionWithProductID(call.arguments));
+        break;
     }
     return Future<void>.sync(() {});
   }
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index 8a496148b05b..bcadf3beddc1 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -2,13 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
+
+import 'package:flutter/services.dart';
+import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
 import 'package:test/test.dart';
 
 import 'package:flutter/widgets.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/google_play_connection.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/in_app_purchase_connection.dart';
 import 'package:in_app_purchase/src/channel.dart';
 import '../stub_in_app_purchase_platform.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
@@ -22,8 +25,9 @@ void main() {
       'BillingClient#startConnection(BillingClientStateListener)';
   const String endConnectionCall = 'BillingClient#endConnection()';
 
-  setUpAll(() =>
-      channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler));
+  setUpAll(() {
+    channel.setMockMethodCallHandler(stubPlatform.fakeMethodCallHandler);
+  });
 
   setUp(() {
     WidgetsFlutterBinding.ensureInitialized();
@@ -153,7 +157,194 @@ void main() {
   group('refresh receipt data', () {
     test('should throw on android', () {
       expect(GooglePlayConnection.instance.refreshPurchaseVerificationData(),
-          throwsException);
+          throwsUnsupportedError);
+    });
+  });
+
+  group('make payment', () {
+    final String launchMethodName =
+        'BillingClient#launchBillingFlow(Activity, BillingFlowParams)';
+    const String consumeMethodName =
+        'BillingClient#consumeAsync(String, ConsumeResponseListener)';
+    test('buy non consumable, serializes and deserializes data', () async {
+      final SkuDetailsWrapper skuDetails = dummySkuDetails;
+      final String accountId = "hashedAccountId";
+      final BillingResponse sentCode = BillingResponse.ok;
+      stubPlatform.addResponse(
+          name: launchMethodName,
+          value: BillingResponseConverter().toJson(sentCode),
+          additionalStepBeforeReturn: (_) {
+            // Mock java update purchase callback.
+            MethodCall call = MethodCall(kOnPurchasesUpdated, {
+              'responseCode': BillingResponseConverter().toJson(sentCode),
+              'purchasesList': [
+                {
+                  'orderId': 'orderID1',
+                  'sku': skuDetails.sku,
+                  'isAutoRenewing': false,
+                  'packageName': "package",
+                  'purchaseTime': 1231231231,
+                  'purchaseToken': "token",
+                  'signature': 'sign',
+                  'originalJson': 'json'
+                }
+              ]
+            });
+            connection.billingClient.callHandler(call);
+          });
+      Completer completer = Completer();
+      PurchaseDetails purchaseDetails;
+      Stream purchaseStream =
+          GooglePlayConnection.instance.purchaseUpdatedStream;
+      StreamSubscription subscription;
+      subscription = purchaseStream.listen((_) {
+        purchaseDetails = _.first;
+        completer.complete(purchaseDetails);
+        subscription.cancel();
+      }, onDone: () {});
+      final PurchaseParam purchaseParam = PurchaseParam(
+          productDetails: skuDetails.toProductDetails(),
+          applicationUserName: accountId);
+      await GooglePlayConnection.instance
+          .buyNonConsumable(purchaseParam: purchaseParam);
+      PurchaseDetails result = await completer.future;
+      expect(result.purchaseID, 'orderID1');
+      expect(result.status, PurchaseStatus.purchased);
+      expect(result.productID, dummySkuDetails.sku);
+    });
+
+    test('buy consumable with auto consume, serializes and deserializes data',
+        () async {
+      final SkuDetailsWrapper skuDetails = dummySkuDetails;
+      final String accountId = "hashedAccountId";
+      final BillingResponse sentCode = BillingResponse.ok;
+      stubPlatform.addResponse(
+          name: launchMethodName,
+          value: BillingResponseConverter().toJson(sentCode),
+          additionalStepBeforeReturn: (_) {
+            // Mock java update purchase callback.
+            MethodCall call = MethodCall(kOnPurchasesUpdated, {
+              'responseCode': BillingResponseConverter().toJson(sentCode),
+              'purchasesList': [
+                {
+                  'orderId': 'orderID1',
+                  'sku': skuDetails.sku,
+                  'isAutoRenewing': false,
+                  'packageName': "package",
+                  'purchaseTime': 1231231231,
+                  'purchaseToken': "token",
+                  'signature': 'sign',
+                  'originalJson': 'json'
+                }
+              ]
+            });
+            connection.billingClient.callHandler(call);
+          });
+      Completer consumeCompleter = Completer();
+      // adding call back for consume purchase
+      final BillingResponse expectedCode = BillingResponse.ok;
+      stubPlatform.addResponse(
+          name: consumeMethodName,
+          value: BillingResponseConverter().toJson(expectedCode),
+          additionalStepBeforeReturn: (dynamic args) {
+            String purchaseToken = args['purchaseToken'];
+            consumeCompleter.complete((purchaseToken));
+          });
+
+      Completer completer = Completer();
+      PurchaseDetails purchaseDetails;
+      Stream purchaseStream =
+          GooglePlayConnection.instance.purchaseUpdatedStream;
+      StreamSubscription subscription;
+      subscription = purchaseStream.listen((_) {
+        purchaseDetails = _.first;
+        completer.complete(purchaseDetails);
+        subscription.cancel();
+      }, onDone: () {});
+      final PurchaseParam purchaseParam = PurchaseParam(
+          productDetails: skuDetails.toProductDetails(),
+          applicationUserName: accountId);
+      await GooglePlayConnection.instance
+          .buyConsumable(purchaseParam: purchaseParam);
+      PurchaseDetails result = await completer.future;
+      expect(result.billingClientPurchase.purchaseToken,
+          await consumeCompleter.future);
+    });
+
+    test(
+        'buy consumable without auto consume, consume api should not receive calls',
+        () async {
+      final SkuDetailsWrapper skuDetails = dummySkuDetails;
+      final String accountId = "hashedAccountId";
+      final BillingResponse sentCode = BillingResponse.ok;
+      stubPlatform.addResponse(
+          name: launchMethodName,
+          value: BillingResponseConverter().toJson(sentCode),
+          additionalStepBeforeReturn: (_) {
+            // Mock java update purchase callback.
+            MethodCall call = MethodCall(kOnPurchasesUpdated, {
+              'responseCode': BillingResponseConverter().toJson(sentCode),
+              'purchasesList': [
+                {
+                  'orderId': 'orderID1',
+                  'sku': skuDetails.sku,
+                  'isAutoRenewing': false,
+                  'packageName': "package",
+                  'purchaseTime': 1231231231,
+                  'purchaseToken': "token",
+                  'signature': 'sign',
+                  'originalJson': 'json'
+                }
+              ]
+            });
+            connection.billingClient.callHandler(call);
+          });
+      Completer consumeCompleter = Completer();
+      // adding call back for consume purchase
+      final BillingResponse expectedCode = BillingResponse.ok;
+      stubPlatform.addResponse(
+          name: consumeMethodName,
+          value: BillingResponseConverter().toJson(expectedCode),
+          additionalStepBeforeReturn: (dynamic args) {
+            String purchaseToken = args['purchaseToken'];
+            consumeCompleter.complete((purchaseToken));
+          });
+
+      Stream purchaseStream =
+          GooglePlayConnection.instance.purchaseUpdatedStream;
+      StreamSubscription subscription;
+      subscription = purchaseStream.listen((_) {
+        consumeCompleter.complete(null);
+        subscription.cancel();
+      }, onDone: () {});
+      final PurchaseParam purchaseParam = PurchaseParam(
+          productDetails: skuDetails.toProductDetails(),
+          applicationUserName: accountId);
+      await GooglePlayConnection.instance
+          .buyConsumable(purchaseParam: purchaseParam, autoConsume: false);
+      expect(null, await consumeCompleter.future);
+    });
+  });
+
+  group('consume purchases', () {
+    const String consumeMethodName =
+        'BillingClient#consumeAsync(String, ConsumeResponseListener)';
+    test('consume purchase async success', () async {
+      final BillingResponse expectedCode = BillingResponse.ok;
+      stubPlatform.addResponse(
+          name: consumeMethodName,
+          value: BillingResponseConverter().toJson(expectedCode));
+
+      final BillingResponse responseCode = await GooglePlayConnection.instance
+          .consumePurchase(dummyPurchase.toPurchaseDetails());
+
+      expect(responseCode, equals(expectedCode));
+    });
+  });
+
+  group('complete purchase', () {
+    test('calling complete purchase on android should throw', () async {
+      expect(() => connection.completePurchase(null), throwsUnsupportedError);
     });
   });
 }
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
index 5fcdb47f191e..a426b94920cb 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
 import 'package:test/test.dart';
 import 'package:in_app_purchase/src/store_kit_wrappers/sk_product_wrapper.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
 import 'package:in_app_purchase/store_kit_wrappers.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/in_app_purchase_connection.dart';
 import 'sk_test_stub_objects.dart';
 
 void main() {
@@ -138,7 +138,7 @@ void main() {
       PurchaseDetails details =
           dummyTransaction.toPurchaseDetails('receipt data');
       expect(dummyTransaction.transactionIdentifier, details.purchaseID);
-      expect(dummyTransaction.payment.productIdentifier, details.productId);
+      expect(dummyTransaction.payment.productIdentifier, details.productID);
       expect((dummyTransaction.transactionTimeStamp * 1000).toInt().toString(),
           details.transactionDate);
       expect(details.verificationData.localVerificationData, 'receipt data');
diff --git a/packages/in_app_purchase/test/stub_in_app_purchase_platform.dart b/packages/in_app_purchase/test/stub_in_app_purchase_platform.dart
index 9fd015975fc1..ba2e5a782fac 100644
--- a/packages/in_app_purchase/test/stub_in_app_purchase_platform.dart
+++ b/packages/in_app_purchase/test/stub_in_app_purchase_platform.dart
@@ -5,10 +5,18 @@
 import 'dart:async';
 import 'package:flutter/services.dart';
 
+typedef Future<void> AdditionalSteps(dynamic args);
+
 class StubInAppPurchasePlatform {
   Map<String, dynamic> _expectedCalls = <String, dynamic>{};
-  void addResponse({String name, dynamic value}) =>
-      _expectedCalls[name] = value;
+  Map<String, AdditionalSteps> _additionalSteps = <String, AdditionalSteps>{};
+  void addResponse(
+      {String name,
+      dynamic value,
+      AdditionalSteps additionalStepBeforeReturn}) {
+    _additionalSteps[name] = additionalStepBeforeReturn;
+    _expectedCalls[name] = value;
+  }
 
   List<MethodCall> _previousCalls = <MethodCall>[];
   List<MethodCall> get previousCalls => _previousCalls;
@@ -20,11 +28,15 @@ class StubInAppPurchasePlatform {
   void reset() {
     _expectedCalls.clear();
     _previousCalls.clear();
+    _additionalSteps.clear();
   }
 
-  Future<dynamic> fakeMethodCallHandler(MethodCall call) {
+  Future<dynamic> fakeMethodCallHandler(MethodCall call) async {
     _previousCalls.add(call);
     if (_expectedCalls.containsKey(call.method)) {
+      if (_additionalSteps[call.method] != null) {
+        await _additionalSteps[call.method](call.arguments);
+      }
       return Future<dynamic>.sync(() => _expectedCalls[call.method]);
     } else {
       return Future<void>.sync(() => null);

From d85cadf3c1b11d7a19a4de43ca198fcfbdcc3a14 Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@users.noreply.github.com>
Date: Mon, 8 Apr 2019 20:50:52 -0700
Subject: [PATCH 312/410] Migrate firebase messaging plugin away from token
 (#1468)

This mirrors an internal change where Firebase team is deprecating instance token calls.
---
 .../firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m b/packages/firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m
index 17e64304e923..2607e3e64990 100644
--- a/packages/firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m
+++ b/packages/firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m
@@ -98,7 +98,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
       }
     }];
   } else if ([@"autoInitEnabled" isEqualToString:method]) {
-    BOOL *value = [[FIRMessaging messaging] isAutoInitEnabled];
+    BOOL value = [[FIRMessaging messaging] isAutoInitEnabled];
     result([NSNumber numberWithBool:value]);
   } else if ([@"setAutoInitEnabled" isEqualToString:method]) {
     NSNumber *value = call.arguments;
@@ -173,7 +173,7 @@ - (void)application:(UIApplication *)application
   [[FIRMessaging messaging] setAPNSToken:deviceToken type:FIRMessagingAPNSTokenTypeProd];
 #endif
 
-  [_channel invokeMethod:@"onToken" arguments:[[FIRInstanceID instanceID] token]];
+  [_channel invokeMethod:@"onToken" arguments:[FIRMessaging messaging].FCMToken];
 }
 
 - (void)application:(UIApplication *)application

From ba47d2397b2f59ff5ca9c300ed9863b1025b49ec Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Tue, 9 Apr 2019 08:26:59 -0700
Subject: [PATCH 313/410] [shared_preferences] Add containsKey method (#1373)

---
 packages/shared_preferences/CHANGELOG.md                 | 4 ++++
 packages/shared_preferences/lib/shared_preferences.dart  | 3 +++
 packages/shared_preferences/pubspec.yaml                 | 2 +-
 .../shared_preferences/test/shared_preferences_test.dart | 9 +++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/shared_preferences/CHANGELOG.md b/packages/shared_preferences/CHANGELOG.md
index 0fd825507df7..82081fd08ddc 100644
--- a/packages/shared_preferences/CHANGELOG.md
+++ b/packages/shared_preferences/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.2
+
+* Add containsKey method.
+
 ## 0.5.1+2
 
 * Add a driver test
diff --git a/packages/shared_preferences/lib/shared_preferences.dart b/packages/shared_preferences/lib/shared_preferences.dart
index cb24d12fde0d..96361f1108e1 100644
--- a/packages/shared_preferences/lib/shared_preferences.dart
+++ b/packages/shared_preferences/lib/shared_preferences.dart
@@ -70,6 +70,9 @@ class SharedPreferences {
   /// String.
   String getString(String key) => _preferenceCache[key];
 
+  /// Returns true if persistent storage the contains the given [key].
+  bool containsKey(String key) => _preferenceCache.containsKey(key);
+
   /// Reads a set of string values from persistent storage, throwing an
   /// exception if it's not a string set.
   List<String> getStringList(String key) {
diff --git a/packages/shared_preferences/pubspec.yaml b/packages/shared_preferences/pubspec.yaml
index 1ae1c3b1742b..0a03bd29469f 100644
--- a/packages/shared_preferences/pubspec.yaml
+++ b/packages/shared_preferences/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for reading and writing simple key-value pairs.
   Wraps NSUserDefaults on iOS and SharedPreferences on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences
-version: 0.5.1+2
+version: 0.5.2
 
 flutter:
   plugin:
diff --git a/packages/shared_preferences/test/shared_preferences_test.dart b/packages/shared_preferences/test/shared_preferences_test.dart
index c296bde635c5..031251fa799e 100755
--- a/packages/shared_preferences/test/shared_preferences_test.dart
+++ b/packages/shared_preferences/test/shared_preferences_test.dart
@@ -125,6 +125,15 @@ void main() {
           ));
     });
 
+    test('containsKey', () async {
+      const String key = 'testKey';
+
+      expect(false, preferences.containsKey(key));
+
+      preferences.setString(key, 'test');
+      expect(true, preferences.containsKey(key));
+    });
+
     test('clearing', () async {
       await preferences.clear();
       expect(preferences.getString('String'), null);

From 7fc9370726b7820f190739493eb12c5e7a076feb Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Tue, 9 Apr 2019 12:04:05 -0700
Subject: [PATCH 314/410] [Google_map]Enable iOS a11y by default. (#1472)

* enable ios a11y by default

* pubspec and changelog
---
 packages/google_maps_flutter/CHANGELOG.md                     | 4 ++++
 .../google_maps_flutter/ios/Classes/GoogleMapController.m     | 1 +
 packages/google_maps_flutter/pubspec.yaml                     | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index ab74c1f6e5f1..1ef4a154364e 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.5
+
+* Enable iOS accessibility.
+
 ## 0.5.4
 
 * Add method getVisibleRegion for get the latlng bounds of the visible map area.
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index 246ece0248b5..ee95a645001f 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -65,6 +65,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 
     GMSCameraPosition* camera = ToOptionalCameraPosition(args[@"initialCameraPosition"]);
     _mapView = [GMSMapView mapWithFrame:frame camera:camera];
+    _mapView.accessibilityElementsHidden = NO;
     _trackCameraPosition = NO;
     InterpretMapOptions(args[@"options"], self);
     NSString* channelName =
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 06829ba61be1..63421952e540 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.4
+version: 0.5.5
 
 dependencies:
   flutter:

From 264cf179d60b6dd70b4a49c7abad2b604a34a217 Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Tue, 9 Apr 2019 14:15:48 -0700
Subject: [PATCH 315/410] [firebase_messaging] Update example (#1353)

Fix error for simulate a message being received
---
 packages/firebase_messaging/CHANGELOG.md          | 4 ++++
 packages/firebase_messaging/example/lib/main.dart | 6 ++++--
 packages/firebase_messaging/pubspec.yaml          | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index 88ecf80be9bc..988a26ddd596 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.0+2
+
+* Fix example app's floating action button that stopped working due to a breaking change.
+
 ## 4.0.0+1
 
 * Log messages about automatic configuration of the default app are now less confusing.
diff --git a/packages/firebase_messaging/example/lib/main.dart b/packages/firebase_messaging/example/lib/main.dart
index 8a24b939cc9d..1e1844609ffa 100644
--- a/packages/firebase_messaging/example/lib/main.dart
+++ b/packages/firebase_messaging/example/lib/main.dart
@@ -175,8 +175,10 @@ class _PushMessagingExampleState extends State<PushMessagingExample> {
         // For testing -- simulate a message being received
         floatingActionButton: FloatingActionButton(
           onPressed: () => _showItemDialog(<String, dynamic>{
-                "id": "2",
-                "status": "out of stock",
+                "data": <String, String>{
+                  "id": "2",
+                  "status": "out of stock",
+                },
               }),
           tooltip: 'Simulate Message',
           child: const Icon(Icons.message),
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
index aa43e8d85e6c..2d73fe466dc2 100644
--- a/packages/firebase_messaging/pubspec.yaml
+++ b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 4.0.0+1
+version: 4.0.0+2
 
 flutter:
   plugin:

From 9023ff2845aa43e0568b4a00d7c242506eae57e3 Mon Sep 17 00:00:00 2001
From: Yunyu Lin <mail@yunyul.in>
Date: Tue, 9 Apr 2019 20:07:08 -0400
Subject: [PATCH 316/410] [image_picker] Fix invalid path being returned from
 Google Photos (#1471)

---
 packages/image_picker/CHANGELOG.md                            | 4 ++++
 .../main/java/io/flutter/plugins/imagepicker/FileUtils.java   | 2 +-
 packages/image_picker/pubspec.yaml                            | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 3a6dccfe1bbd..e5d2bcf031ab 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.3
+
+* Fixed incorrect path being returned from Google Photos on Android.
+
 ## 0.5.2
 
 * Check iOS camera authorizationStatus and return an error, if the access was
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
index fbc7472428dd..c155a10634db 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
@@ -95,7 +95,7 @@ private String getPathFromLocalUri(final Context context, final Uri uri) {
 
       // Return the remote address
       if (isGooglePhotosUri(uri)) {
-        return uri.getLastPathSegment();
+        return null;
       }
 
       return getDataColumn(context, uri, null, null);
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index fe6e4ef9fcb5..66674e2c7113 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.2
+version: 0.5.3
 
 flutter:
   plugin:

From ec4f8d0063f76aa1e8aea95830450b2ed652342d Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Tue, 9 Apr 2019 18:23:57 -0700
Subject: [PATCH 317/410] Integration tests for cloud_firestore and
 firebase_database transactions (#1465)

---
 packages/cloud_firestore/CHANGELOG.md         |  4 +++
 .../example/test_driver/cloud_firestore.dart  | 25 +++++++++++++++++
 packages/cloud_firestore/pubspec.yaml         |  2 +-
 packages/firebase_database/CHANGELOG.md       |  4 +++
 .../firebase_database/example/pubspec.yaml    |  5 ++++
 .../test_driver/firebase_database.dart        | 27 +++++++++++++++++++
 .../test_driver/firebase_database_test.dart   | 10 +++++++
 packages/firebase_database/pubspec.yaml       |  2 ++
 8 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 packages/firebase_database/example/test_driver/firebase_database.dart
 create mode 100644 packages/firebase_database/example/test_driver/firebase_database_test.dart

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 4feb3324cdc3..359ce17ea96c 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.13+1
+
+* Added an integration test for transactions.
+
 ## 0.9.13
 
 * Remove Gradle BoM to avoid Gradle version issues.
diff --git a/packages/cloud_firestore/example/test_driver/cloud_firestore.dart b/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
index 1a2ddc1fb6ed..c040f6befc87 100644
--- a/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
+++ b/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
@@ -39,5 +39,30 @@ void main() {
       final DocumentSnapshot snapshot = await firstDoc.snapshots().first;
       expect(snapshot.data['message'], 'Hello world!');
     });
+
+    test('runTransaction', () async {
+      final DocumentReference ref = firestore.collection('messages').document();
+      await ref.setData(<String, dynamic>{
+        'message': 'testing',
+        'created_at': FieldValue.serverTimestamp(),
+      });
+      final DocumentSnapshot initialSnapshot = await ref.get();
+      expect(initialSnapshot.data['message'], 'testing');
+      final dynamic result = await firestore.runTransaction(
+        (Transaction tx) async {
+          final DocumentSnapshot snapshot = await tx.get(ref);
+          final Map<String, dynamic> updatedData =
+              Map<String, dynamic>.from(snapshot.data);
+          updatedData['message'] = 'testing2';
+          await tx.update(ref, updatedData);
+          return updatedData;
+        },
+      );
+      expect(result['message'], 'testing2');
+      await ref.delete();
+      final DocumentSnapshot nonexistentSnapshot = await ref.get();
+      expect(nonexistentSnapshot.data, null);
+      expect(nonexistentSnapshot.exists, false);
+    });
   });
 }
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 22b0b162814c..afb5a13e1fce 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.13
+version: 0.9.13+1
 
 flutter:
   plugin:
diff --git a/packages/firebase_database/CHANGELOG.md b/packages/firebase_database/CHANGELOG.md
index 7f8995ccbb4b..a4c9e6ff9146 100644
--- a/packages/firebase_database/CHANGELOG.md
+++ b/packages/firebase_database/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.2+1
+
+* Added an integration test for transactions.
+
 ## 2.0.2
 
 * Fix the issue that `getDictionaryFromError` always returns non nil result even when the parameter is nil.
diff --git a/packages/firebase_database/example/pubspec.yaml b/packages/firebase_database/example/pubspec.yaml
index 2d182410e2e4..881e8af2cc5a 100755
--- a/packages/firebase_database/example/pubspec.yaml
+++ b/packages/firebase_database/example/pubspec.yaml
@@ -8,5 +8,10 @@ dependencies:
     path: ../
   firebase_core: ^0.3.0
 
+dev_dependencies:
+  flutter_driver:
+    sdk: flutter
+  test: any
+
 flutter:
   uses-material-design: true
diff --git a/packages/firebase_database/example/test_driver/firebase_database.dart b/packages/firebase_database/example/test_driver/firebase_database.dart
new file mode 100644
index 000000000000..c40cc0823d90
--- /dev/null
+++ b/packages/firebase_database/example/test_driver/firebase_database.dart
@@ -0,0 +1,27 @@
+import 'dart:async';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:firebase_database/firebase_database.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('$FirebaseDatabase', () {
+    final FirebaseDatabase database = FirebaseDatabase.instance;
+
+    test('runTransaction', () async {
+      final DatabaseReference ref = database.reference().child('counter');
+      final DataSnapshot snapshot = await ref.once();
+      final int value = snapshot.value ?? 0;
+      final TransactionResult transactionResult =
+          await ref.runTransaction((MutableData mutableData) async {
+        mutableData.value = (mutableData.value ?? 0) + 1;
+        return mutableData;
+      });
+      expect(transactionResult.committed, true);
+      expect(transactionResult.dataSnapshot.value > value, true);
+    });
+  });
+}
diff --git a/packages/firebase_database/example/test_driver/firebase_database_test.dart b/packages/firebase_database/example/test_driver/firebase_database_test.dart
new file mode 100644
index 000000000000..08cdadbd0809
--- /dev/null
+++ b/packages/firebase_database/example/test_driver/firebase_database_test.dart
@@ -0,0 +1,10 @@
+import 'package:flutter_driver/flutter_driver.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('FirebaseDatabase driver test', () async {
+    final FlutterDriver driver = await FlutterDriver.connect();
+    await driver.requestData(null, timeout: const Duration(minutes: 1));
+    driver.close();
+  });
+}
diff --git a/packages/firebase_database/pubspec.yaml b/packages/firebase_database/pubspec.yaml
index d0f669868ba8..0412d394ad61 100755
--- a/packages/firebase_database/pubspec.yaml
+++ b/packages/firebase_database/pubspec.yaml
@@ -21,6 +21,8 @@ dev_dependencies:
   mockito: ^3.0.0
   flutter_test:
     sdk: flutter
+  flutter_driver:
+    sdk: flutter
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"

From 7a49ba784c2428bf2c357b7d002f932484d60618 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Tue, 9 Apr 2019 20:07:49 -0700
Subject: [PATCH 318/410] [package_info] Integration tests. (#1473)

Create integration test for package_info.
---
 packages/package_info/CHANGELOG.md            |  4 +++
 packages/package_info/example/pubspec.yaml    |  5 +++
 .../example/test_driver/package_info.dart     | 31 +++++++++++++++++++
 .../test_driver/package_info_test.dart        | 10 ++++++
 packages/package_info/pubspec.yaml            |  9 +++++-
 5 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 packages/package_info/example/test_driver/package_info.dart
 create mode 100644 packages/package_info/example/test_driver/package_info_test.dart

diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md
index 404108cf7cb7..5261437cf878 100644
--- a/packages/package_info/CHANGELOG.md
+++ b/packages/package_info/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0+3
+
+* Add integration test.
+
 ## 0.4.0+2
 
 * Android: Using new method for BuildNumber in new android versions
diff --git a/packages/package_info/example/pubspec.yaml b/packages/package_info/example/pubspec.yaml
index 8c0141f5b522..e4844cd95648 100644
--- a/packages/package_info/example/pubspec.yaml
+++ b/packages/package_info/example/pubspec.yaml
@@ -7,5 +7,10 @@ dependencies:
   package_info:
     path: ../
 
+dev_dependencies:
+  flutter_driver:
+    sdk: flutter
+  test: any
+
 flutter:
   uses-material-design: true
diff --git a/packages/package_info/example/test_driver/package_info.dart b/packages/package_info/example/test_driver/package_info.dart
new file mode 100644
index 000000000000..97c2db6363c7
--- /dev/null
+++ b/packages/package_info/example/test_driver/package_info.dart
@@ -0,0 +1,31 @@
+import 'dart:async';
+import 'dart:io';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:package_info/package_info.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('package_info test driver', () {
+    test('test package info result', () async {
+      final PackageInfo info = await PackageInfo.fromPlatform();
+      // These tests are based on the example app. The tests should be updated if any related info changes.
+      if (Platform.isAndroid) {
+        expect(info.appName, 'package_info_example');
+        expect(info.buildNumber, '1');
+        expect(info.packageName, 'io.flutter.plugins.packageinfoexample');
+        expect(info.version, '1.0');
+      } else if (Platform.isIOS) {
+        expect(info.appName, 'Package Info Example');
+        expect(info.buildNumber, '1');
+        expect(info.packageName, 'io.flutter.plugins.packageInfoExample');
+        expect(info.version, '1.0');
+      } else {
+        throw (UnsupportedError('platform not supported'));
+      }
+    });
+  });
+}
diff --git a/packages/package_info/example/test_driver/package_info_test.dart b/packages/package_info/example/test_driver/package_info_test.dart
new file mode 100644
index 000000000000..c1d690c17ee3
--- /dev/null
+++ b/packages/package_info/example/test_driver/package_info_test.dart
@@ -0,0 +1,10 @@
+import 'package:flutter_driver/flutter_driver.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('package_info', () async {
+    final FlutterDriver driver = await FlutterDriver.connect();
+    await driver.requestData(null, timeout: const Duration(minutes: 1));
+    driver.close();
+  });
+}
diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml
index 61d94f00f4b8..0d7d70f0cdf7 100644
--- a/packages/package_info/pubspec.yaml
+++ b/packages/package_info/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for querying information about the application
   package, such as CFBundleVersion on iOS or versionCode on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/package_info
-version: 0.4.0+2
+version: 0.4.0+3
 
 flutter:
   plugin:
@@ -14,6 +14,13 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
+  
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  test: any
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"

From d21fece1d75e9a9e47906e086356b5f06c5b45d0 Mon Sep 17 00:00:00 2001
From: Artem Sheremet <dot.doom@gmail.com>
Date: Wed, 10 Apr 2019 17:40:50 +0200
Subject: [PATCH 319/410] [firebase_database]Return error message from
 DatabaseError#toString() (#1096)

---
 packages/firebase_database/CHANGELOG.md                     | 4 ++++
 packages/firebase_database/lib/src/event.dart               | 3 +++
 packages/firebase_database/pubspec.yaml                     | 2 +-
 packages/firebase_database/test/firebase_database_test.dart | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_database/CHANGELOG.md b/packages/firebase_database/CHANGELOG.md
index a4c9e6ff9146..82a5e30879da 100644
--- a/packages/firebase_database/CHANGELOG.md
+++ b/packages/firebase_database/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.3
+
+* Provide a `toString` implementation for `DatabaseError`.
+
 ## 2.0.2+1
 
 * Added an integration test for transactions.
diff --git a/packages/firebase_database/lib/src/event.dart b/packages/firebase_database/lib/src/event.dart
index 59d3c55950ac..2d240f29c9ef 100644
--- a/packages/firebase_database/lib/src/event.dart
+++ b/packages/firebase_database/lib/src/event.dart
@@ -67,4 +67,7 @@ class DatabaseError {
 
   /// Human-readable details on the error and additional information.
   String get details => _data['details'];
+
+  @override
+  String toString() => "$runtimeType($code, $message, $details)";
 }
diff --git a/packages/firebase_database/pubspec.yaml b/packages/firebase_database/pubspec.yaml
index 0412d394ad61..6c513aead36a 100755
--- a/packages/firebase_database/pubspec.yaml
+++ b/packages/firebase_database/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Database, a cloud-hosted NoSQL database
   with realtime data syncing across Android and iOS clients, and offline access.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_database
-version: 2.0.2
+version: 2.0.3
 
 flutter:
   plugin:
diff --git a/packages/firebase_database/test/firebase_database_test.dart b/packages/firebase_database/test/firebase_database_test.dart
index 653fc2a484ea..9aa56f0ec19a 100755
--- a/packages/firebase_database/test/firebase_database_test.dart
+++ b/packages/firebase_database/test/firebase_database_test.dart
@@ -483,6 +483,7 @@ void main() {
         final DatabaseError error1 = await errors.remove();
         final DatabaseError error2 = await errors.remove();
         subscription.cancel();
+        expect(error1.toString(), 'DatabaseError(12, Bad foo, Some details)');
         expect(error1.code, errorCode);
         expect(error1.message, 'Bad foo');
         expect(error1.details, errorDetails);

From d1ad723a4f346455237c381e7829787252ea94f7 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Wed, 10 Apr 2019 10:18:35 -0700
Subject: [PATCH 320/410] [in_app_purchase]remove SKDownloadWrapper and related
 code. (#1474)

Since the decision to have Apple hosted content related features has not been made yet. We remove the SKDownloadWrapper and related code for now.
---
 .../purchase_wrapper.g.dart                   |  34 ++++-
 .../sku_details_wrapper.g.dart                |  43 +++++-
 .../app_store_connection.dart                 |   2 -
 .../sk_download_wrapper.dart                  | 127 ------------------
 .../sk_download_wrapper.g.dart                |  66 ---------
 .../sk_payment_queue_wrapper.dart             |  18 ---
 .../sk_payment_queue_wrapper.g.dart           |   5 +-
 .../sk_payment_transaction_wrappers.dart      |  15 ---
 .../sk_payment_transaction_wrappers.g.dart    |   4 -
 .../lib/store_kit_wrappers.dart               |   1 -
 .../app_store_connection_test.dart            |   5 -
 .../sk_methodchannel_apis_test.dart           |   2 -
 .../store_kit_wrappers/sk_product_test.dart   |   6 -
 .../sk_test_stub_objects.dart                 |  34 +----
 14 files changed, 70 insertions(+), 292 deletions(-)
 delete mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.dart
 delete mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.g.dart

diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart
index 4af4b6992587..5504083da3ef 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart
@@ -32,8 +32,8 @@ Map<String, dynamic> _$PurchaseWrapperToJson(PurchaseWrapper instance) =>
 
 PurchasesResultWrapper _$PurchasesResultWrapperFromJson(Map json) {
   return PurchasesResultWrapper(
-      responseCode: const BillingResponseConverter()
-          .fromJson(json['responseCode'] as int),
+      responseCode:
+          _$enumDecode(_$BillingResponseEnumMap, json['responseCode']),
       purchasesList: (json['purchasesList'] as List)
           .map((e) => PurchaseWrapper.fromJson(e as Map))
           .toList());
@@ -42,7 +42,33 @@ PurchasesResultWrapper _$PurchasesResultWrapperFromJson(Map json) {
 Map<String, dynamic> _$PurchasesResultWrapperToJson(
         PurchasesResultWrapper instance) =>
     <String, dynamic>{
-      'responseCode':
-          const BillingResponseConverter().toJson(instance.responseCode),
+      'responseCode': _$BillingResponseEnumMap[instance.responseCode],
       'purchasesList': instance.purchasesList
     };
+
+T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    throw ArgumentError('A value must be provided. Supported values: '
+        '${enumValues.values.join(', ')}');
+  }
+  return enumValues.entries
+      .singleWhere((e) => e.value == source,
+          orElse: () => throw ArgumentError(
+              '`$source` is not one of the supported values: '
+              '${enumValues.values.join(', ')}'))
+      .key;
+}
+
+const _$BillingResponseEnumMap = <BillingResponse, dynamic>{
+  BillingResponse.featureNotSupported: -2,
+  BillingResponse.serviceDisconnected: -1,
+  BillingResponse.ok: 0,
+  BillingResponse.userCanceled: 1,
+  BillingResponse.serviceUnavailable: 2,
+  BillingResponse.billingUnavailable: 3,
+  BillingResponse.itemUnavailable: 4,
+  BillingResponse.developerError: 5,
+  BillingResponse.error: 6,
+  BillingResponse.itemAlreadyOwned: 7,
+  BillingResponse.itemNotOwned: 8
+};
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
index 3d059834a4f7..087818dcef52 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
@@ -20,7 +20,7 @@ SkuDetailsWrapper _$SkuDetailsWrapperFromJson(Map json) {
       sku: json['sku'] as String,
       subscriptionPeriod: json['subscriptionPeriod'] as String,
       title: json['title'] as String,
-      type: const SkuTypeConverter().fromJson(json['type'] as String),
+      type: _$enumDecode(_$SkuTypeEnumMap, json['type']),
       isRewarded: json['isRewarded'] as bool);
 }
 
@@ -38,14 +38,32 @@ Map<String, dynamic> _$SkuDetailsWrapperToJson(SkuDetailsWrapper instance) =>
       'sku': instance.sku,
       'subscriptionPeriod': instance.subscriptionPeriod,
       'title': instance.title,
-      'type': const SkuTypeConverter().toJson(instance.type),
+      'type': _$SkuTypeEnumMap[instance.type],
       'isRewarded': instance.isRewarded
     };
 
+T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
+  if (source == null) {
+    throw ArgumentError('A value must be provided. Supported values: '
+        '${enumValues.values.join(', ')}');
+  }
+  return enumValues.entries
+      .singleWhere((e) => e.value == source,
+          orElse: () => throw ArgumentError(
+              '`$source` is not one of the supported values: '
+              '${enumValues.values.join(', ')}'))
+      .key;
+}
+
+const _$SkuTypeEnumMap = <SkuType, dynamic>{
+  SkuType.inapp: 'inapp',
+  SkuType.subs: 'subs'
+};
+
 SkuDetailsResponseWrapper _$SkuDetailsResponseWrapperFromJson(Map json) {
   return SkuDetailsResponseWrapper(
-      responseCode: const BillingResponseConverter()
-          .fromJson(json['responseCode'] as int),
+      responseCode:
+          _$enumDecode(_$BillingResponseEnumMap, json['responseCode']),
       skuDetailsList: (json['skuDetailsList'] as List)
           .map((e) => SkuDetailsWrapper.fromJson(e as Map))
           .toList());
@@ -54,7 +72,20 @@ SkuDetailsResponseWrapper _$SkuDetailsResponseWrapperFromJson(Map json) {
 Map<String, dynamic> _$SkuDetailsResponseWrapperToJson(
         SkuDetailsResponseWrapper instance) =>
     <String, dynamic>{
-      'responseCode':
-          const BillingResponseConverter().toJson(instance.responseCode),
+      'responseCode': _$BillingResponseEnumMap[instance.responseCode],
       'skuDetailsList': instance.skuDetailsList
     };
+
+const _$BillingResponseEnumMap = <BillingResponse, dynamic>{
+  BillingResponse.featureNotSupported: -2,
+  BillingResponse.serviceDisconnected: -1,
+  BillingResponse.ok: 0,
+  BillingResponse.userCanceled: 1,
+  BillingResponse.serviceUnavailable: 2,
+  BillingResponse.billingUnavailable: 3,
+  BillingResponse.itemUnavailable: 4,
+  BillingResponse.developerError: 5,
+  BillingResponse.error: 6,
+  BillingResponse.itemAlreadyOwned: 7,
+  BillingResponse.itemNotOwned: 8
+};
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
index 03f551d631f5..962ed3d586a6 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
@@ -206,8 +206,6 @@ class _TransactionObserver implements SKTransactionObserverWrapper {
     _restoreCompleter.complete(_restoredTransactions ?? []);
   }
 
-  void updatedDownloads({List<SKDownloadWrapper> downloads}) {}
-
   bool shouldAddStorePayment(
       {SKPaymentWrapper payment, SKProductWrapper product}) {
     // In this unified API, we always return true to keep it consistent with the behavior on Google Play.
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.dart
deleted file mode 100644
index 356e0c9cf467..000000000000
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.dart
+++ /dev/null
@@ -1,127 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:json_annotation/json_annotation.dart';
-import 'sk_payment_transaction_wrappers.dart';
-import 'sk_payment_queue_wrapper.dart';
-
-part 'sk_download_wrapper.g.dart';
-
-/// Dart wrapper around StoreKit's [SKDownload](https://developer.apple.com/documentation/storekit/skdownload?language=objc).
-///
-/// When a product is created in the App Store Connect, one or more download contents can be associated with it.
-/// When the product is purchased, a List of [SKDownloadWrapper] object will be present in an [SKPaymentTransactionWrapper] object.
-/// To download the content, add the [SKDownloadWrapper] objects to the payment queue and wait for the content to be downloaded.
-/// You can also read the [contentURL] to get the URL of the downloaded content after the download completes.
-/// Note that all downloaded files must be processed before the completion of the [SKPaymentTransactionWrapper]([SKPaymentQueueWrapper.finishTransaction] is called).
-/// After the transaction is complete, any [SKDownloadWrapper] object in the transaction will not be able to be added to the payment queue
-/// and the [contentURL ]of the [SKDownloadWrapper] object will be invalid.
-@JsonSerializable(nullable: true)
-class SKDownloadWrapper {
-  SKDownloadWrapper({
-    @required this.contentIdentifier,
-    @required this.state,
-    @required this.contentLength,
-    @required this.contentURL,
-    @required this.contentVersion,
-    @required this.transactionID,
-    @required this.progress,
-    @required this.timeRemaining,
-    @required this.downloadTimeUnknown,
-    @required this.error,
-  });
-
-  /// Constructs an instance of this from a key value map of data.
-  ///
-  /// The map needs to have named string keys with values matching the names and
-  /// types of all of the members on this class.
-  /// The `map` parameter must not be null.
-  factory SKDownloadWrapper.fromJson(Map map) {
-    assert(map != null);
-    return _$SKDownloadWrapperFromJson(map);
-  }
-
-  /// Identifies the downloadable content.
-  ///
-  /// It is specified in the App Store Connect when the downloadable content is created.
-  final String contentIdentifier;
-
-  /// The current download state.
-  ///
-  /// When the state changes, one of the [SKTransactionObserverWrapper] subclasses' observing methods should be triggered.
-  /// The developer should properly handle the downloadable content based on the state.
-  final SKDownloadState state;
-
-  /// Length of the content in bytes.
-  final int contentLength;
-
-  /// The URL string of the content.
-  final String contentURL;
-
-  /// Version of the content formatted as a series of dot-separated integers.
-  final String contentVersion;
-
-  /// The transaction ID of the transaction that is associated with the downloadable content.
-  final String transactionID;
-
-  /// The download progress, between 0.0 to 1.0.
-  final double progress;
-
-  /// The estimated time remaining for the download; if no good estimate is able to be made,
-  /// [downloadTimeUnknown] will be set to true.
-  final double timeRemaining;
-
-  /// true if [timeRemaining] cannot be estimated.
-  final bool downloadTimeUnknown;
-
-  /// The error that prevented the downloading; only available if the [transactionState] is [SKPaymentTransactionStateWrapper.failed].
-  final SKError error;
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(other, this)) {
-      return true;
-    }
-    if (other.runtimeType != runtimeType) {
-      return false;
-    }
-    final SKDownloadWrapper typedOther = other;
-    return typedOther.contentIdentifier == contentIdentifier &&
-        typedOther.state == state &&
-        typedOther.contentLength == contentLength &&
-        typedOther.contentURL == contentURL &&
-        typedOther.contentVersion == contentVersion &&
-        typedOther.transactionID == transactionID &&
-        typedOther.progress == progress &&
-        typedOther.timeRemaining == timeRemaining &&
-        typedOther.downloadTimeUnknown == downloadTimeUnknown &&
-        typedOther.error == error;
-  }
-}
-
-/// Dart wrapper around StoreKit's [SKDownloadState](https://developer.apple.com/documentation/storekit/skdownloadstate?language=objc).
-///
-/// The state a download operation that can be in.
-enum SKDownloadState {
-  /// Indicates that downloadable content is waiting to start.
-  @JsonValue(0)
-  waiting,
-
-  /// The downloadable content is currently being downloaded
-  @JsonValue(1)
-  active,
-
-  /// The app paused the download.
-  @JsonValue(2)
-  pause,
-
-  /// The content is successfully downloaded.
-  @JsonValue(3)
-  finished,
-
-  /// Indicates that some error occurred while the content was being downloaded.
-  @JsonValue(4)
-  failed,
-
-  /// The app canceled the download.
-  @JsonValue(5)
-  cancelled,
-}
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.g.dart
deleted file mode 100644
index cc61e4983728..000000000000
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_download_wrapper.g.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'sk_download_wrapper.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-SKDownloadWrapper _$SKDownloadWrapperFromJson(Map json) {
-  return SKDownloadWrapper(
-      contentIdentifier: json['contentIdentifier'] as String,
-      state: _$enumDecodeNullable(_$SKDownloadStateEnumMap, json['state']),
-      contentLength: json['contentLength'] as int,
-      contentURL: json['contentURL'] as String,
-      contentVersion: json['contentVersion'] as String,
-      transactionID: json['transactionID'] as String,
-      progress: (json['progress'] as num)?.toDouble(),
-      timeRemaining: (json['timeRemaining'] as num)?.toDouble(),
-      downloadTimeUnknown: json['downloadTimeUnknown'] as bool,
-      error: json['error'] == null
-          ? null
-          : SKError.fromJson(json['error'] as Map));
-}
-
-Map<String, dynamic> _$SKDownloadWrapperToJson(SKDownloadWrapper instance) =>
-    <String, dynamic>{
-      'contentIdentifier': instance.contentIdentifier,
-      'state': _$SKDownloadStateEnumMap[instance.state],
-      'contentLength': instance.contentLength,
-      'contentURL': instance.contentURL,
-      'contentVersion': instance.contentVersion,
-      'transactionID': instance.transactionID,
-      'progress': instance.progress,
-      'timeRemaining': instance.timeRemaining,
-      'downloadTimeUnknown': instance.downloadTimeUnknown,
-      'error': instance.error
-    };
-
-T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
-  if (source == null) {
-    throw ArgumentError('A value must be provided. Supported values: '
-        '${enumValues.values.join(', ')}');
-  }
-  return enumValues.entries
-      .singleWhere((e) => e.value == source,
-          orElse: () => throw ArgumentError(
-              '`$source` is not one of the supported values: '
-              '${enumValues.values.join(', ')}'))
-      .key;
-}
-
-T _$enumDecodeNullable<T>(Map<T, dynamic> enumValues, dynamic source) {
-  if (source == null) {
-    return null;
-  }
-  return _$enumDecode<T>(enumValues, source);
-}
-
-const _$SKDownloadStateEnumMap = <SKDownloadState, dynamic>{
-  SKDownloadState.waiting: 0,
-  SKDownloadState.active: 1,
-  SKDownloadState.pause: 2,
-  SKDownloadState.finished: 3,
-  SKDownloadState.failed: 4,
-  SKDownloadState.cancelled: 5
-};
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
index 89f42105fdfd..ea0caaba3c37 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
@@ -10,7 +10,6 @@ import 'package:json_annotation/json_annotation.dart';
 import 'package:flutter/services.dart';
 import 'sk_payment_transaction_wrappers.dart';
 import 'sk_product_wrapper.dart';
-import 'sk_download_wrapper.dart';
 
 part 'sk_payment_queue_wrapper.g.dart';
 
@@ -132,14 +131,6 @@ class SKPaymentQueueWrapper {
             _observer.paymentQueueRestoreCompletedTransactionsFinished();
           });
         }
-      case 'updatedDownloads':
-        {
-          final List<SKDownloadWrapper> downloads =
-              _getDownloadList(call.arguments);
-          return Future<void>(() {
-            _observer.updatedDownloads(downloads: downloads);
-          });
-        }
       case 'shouldAddStorePayment':
         {
           SKPaymentWrapper payment =
@@ -168,15 +159,6 @@ class SKPaymentQueueWrapper {
         .toList();
     return transactions;
   }
-
-  // Get download wrapper object list from arguments.
-  List<SKDownloadWrapper> _getDownloadList(dynamic arguments) {
-    final List<SKDownloadWrapper> downloads = arguments
-        .map<SKDownloadWrapper>(
-            (dynamic map) => SKDownloadWrapper.fromJson(map))
-        .toList();
-    return downloads;
-  }
 }
 
 /// Dart wrapper around StoreKit's [NSError](https://developer.apple.com/documentation/foundation/nserror?language=objc).
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
index 3452a5b6cc2a..d2a9d514dcac 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
@@ -10,9 +10,8 @@ SKError _$SKErrorFromJson(Map json) {
   return SKError(
       code: json['code'] as int,
       domain: json['domain'] as String,
-      userInfo: (json['userInfo'] as Map)?.map(
-        (k, e) => MapEntry(k as String, e),
-      ));
+      userInfo:
+          (json['userInfo'] as Map)?.map((k, e) => MapEntry(k as String, e)));
 }
 
 Map<String, dynamic> _$SKErrorToJson(SKError instance) => <String, dynamic>{
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
index 105d7f4fd8c0..08c77247430d 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'sk_product_wrapper.dart';
-import 'sk_download_wrapper.dart';
 import 'sk_payment_queue_wrapper.dart';
 import 'enum_converters.dart';
 
@@ -29,9 +27,6 @@ abstract class SKTransactionObserverWrapper {
   /// Triggered when payment queue has finished sending restored transactions.
   void paymentQueueRestoreCompletedTransactionsFinished();
 
-  /// Triggered when any download objects are updated.
-  void updatedDownloads({List<SKDownloadWrapper> downloads});
-
   /// Triggered when a user initiated an in-app purchase from App Store.
   ///
   /// Return `true` to continue the transaction in your app. If you have multiple [SKTransactionObserverWrapper]s, the transaction
@@ -87,7 +82,6 @@ class SKPaymentTransactionWrapper {
     @required this.originalTransaction,
     @required this.transactionTimeStamp,
     @required this.transactionIdentifier,
-    @required this.downloads,
     @required this.error,
   });
 
@@ -147,14 +141,6 @@ class SKPaymentTransactionWrapper {
   /// The value of this string corresponds to the same property in the receipt.
   final String transactionIdentifier;
 
-  /// An array of the [SKDownloadWrapper] object of this transaction.
-  ///
-  /// Only available if the transaction contains downloadable contents.
-  ///
-  /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased].
-  /// Must be used to download the transaction's content before the transaction is finished.
-  final List<SKDownloadWrapper> downloads;
-
   /// The error object, only available if the [transactionState] is [SKPaymentTransactionStateWrapper.failed].
   final SKError error;
 
@@ -172,7 +158,6 @@ class SKPaymentTransactionWrapper {
         typedOther.originalTransaction == originalTransaction &&
         typedOther.transactionTimeStamp == transactionTimeStamp &&
         typedOther.transactionIdentifier == transactionIdentifier &&
-        DeepCollectionEquality().equals(typedOther.downloads, downloads) &&
         typedOther.error == error;
   }
 
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.g.dart
index cbd72da1702e..c2d859c5108b 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.g.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.g.dart
@@ -19,9 +19,6 @@ SKPaymentTransactionWrapper _$SKPaymentTransactionWrapperFromJson(Map json) {
               json['originalTransaction'] as Map),
       transactionTimeStamp: (json['transactionTimeStamp'] as num)?.toDouble(),
       transactionIdentifier: json['transactionIdentifier'] as String,
-      downloads: (json['downloads'] as List)
-          ?.map((e) => e == null ? null : SKDownloadWrapper.fromJson(e as Map))
-          ?.toList(),
       error: json['error'] == null
           ? null
           : SKError.fromJson(json['error'] as Map));
@@ -36,7 +33,6 @@ Map<String, dynamic> _$SKPaymentTransactionWrapperToJson(
       'originalTransaction': instance.originalTransaction,
       'transactionTimeStamp': instance.transactionTimeStamp,
       'transactionIdentifier': instance.transactionIdentifier,
-      'downloads': instance.downloads,
       'error': instance.error
     };
 
diff --git a/packages/in_app_purchase/lib/store_kit_wrappers.dart b/packages/in_app_purchase/lib/store_kit_wrappers.dart
index b5a21b5defb4..12af4ba0a18f 100644
--- a/packages/in_app_purchase/lib/store_kit_wrappers.dart
+++ b/packages/in_app_purchase/lib/store_kit_wrappers.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-export 'src/store_kit_wrappers/sk_download_wrapper.dart';
 export 'src/store_kit_wrappers/sk_payment_queue_wrapper.dart';
 export 'src/store_kit_wrappers/sk_payment_transaction_wrappers.dart';
 export 'src/store_kit_wrappers/sk_product_wrapper.dart';
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
index 2dc32f782ee6..4f44712e0a05 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
@@ -287,7 +287,6 @@ class FakeIOSPlatform {
       originalTransaction: dummyTransaction,
       transactionTimeStamp: 123123123.022,
       transactionState: SKPaymentTransactionStateWrapper.restored,
-      downloads: null,
       error: null,
     );
     SKPaymentTransactionWrapper tran2 = SKPaymentTransactionWrapper(
@@ -296,7 +295,6 @@ class FakeIOSPlatform {
       originalTransaction: dummyTransaction,
       transactionTimeStamp: 123123123.022,
       transactionState: SKPaymentTransactionStateWrapper.restored,
-      downloads: null,
       error: null,
     );
 
@@ -314,7 +312,6 @@ class FakeIOSPlatform {
         transactionTimeStamp: 123123.121,
         transactionIdentifier: id,
         error: null,
-        downloads: null,
         originalTransaction: null);
   }
 
@@ -326,7 +323,6 @@ class FakeIOSPlatform {
         transactionTimeStamp: 123123.121,
         transactionIdentifier: id,
         error: null,
-        downloads: null,
         originalTransaction: null);
   }
 
@@ -340,7 +336,6 @@ class FakeIOSPlatform {
             code: 0,
             domain: 'ios_domain',
             userInfo: {'message': 'an error message'}),
-        downloads: null,
         originalTransaction: null);
   }
 
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart
index e908c5afffd3..cc259f972a0e 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_methodchannel_apis_test.dart
@@ -177,8 +177,6 @@ class TestPaymentTransactionObserver extends SKTransactionObserverWrapper {
 
   void paymentQueueRestoreCompletedTransactionsFinished() {}
 
-  void updatedDownloads({List<SKDownloadWrapper> downloads}) {}
-
   bool shouldAddStorePayment(
       {SKPaymentWrapper payment, SKProductWrapper product}) {
     return true;
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
index a426b94920cb..6ed5e84903cd 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
@@ -121,12 +121,6 @@ void main() {
       expect(error, equals(dummyError));
     });
 
-    test('Should construct correct SKDownloadWrapper from json', () {
-      SKDownloadWrapper download =
-          SKDownloadWrapper.fromJson(buildDownloadMap(dummyDownload));
-      expect(download, equals(dummyDownload));
-    });
-
     test('Should construct correct SKTransactionWrapper from json', () {
       SKPaymentTransactionWrapper transaction =
           SKPaymentTransactionWrapper.fromJson(
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_test_stub_objects.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_test_stub_objects.dart
index 7fc8363d21ad..af2a881277c9 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_test_stub_objects.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_test_stub_objects.dart
@@ -12,18 +12,7 @@ final dummyPayment = SKPaymentWrapper(
     simulatesAskToBuyInSandbox: true);
 final SKError dummyError =
     SKError(code: 111, domain: 'dummy-domain', userInfo: {'key': 'value'});
-final SKDownloadWrapper dummyDownload = SKDownloadWrapper(
-  contentIdentifier: 'id',
-  state: SKDownloadState.failed,
-  contentLength: 32,
-  contentURL: 'https://download.com',
-  contentVersion: '0.0.1',
-  transactionID: 'tranID',
-  progress: 0.6,
-  timeRemaining: 1231231,
-  downloadTimeUnknown: false,
-  error: dummyError,
-);
+
 final SKPaymentTransactionWrapper dummyOriginalTransaction =
     SKPaymentTransactionWrapper(
   transactionState: SKPaymentTransactionStateWrapper.purchased,
@@ -31,7 +20,6 @@ final SKPaymentTransactionWrapper dummyOriginalTransaction =
   originalTransaction: null,
   transactionTimeStamp: 1231231231.00,
   transactionIdentifier: '123123',
-  downloads: [dummyDownload],
   error: dummyError,
 );
 final SKPaymentTransactionWrapper dummyTransaction =
@@ -41,7 +29,6 @@ final SKPaymentTransactionWrapper dummyTransaction =
   originalTransaction: dummyOriginalTransaction,
   transactionTimeStamp: 1231231231.00,
   transactionIdentifier: '123123',
-  downloads: [dummyDownload],
   error: dummyError,
 );
 
@@ -142,21 +129,6 @@ Map<String, dynamic> buildErrorMap(SKError error) {
   };
 }
 
-Map<String, dynamic> buildDownloadMap(SKDownloadWrapper download) {
-  return {
-    'contentIdentifier': download.contentIdentifier,
-    'state': SKDownloadState.values.indexOf(download.state),
-    'contentLength': download.contentLength,
-    'contentURL': download.contentURL,
-    'contentVersion': download.contentVersion,
-    'transactionID': download.transactionID,
-    'progress': download.progress,
-    'timeRemaining': download.timeRemaining,
-    'downloadTimeUnknown': download.downloadTimeUnknown,
-    'error': buildErrorMap(download.error)
-  };
-}
-
 Map<String, dynamic> buildTransactionMap(
     SKPaymentTransactionWrapper transaction) {
   if (transaction == null) {
@@ -171,9 +143,5 @@ Map<String, dynamic> buildTransactionMap(
     'transactionIdentifier': transaction.transactionIdentifier,
     'error': buildErrorMap(transaction.error),
   };
-  List downloadList = transaction.downloads.map((SKDownloadWrapper download) {
-    return buildDownloadMap(download);
-  }).toList();
-  map['downloads'] = downloadList;
   return map;
 }

From af27685b867f828ff9143e9d522d6c6486891dbc Mon Sep 17 00:00:00 2001
From: Aawaz Gyawali <awazgyawali@gmail.com>
Date: Thu, 11 Apr 2019 02:47:19 +0545
Subject: [PATCH 321/410] [google_maps_flutter] Widget based polyline support
 for google maps. (#1049)

- Adds supports for polylines.
---
 AUTHORS                                       |   2 +
 packages/google_maps_flutter/CHANGELOG.md     |   4 +
 .../flutter/plugins/googlemaps/Convert.java   | 147 ++++++++-
 .../plugins/googlemaps/GoogleMapBuilder.java  |   7 +
 .../googlemaps/GoogleMapController.java       |  46 ++-
 .../plugins/googlemaps/GoogleMapFactory.java  |   3 +
 .../googlemaps/GoogleMapOptionsSink.java      |   2 +
 .../plugins/googlemaps/MarkersController.java |   4 +-
 .../plugins/googlemaps/PolylineBuilder.java   |  80 +++++
 .../googlemaps/PolylineController.java        |  88 +++++
 .../googlemaps/PolylineOptionsSink.java       |  32 ++
 .../googlemaps/PolylinesController.java       | 112 +++++++
 .../google_maps_flutter/example/lib/main.dart |   2 +
 .../example/lib/place_polyline.dart           | 304 ++++++++++++++++++
 .../ios/Classes/GoogleMapController.h         |  13 +-
 .../ios/Classes/GoogleMapController.m         |  26 ++
 .../ios/Classes/GoogleMapMarkerController.m   |   4 +
 .../ios/Classes/GoogleMapPolylineController.h |  35 ++
 .../ios/Classes/GoogleMapPolylineController.m | 175 ++++++++++
 .../ios/Classes/GoogleMapsPlugin.h            |   1 +
 .../ios/Classes/GoogleMapsPlugin.m            |   2 -
 .../ios/Classes/JsonConversions.h             |   3 +
 .../ios/Classes/JsonConversions.m             |  28 +-
 .../lib/google_maps_flutter.dart              |   5 +
 packages/google_maps_flutter/lib/src/cap.dart |  48 +++
 .../lib/src/controller.dart                   |  20 ++
 .../lib/src/google_map.dart                   |  21 ++
 .../lib/src/joint_type.dart                   |  25 ++
 .../lib/src/pattern_item.dart                 |  29 ++
 .../google_maps_flutter/lib/src/polyline.dart | 232 +++++++++++++
 .../lib/src/polyline_updates.dart             |  92 ++++++
 packages/google_maps_flutter/pubspec.yaml     |   2 +-
 .../test/fake_maps_controllers.dart           |  60 ++++
 .../test/polyline_updates_test.dart           | 200 ++++++++++++
 34 files changed, 1831 insertions(+), 23 deletions(-)
 create mode 100644 packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineBuilder.java
 create mode 100644 packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineController.java
 create mode 100644 packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineOptionsSink.java
 create mode 100644 packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylinesController.java
 create mode 100644 packages/google_maps_flutter/example/lib/place_polyline.dart
 create mode 100644 packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.h
 create mode 100644 packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.m
 create mode 100644 packages/google_maps_flutter/lib/src/cap.dart
 create mode 100644 packages/google_maps_flutter/lib/src/joint_type.dart
 create mode 100644 packages/google_maps_flutter/lib/src/pattern_item.dart
 create mode 100644 packages/google_maps_flutter/lib/src/polyline.dart
 create mode 100644 packages/google_maps_flutter/lib/src/polyline_updates.dart
 create mode 100644 packages/google_maps_flutter/test/polyline_updates_test.dart

diff --git a/AUTHORS b/AUTHORS
index 0ab7d0298832..f497b6c6ad5d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,8 @@ Sarthak Verma <sarthak@artiosys.com>
 Mike Diarmid <mike@invertase.io>
 Invertase <oss@invertase.io>
 Elliot Hesp <elliot@invertase.io>
+Aawaz Gyawali <awazgyawali@gmail.com>
+EUI Limited <ian.evans3@admiralgroup.co.uk>
 Katarina Sheremet <katarina@sheremet.ch>
 Thomas Stockx <thomas@stockxit.com>
 Sarbagya Dhaubanjar <sarbagyastha@gmail.com>
diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 1ef4a154364e..fe9a33b97b65 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.6
+
+* Add support for Polylines on GoogleMap.
+
 ## 0.5.5
 
 * Enable iOS accessibility.
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
index 5ced8142beb6..dc400fb602e3 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
@@ -11,10 +11,20 @@
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+import com.google.android.gms.maps.model.ButtCap;
 import com.google.android.gms.maps.model.CameraPosition;
+import com.google.android.gms.maps.model.Cap;
+import com.google.android.gms.maps.model.CustomCap;
+import com.google.android.gms.maps.model.Dash;
+import com.google.android.gms.maps.model.Dot;
+import com.google.android.gms.maps.model.Gap;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
+import com.google.android.gms.maps.model.PatternItem;
+import com.google.android.gms.maps.model.RoundCap;
+import com.google.android.gms.maps.model.SquareCap;
 import io.flutter.view.FlutterMain;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -124,19 +134,19 @@ private static int toInt(Object o) {
     return ((Number) o).intValue();
   }
 
-  static Object toJson(CameraPosition position) {
+  static Object latlngBoundsToJson(CameraPosition position) {
     if (position == null) {
       return null;
     }
     final Map<String, Object> data = new HashMap<>();
     data.put("bearing", position.bearing);
-    data.put("target", toJson(position.target));
+    data.put("target", latLngToJson(position.target));
     data.put("tilt", position.tilt);
     data.put("zoom", position.zoom);
     return data;
   }
 
-  static Object toJson(String markerId) {
+  static Object markerIdToJson(String markerId) {
     if (markerId == null) {
       return null;
     }
@@ -145,14 +155,23 @@ static Object toJson(String markerId) {
     return data;
   }
 
-  static Object toJson(LatLng latLng) {
+  static Object polylineIdToJson(String polylineId) {
+    if (polylineId == null) {
+      return null;
+    }
+    final Map<String, Object> data = new HashMap<>(1);
+    data.put("polylineId", polylineId);
+    return data;
+  }
+
+  static Object latLngToJson(LatLng latLng) {
     return Arrays.asList(latLng.latitude, latLng.longitude);
   }
 
-  public static Object toJson(LatLngBounds latLngBounds) {
+  public static Object latlngBoundsToJson(LatLngBounds latLngBounds) {
     final Map<String, Object> arguments = new HashMap<>(2);
-    arguments.put("southwest", toJson(latLngBounds.southwest));
-    arguments.put("northeast", toJson(latLngBounds.northeast));
+    arguments.put("southwest", latLngToJson(latLngBounds.southwest));
+    arguments.put("northeast", latLngToJson(latLngBounds.northeast));
     return arguments;
   }
 
@@ -323,4 +342,118 @@ private static void interpretInfoWindowOptions(
       sink.setInfoWindowAnchor(toFloat(anchorData.get(0)), toFloat(anchorData.get(1)));
     }
   }
+
+  static String interpretPolylineOptions(Object o, PolylineOptionsSink sink) {
+    final Map<?, ?> data = toMap(o);
+    final Object consumeTapEvents = data.get("consumeTapEvents");
+    if (consumeTapEvents != null) {
+      sink.setConsumeTapEvents(toBoolean(consumeTapEvents));
+    }
+    final Object color = data.get("color");
+    if (color != null) {
+      sink.setColor(toInt(color));
+    }
+    final Object endCap = data.get("endCap");
+    if (endCap != null) {
+      sink.setEndCap(toCap(endCap));
+    }
+    final Object geodesic = data.get("geodesic");
+    if (geodesic != null) {
+      sink.setGeodesic(toBoolean(geodesic));
+    }
+    final Object jointType = data.get("jointType");
+    if (jointType != null) {
+      sink.setJointType(toInt(jointType));
+    }
+    final Object startCap = data.get("startCap");
+    if (startCap != null) {
+      sink.setStartCap(toCap(startCap));
+    }
+    final Object visible = data.get("visible");
+    if (visible != null) {
+      sink.setVisible(toBoolean(visible));
+    }
+    final Object width = data.get("width");
+    if (width != null) {
+      sink.setWidth(toInt(width));
+    }
+    final Object zIndex = data.get("zIndex");
+    if (zIndex != null) {
+      sink.setZIndex(toFloat(zIndex));
+    }
+    final Object points = data.get("points");
+    if (points != null) {
+      sink.setPoints(toPoints(points));
+    }
+    final Object pattern = data.get("pattern");
+    if (pattern != null) {
+      sink.setPattern(toPattern(pattern));
+    }
+    final String polylineId = (String) data.get("polylineId");
+    if (polylineId == null) {
+      throw new IllegalArgumentException("polylineId was null");
+    } else {
+      return polylineId;
+    }
+  }
+
+  private static List<LatLng> toPoints(Object o) {
+    final List<?> data = toList(o);
+    final List<LatLng> points = new ArrayList<>(data.size());
+
+    for (Object ob : data) {
+      final List<?> point = toList(ob);
+      points.add(new LatLng(toFloat(point.get(0)), toFloat(point.get(1))));
+    }
+    return points;
+  }
+
+  private static List<PatternItem> toPattern(Object o) {
+    final List<?> data = toList(o);
+
+    if (data.isEmpty()) {
+      return null;
+    }
+
+    final List<PatternItem> pattern = new ArrayList<>(data.size());
+
+    for (Object ob : data) {
+      final List<?> patternItem = toList(ob);
+      switch (toString(patternItem.get(0))) {
+        case "dot":
+          pattern.add(new Dot());
+          break;
+        case "dash":
+          pattern.add(new Dash(toFloat(patternItem.get(1))));
+          break;
+        case "gap":
+          pattern.add(new Gap(toFloat(patternItem.get(1))));
+          break;
+        default:
+          throw new IllegalArgumentException("Cannot interpret " + pattern + " as PatternItem");
+      }
+    }
+
+    return pattern;
+  }
+
+  private static Cap toCap(Object o) {
+    final List<?> data = toList(o);
+    switch (toString(data.get(0))) {
+      case "buttCap":
+        return new ButtCap();
+      case "roundCap":
+        return new RoundCap();
+      case "squareCap":
+        return new SquareCap();
+      case "customCap":
+        if (data.size() == 2) {
+          return new CustomCap(toBitmapDescriptor(data.get(1)));
+        } else {
+          return new CustomCap(toBitmapDescriptor(data.get(1)), toFloat(data.get(2)));
+        }
+      default:
+        throw new IllegalArgumentException("Cannot interpret " + o + " as Cap");
+    }
+  }
 }
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
index 8e8200369486..e8929740347b 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
@@ -16,6 +16,7 @@ class GoogleMapBuilder implements GoogleMapOptionsSink {
   private boolean trackCameraPosition = false;
   private boolean myLocationEnabled = false;
   private Object initialMarkers;
+  private Object initialPolylines;
 
   GoogleMapController build(
       int id, Context context, AtomicInteger state, PluginRegistry.Registrar registrar) {
@@ -25,6 +26,7 @@ GoogleMapController build(
     controller.setMyLocationEnabled(myLocationEnabled);
     controller.setTrackCameraPosition(trackCameraPosition);
     controller.setInitialMarkers(initialMarkers);
+    controller.setInitialPolylines(initialPolylines);
     return controller;
   }
 
@@ -91,4 +93,9 @@ public void setMyLocationEnabled(boolean myLocationEnabled) {
   public void setInitialMarkers(Object initialMarkers) {
     this.initialMarkers = initialMarkers;
   }
+
+  @Override
+  public void setInitialPolylines(Object initialPolylines) {
+    this.initialPolylines = initialPolylines;
+  }
 }
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index e7a92c6773c1..a8a005387aec 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -29,6 +29,7 @@
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.Polyline;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
@@ -48,6 +49,7 @@ final class GoogleMapController
         GoogleMap.OnCameraMoveStartedListener,
         GoogleMap.OnInfoWindowClickListener,
         GoogleMap.OnMarkerClickListener,
+        GoogleMap.OnPolylineClickListener,
         GoogleMapOptionsSink,
         MethodChannel.MethodCallHandler,
         OnMapReadyCallback,
@@ -60,6 +62,7 @@ final class GoogleMapController
   private final MethodChannel methodChannel;
   private final PluginRegistry.Registrar registrar;
   private final MapView mapView;
+  private final Map<String, PolylineController> polylines;
   private GoogleMap googleMap;
   private boolean trackCameraPosition = false;
   private boolean myLocationEnabled = false;
@@ -69,7 +72,9 @@ final class GoogleMapController
   private final int registrarActivityHashCode;
   private final Context context;
   private final MarkersController markersController;
+  private final PolylinesController polylinesController;
   private List<Object> initialMarkers;
+  private List<Object> initialPolylines;
 
   GoogleMapController(
       int id,
@@ -82,12 +87,14 @@ final class GoogleMapController
     this.activityState = activityState;
     this.registrar = registrar;
     this.mapView = new MapView(context, options);
+    this.polylines = new HashMap<>();
     this.density = context.getResources().getDisplayMetrics().density;
     methodChannel =
         new MethodChannel(registrar.messenger(), "plugins.flutter.io/google_maps_" + id);
     methodChannel.setMethodCallHandler(this);
     this.registrarActivityHashCode = registrar.activity().hashCode();
     this.markersController = new MarkersController(methodChannel);
+    this.polylinesController = new PolylinesController(methodChannel);
   }
 
   @Override
@@ -157,10 +164,13 @@ public void onMapReady(GoogleMap googleMap) {
     googleMap.setOnCameraMoveListener(this);
     googleMap.setOnCameraIdleListener(this);
     googleMap.setOnMarkerClickListener(this);
+    googleMap.setOnPolylineClickListener(this);
     googleMap.setOnMapClickListener(this);
     updateMyLocationEnabled();
     markersController.setGoogleMap(googleMap);
+    polylinesController.setGoogleMap(googleMap);
     updateInitialMarkers();
+    updateInitialPolylines();
   }
 
   @Override
@@ -176,14 +186,14 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
       case "map#update":
         {
           Convert.interpretGoogleMapOptions(call.argument("options"), this);
-          result.success(Convert.toJson(getCameraPosition()));
+          result.success(Convert.latlngBoundsToJson(getCameraPosition()));
           break;
         }
       case "map#getVisibleRegion":
         {
           if (googleMap != null) {
             LatLngBounds latLngBounds = googleMap.getProjection().getVisibleRegion().latLngBounds;
-            result.success(Convert.toJson(latLngBounds));
+            result.success(Convert.latlngBoundsToJson(latLngBounds));
           } else {
             result.error(
                 "GoogleMap uninitialized",
@@ -219,6 +229,17 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
           result.success(null);
           break;
         }
+      case "polylines#update":
+        {
+          Object polylinesToAdd = call.argument("polylinesToAdd");
+          polylinesController.addPolylines((List<Object>) polylinesToAdd);
+          Object polylinesToChange = call.argument("polylinesToChange");
+          polylinesController.changePolylines((List<Object>) polylinesToChange);
+          Object polylineIdsToRemove = call.argument("polylineIdsToRemove");
+          polylinesController.removePolylines((List<Object>) polylineIdsToRemove);
+          result.success(null);
+          break;
+        }
       case "map#isCompassEnabled":
         {
           result.success(googleMap.getUiSettings().isCompassEnabled());
@@ -260,7 +281,7 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
   @Override
   public void onMapClick(LatLng latLng) {
     final Map<String, Object> arguments = new HashMap<>(2);
-    arguments.put("position", Convert.toJson(latLng));
+    arguments.put("position", Convert.latLngToJson(latLng));
     methodChannel.invokeMethod("map#onTap", arguments);
   }
 
@@ -283,7 +304,7 @@ public void onCameraMove() {
       return;
     }
     final Map<String, Object> arguments = new HashMap<>(2);
-    arguments.put("position", Convert.toJson(googleMap.getCameraPosition()));
+    arguments.put("position", Convert.latlngBoundsToJson(googleMap.getCameraPosition()));
     methodChannel.invokeMethod("camera#onMove", arguments);
   }
 
@@ -297,6 +318,11 @@ public boolean onMarkerClick(Marker marker) {
     return markersController.onMarkerTap(marker.getId());
   }
 
+  @Override
+  public void onPolylineClick(Polyline polyline) {
+    polylinesController.onPolylineTap(polyline.getId());
+  }
+
   @Override
   public void dispose() {
     if (disposed) {
@@ -440,6 +466,18 @@ private void updateInitialMarkers() {
     markersController.addMarkers(initialMarkers);
   }
 
+  @Override
+  public void setInitialPolylines(Object initialPolylines) {
+    this.initialPolylines = (List<Object>) initialPolylines;
+    if (googleMap != null) {
+      updateInitialPolylines();
+    }
+  }
+
+  private void updateInitialPolylines() {
+    polylinesController.addPolylines(initialPolylines);
+  }
+
   @SuppressLint("MissingPermission")
   private void updateMyLocationEnabled() {
     if (hasLocationPermission()) {
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
index c66dc3e42f54..239561691535 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
@@ -35,6 +35,9 @@ public PlatformView create(Context context, int id, Object args) {
     if (params.containsKey("markersToAdd")) {
       builder.setInitialMarkers(params.get("markersToAdd"));
     }
+    if (params.containsKey("polylinesToAdd")) {
+      builder.setInitialPolylines(params.get("polylinesToAdd"));
+    }
     return builder.build(id, context, mActivityState, mPluginRegistrar);
   }
 }
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
index bf6cc2e2202e..6fec3bc71b15 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
@@ -29,4 +29,6 @@ interface GoogleMapOptionsSink {
   void setMyLocationEnabled(boolean myLocationEnabled);
 
   void setInitialMarkers(Object initialMarkers);
+
+  void setInitialPolylines(Object initialPolylines);
 }
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java
index 43f5fe6ff08f..6923a23fd586 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java
@@ -67,7 +67,7 @@ boolean onMarkerTap(String googleMarkerId) {
     if (markerId == null) {
       return false;
     }
-    methodChannel.invokeMethod("marker#onTap", Convert.toJson(markerId));
+    methodChannel.invokeMethod("marker#onTap", Convert.markerIdToJson(markerId));
     MarkerController markerController = markerIdToController.get(markerId);
     if (markerController != null) {
       return markerController.consumeTapEvents();
@@ -80,7 +80,7 @@ void onInfoWindowTap(String googleMarkerId) {
     if (markerId == null) {
       return;
     }
-    methodChannel.invokeMethod("infoWindow#onTap", Convert.toJson(markerId));
+    methodChannel.invokeMethod("infoWindow#onTap", Convert.markerIdToJson(markerId));
   }
 
   private void addMarker(Object marker) {
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineBuilder.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineBuilder.java
new file mode 100644
index 000000000000..034659768844
--- /dev/null
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineBuilder.java
@@ -0,0 +1,80 @@
+package io.flutter.plugins.googlemaps;
+
+import com.google.android.gms.maps.model.Cap;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.PatternItem;
+import com.google.android.gms.maps.model.PolylineOptions;
+import java.util.List;
+
+class PolylineBuilder implements PolylineOptionsSink {
+  private final PolylineOptions polylineOptions;
+  private boolean consumeTapEvents;
+
+  PolylineBuilder() {
+    this.polylineOptions = new PolylineOptions();
+  }
+
+  PolylineOptions build() {
+    return polylineOptions;
+  }
+
+  boolean consumeTapEvents() {
+    return consumeTapEvents;
+  }
+
+  @Override
+  public void setColor(int color) {
+    polylineOptions.color(color);
+  }
+
+  @Override
+  public void setEndCap(Cap endCap) {
+    polylineOptions.endCap(endCap);
+  }
+
+  @Override
+  public void setJointType(int jointType) {
+    polylineOptions.jointType(jointType);
+  }
+
+  @Override
+  public void setPattern(List<PatternItem> pattern) {
+    polylineOptions.pattern(pattern);
+  }
+
+  @Override
+  public void setPoints(List<LatLng> points) {
+    polylineOptions.addAll(points);
+  }
+
+  @Override
+  public void setConsumeTapEvents(boolean consumeTapEvents) {
+    this.consumeTapEvents = consumeTapEvents;
+    polylineOptions.clickable(consumeTapEvents);
+  }
+
+  @Override
+  public void setGeodesic(boolean geodisc) {
+    polylineOptions.geodesic(geodisc);
+  }
+
+  @Override
+  public void setStartCap(Cap startCap) {
+    polylineOptions.startCap(startCap);
+  }
+
+  @Override
+  public void setVisible(boolean visible) {
+    polylineOptions.visible(visible);
+  }
+
+  @Override
+  public void setWidth(float width) {
+    polylineOptions.width(width);
+  }
+
+  @Override
+  public void setZIndex(float zIndex) {
+    polylineOptions.zIndex(zIndex);
+  }
+}
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineController.java
new file mode 100644
index 000000000000..303945a97d95
--- /dev/null
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineController.java
@@ -0,0 +1,88 @@
+package io.flutter.plugins.googlemaps;
+
+import com.google.android.gms.maps.model.Cap;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.PatternItem;
+import com.google.android.gms.maps.model.Polyline;
+import java.util.List;
+
+/** Controller of a single Polyline on the map. */
+class PolylineController implements PolylineOptionsSink {
+  private final Polyline polyline;
+  private final String googleMapsPolylineId;
+  private boolean consumeTapEvents;
+
+  PolylineController(Polyline polyline, boolean consumeTapEvents) {
+    this.polyline = polyline;
+    this.consumeTapEvents = consumeTapEvents;
+    this.googleMapsPolylineId = polyline.getId();
+  }
+
+  void remove() {
+    polyline.remove();
+  }
+
+  @Override
+  public void setConsumeTapEvents(boolean consumeTapEvents) {
+    this.consumeTapEvents = consumeTapEvents;
+    polyline.setClickable(consumeTapEvents);
+  }
+
+  @Override
+  public void setColor(int color) {
+    polyline.setColor(color);
+  }
+
+  @Override
+  public void setEndCap(Cap endCap) {
+    polyline.setEndCap(endCap);
+  }
+
+  @Override
+  public void setGeodesic(boolean geodesic) {
+    polyline.setGeodesic(geodesic);
+  }
+
+  @Override
+  public void setJointType(int jointType) {
+    polyline.setJointType(jointType);
+  }
+
+  @Override
+  public void setPattern(List<PatternItem> pattern) {
+    polyline.setPattern(pattern);
+  }
+
+  @Override
+  public void setPoints(List<LatLng> points) {
+    polyline.setPoints(points);
+  }
+
+  @Override
+  public void setStartCap(Cap startCap) {
+    polyline.setStartCap(startCap);
+  }
+
+  @Override
+  public void setVisible(boolean visible) {
+    polyline.setVisible(visible);
+  }
+
+  @Override
+  public void setWidth(float width) {
+    polyline.setWidth(width);
+  }
+
+  @Override
+  public void setZIndex(float zIndex) {
+    polyline.setZIndex(zIndex);
+  }
+
+  String getGoogleMapsPolylineId() {
+    return googleMapsPolylineId;
+  }
+
+  boolean consumeTapEvents() {
+    return consumeTapEvents;
+  }
+}
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineOptionsSink.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineOptionsSink.java
new file mode 100644
index 000000000000..d682d1c53078
--- /dev/null
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineOptionsSink.java
@@ -0,0 +1,32 @@
+package io.flutter.plugins.googlemaps;
+
+import com.google.android.gms.maps.model.Cap;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.PatternItem;
+import java.util.List;
+
+/** Receiver of Polyline configuration options. */
+interface PolylineOptionsSink {
+
+  void setConsumeTapEvents(boolean consumetapEvents);
+
+  void setColor(int color);
+
+  void setEndCap(Cap endCap);
+
+  void setGeodesic(boolean geodesic);
+
+  void setJointType(int jointType);
+
+  void setPattern(List<PatternItem> pattern);
+
+  void setPoints(List<LatLng> points);
+
+  void setStartCap(Cap startCap);
+
+  void setVisible(boolean visible);
+
+  void setWidth(float width);
+
+  void setZIndex(float zIndex);
+}
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylinesController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylinesController.java
new file mode 100644
index 000000000000..8647589da03d
--- /dev/null
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylinesController.java
@@ -0,0 +1,112 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.googlemaps;
+
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.model.Polyline;
+import com.google.android.gms.maps.model.PolylineOptions;
+import io.flutter.plugin.common.MethodChannel;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+class PolylinesController {
+
+  private final Map<String, PolylineController> polylineIdToController;
+  private final Map<String, String> googleMapsPolylineIdToDartPolylineId;
+  private final MethodChannel methodChannel;
+  private GoogleMap googleMap;
+
+  PolylinesController(MethodChannel methodChannel) {
+    this.polylineIdToController = new HashMap<>();
+    this.googleMapsPolylineIdToDartPolylineId = new HashMap<>();
+    this.methodChannel = methodChannel;
+  }
+
+  void setGoogleMap(GoogleMap googleMap) {
+    this.googleMap = googleMap;
+  }
+
+  void addPolylines(List<Object> polylinesToAdd) {
+    if (polylinesToAdd != null) {
+      for (Object polylineToAdd : polylinesToAdd) {
+        addPolyline(polylineToAdd);
+      }
+    }
+  }
+
+  void changePolylines(List<Object> polylinesToChange) {
+    if (polylinesToChange != null) {
+      for (Object polylineToChange : polylinesToChange) {
+        changePolyline(polylineToChange);
+      }
+    }
+  }
+
+  void removePolylines(List<Object> polylineIdsToRemove) {
+    if (polylineIdsToRemove == null) {
+      return;
+    }
+    for (Object rawPolylineId : polylineIdsToRemove) {
+      if (rawPolylineId == null) {
+        continue;
+      }
+      String polylineId = (String) rawPolylineId;
+      final PolylineController polylineController = polylineIdToController.remove(polylineId);
+      if (polylineController != null) {
+        polylineController.remove();
+        googleMapsPolylineIdToDartPolylineId.remove(polylineController.getGoogleMapsPolylineId());
+      }
+    }
+  }
+
+  boolean onPolylineTap(String googlePolylineId) {
+    String polylineId = googleMapsPolylineIdToDartPolylineId.get(googlePolylineId);
+    if (polylineId == null) {
+      return false;
+    }
+    methodChannel.invokeMethod("polyline#onTap", Convert.polylineIdToJson(polylineId));
+    PolylineController polylineController = polylineIdToController.get(polylineId);
+    if (polylineController != null) {
+      return polylineController.consumeTapEvents();
+    }
+    return false;
+  }
+
+  private void addPolyline(Object polyline) {
+    if (polyline == null) {
+      return;
+    }
+    PolylineBuilder polylineBuilder = new PolylineBuilder();
+    String polylineId = Convert.interpretPolylineOptions(polyline, polylineBuilder);
+    PolylineOptions options = polylineBuilder.build();
+    addPolyline(polylineId, options, polylineBuilder.consumeTapEvents());
+  }
+
+  private void addPolyline(
+      String polylineId, PolylineOptions polylineOptions, boolean consumeTapEvents) {
+    final Polyline polyline = googleMap.addPolyline(polylineOptions);
+    PolylineController controller = new PolylineController(polyline, consumeTapEvents);
+    polylineIdToController.put(polylineId, controller);
+    googleMapsPolylineIdToDartPolylineId.put(polyline.getId(), polylineId);
+  }
+
+  private void changePolyline(Object polyline) {
+    if (polyline == null) {
+      return;
+    }
+    String polylineId = getPolylineId(polyline);
+    PolylineController polylineController = polylineIdToController.get(polylineId);
+    if (polylineController != null) {
+      Convert.interpretPolylineOptions(polyline, polylineController);
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  private static String getPolylineId(Object polyline) {
+    Map<String, Object> polylineMap = (Map<String, Object>) polyline;
+    return (String) polylineMap.get("polylineId");
+  }
+}
diff --git a/packages/google_maps_flutter/example/lib/main.dart b/packages/google_maps_flutter/example/lib/main.dart
index dc86ab40e0b5..9b99b4f9ea56 100644
--- a/packages/google_maps_flutter/example/lib/main.dart
+++ b/packages/google_maps_flutter/example/lib/main.dart
@@ -9,6 +9,7 @@ import 'map_ui.dart';
 import 'move_camera.dart';
 import 'page.dart';
 import 'place_marker.dart';
+import 'place_polyline.dart';
 import 'scrolling_map.dart';
 
 final List<Page> _allPages = <Page>[
@@ -18,6 +19,7 @@ final List<Page> _allPages = <Page>[
   MoveCameraPage(),
   PlaceMarkerPage(),
   ScrollingMapPage(),
+  PlacePolylinePage(),
 ];
 
 class MapsDemo extends StatelessWidget {
diff --git a/packages/google_maps_flutter/example/lib/place_polyline.dart b/packages/google_maps_flutter/example/lib/place_polyline.dart
new file mode 100644
index 000000000000..c5f0d94f0ac2
--- /dev/null
+++ b/packages/google_maps_flutter/example/lib/place_polyline.dart
@@ -0,0 +1,304 @@
+import 'dart:io' show Platform;
+
+import 'package:flutter/material.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+
+import 'page.dart';
+
+class PlacePolylinePage extends Page {
+  PlacePolylinePage() : super(const Icon(Icons.linear_scale), 'Place polyline');
+
+  @override
+  Widget build(BuildContext context) {
+    return const PlacePolylineBody();
+  }
+}
+
+class PlacePolylineBody extends StatefulWidget {
+  const PlacePolylineBody();
+
+  @override
+  State<StatefulWidget> createState() => PlacePolylineBodyState();
+}
+
+class PlacePolylineBodyState extends State<PlacePolylineBody> {
+  PlacePolylineBodyState();
+
+  GoogleMapController controller;
+  Map<PolylineId, Polyline> polylines = <PolylineId, Polyline>{};
+  int _polylineIdCounter = 1;
+  PolylineId selectedPolyline;
+
+  // Values when toggling polyline color
+  int colorsIndex = 0;
+  List<Color> colors = <Color>[
+    Colors.purple,
+    Colors.red,
+    Colors.green,
+    Colors.pink,
+  ];
+
+  // Values when toggling polyline width
+  int widthsIndex = 0;
+  List<int> widths = <int>[10, 20, 5];
+
+  int jointTypesIndex = 0;
+  List<JointType> jointTypes = <JointType>[
+    JointType.mitered,
+    JointType.bevel,
+    JointType.round
+  ];
+
+  // Values when toggling polyline end cap type
+  int endCapsIndex = 0;
+  List<Cap> endCaps = <Cap>[Cap.buttCap, Cap.squareCap, Cap.roundCap];
+
+  // Values when toggling polyline start cap type
+  int startCapsIndex = 0;
+  List<Cap> startCaps = <Cap>[Cap.buttCap, Cap.squareCap, Cap.roundCap];
+
+  // Values when toggling polyline pattern
+  int patternsIndex = 0;
+  List<List<PatternItem>> patterns = <List<PatternItem>>[
+    <PatternItem>[],
+    <PatternItem>[
+      PatternItem.dash(30.0),
+      PatternItem.gap(20.0),
+      PatternItem.dot,
+      PatternItem.gap(20.0)
+    ],
+    <PatternItem>[PatternItem.dash(30.0), PatternItem.gap(20.0)],
+    <PatternItem>[PatternItem.dot, PatternItem.gap(10.0)],
+  ];
+
+  void _onMapCreated(GoogleMapController controller) {
+    this.controller = controller;
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  void _onPolylineTapped(PolylineId polylineId) {
+    setState(() {
+      selectedPolyline = polylineId;
+    });
+  }
+
+  void _remove() {
+    setState(() {
+      if (polylines.containsKey(selectedPolyline)) {
+        polylines.remove(selectedPolyline);
+      }
+      selectedPolyline = null;
+    });
+  }
+
+  void _add() {
+    final int polylineCount = polylines.length;
+
+    if (polylineCount == 12) {
+      return;
+    }
+
+    final String polylineIdVal = 'polyline_id_$_polylineIdCounter';
+    _polylineIdCounter++;
+    final PolylineId polylineId = PolylineId(polylineIdVal);
+
+    final Polyline polyline = Polyline(
+      polylineId: polylineId,
+      consumeTapEvents: true,
+      color: Colors.orange,
+      width: 5,
+      points: _createPoints(),
+      onTap: () {
+        _onPolylineTapped(polylineId);
+      },
+    );
+
+    setState(() {
+      polylines[polylineId] = polyline;
+    });
+  }
+
+  void _toggleGeodesic() {
+    final Polyline polyline = polylines[selectedPolyline];
+    setState(() {
+      polylines[selectedPolyline] = polyline.copyWith(
+        geodesicParam: !polyline.geodesic,
+      );
+    });
+  }
+
+  void _toggleVisible() {
+    final Polyline polyline = polylines[selectedPolyline];
+    setState(() {
+      polylines[selectedPolyline] = polyline.copyWith(
+        visibleParam: !polyline.visible,
+      );
+    });
+  }
+
+  void _changeColor() {
+    final Polyline polyline = polylines[selectedPolyline];
+    setState(() {
+      polylines[selectedPolyline] = polyline.copyWith(
+        colorParam: colors[++colorsIndex % colors.length],
+      );
+    });
+  }
+
+  void _changeWidth() {
+    final Polyline polyline = polylines[selectedPolyline];
+    setState(() {
+      polylines[selectedPolyline] = polyline.copyWith(
+        widthParam: widths[++widthsIndex % widths.length],
+      );
+    });
+  }
+
+  void _changeJointType() {
+    final Polyline polyline = polylines[selectedPolyline];
+    setState(() {
+      polylines[selectedPolyline] = polyline.copyWith(
+        jointTypeParam: jointTypes[++jointTypesIndex % jointTypes.length],
+      );
+    });
+  }
+
+  void _changeEndCap() {
+    final Polyline polyline = polylines[selectedPolyline];
+    setState(() {
+      polylines[selectedPolyline] = polyline.copyWith(
+        endCapParam: endCaps[++endCapsIndex % endCaps.length],
+      );
+    });
+  }
+
+  void _changeStartCap() {
+    final Polyline polyline = polylines[selectedPolyline];
+    setState(() {
+      polylines[selectedPolyline] = polyline.copyWith(
+        startCapParam: startCaps[++startCapsIndex % startCaps.length],
+      );
+    });
+  }
+
+  void _changePattern() {
+    final Polyline polyline = polylines[selectedPolyline];
+    setState(() {
+      polylines[selectedPolyline] = polyline.copyWith(
+        patternsParam: patterns[++patternsIndex % patterns.length],
+      );
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final bool iOSorNotSelected = Platform.isIOS || (selectedPolyline == null);
+
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: <Widget>[
+        Center(
+          child: SizedBox(
+            width: 350.0,
+            height: 300.0,
+            child: GoogleMap(
+              initialCameraPosition: const CameraPosition(
+                target: LatLng(52.4478, -3.5402),
+                zoom: 7.0,
+              ),
+              polylines: Set<Polyline>.of(polylines.values),
+              onMapCreated: _onMapCreated,
+            ),
+          ),
+        ),
+        Expanded(
+          child: SingleChildScrollView(
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: <Widget>[
+                Row(
+                  children: <Widget>[
+                    Column(
+                      children: <Widget>[
+                        FlatButton(
+                          child: const Text('add'),
+                          onPressed: _add,
+                        ),
+                        FlatButton(
+                          child: const Text('remove'),
+                          onPressed:
+                              (selectedPolyline == null) ? null : _remove,
+                        ),
+                        FlatButton(
+                          child: const Text('toggle visible'),
+                          onPressed: (selectedPolyline == null)
+                              ? null
+                              : _toggleVisible,
+                        ),
+                        FlatButton(
+                          child: const Text('toggle geodesic'),
+                          onPressed: (selectedPolyline == null)
+                              ? null
+                              : _toggleGeodesic,
+                        ),
+                      ],
+                    ),
+                    Column(
+                      children: <Widget>[
+                        FlatButton(
+                          child: const Text('change width'),
+                          onPressed:
+                              (selectedPolyline == null) ? null : _changeWidth,
+                        ),
+                        FlatButton(
+                          child: const Text('change color'),
+                          onPressed:
+                              (selectedPolyline == null) ? null : _changeColor,
+                        ),
+                        FlatButton(
+                          child: const Text('change start cap [Android only]'),
+                          onPressed: iOSorNotSelected ? null : _changeStartCap,
+                        ),
+                        FlatButton(
+                          child: const Text('change end cap [Android only]'),
+                          onPressed: iOSorNotSelected ? null : _changeEndCap,
+                        ),
+                        FlatButton(
+                          child: const Text('change joint type [Android only]'),
+                          onPressed: iOSorNotSelected ? null : _changeJointType,
+                        ),
+                        FlatButton(
+                          child: const Text('change pattern [Android only]'),
+                          onPressed: iOSorNotSelected ? null : _changePattern,
+                        ),
+                      ],
+                    )
+                  ],
+                )
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  List<LatLng> _createPoints() {
+    final List<LatLng> points = <LatLng>[];
+    final double offset = _polylineIdCounter.ceilToDouble();
+    points.add(_createLatLng(51.4816 + offset, -3.1791));
+    points.add(_createLatLng(53.0430 + offset, -2.9925));
+    points.add(_createLatLng(53.1396 + offset, -4.2739));
+    points.add(_createLatLng(52.4153 + offset, -4.0829));
+    return points;
+  }
+
+  LatLng _createLatLng(double lat, double lng) {
+    return LatLng(lat, lng);
+  }
+}
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
index 5de2fdd08fb1..01063f6a2e80 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
@@ -5,10 +5,11 @@
 #import <Flutter/Flutter.h>
 #import <GoogleMaps/GoogleMaps.h>
 #import "GoogleMapMarkerController.h"
+#import "GoogleMapPolylineController.h"
 
 // Defines map UI options writable from Flutter.
 @protocol FLTGoogleMapOptionsSink
-- (void)setCameraTargetBounds:(GMSCoordinateBounds*)bounds;
+- (void)setCameraTargetBounds:(GMSCoordinateBounds *)bounds;
 - (void)setCompassEnabled:(BOOL)enabled;
 - (void)setMapType:(GMSMapViewType)type;
 - (void)setMinZoom:(float)minZoom maxZoom:(float)maxZoom;
@@ -26,15 +27,15 @@
 - (instancetype)initWithFrame:(CGRect)frame
                viewIdentifier:(int64_t)viewId
                     arguments:(id _Nullable)args
-                    registrar:(NSObject<FlutterPluginRegistrar>*)registrar;
+                    registrar:(NSObject<FlutterPluginRegistrar> *)registrar;
 - (void)showAtX:(CGFloat)x Y:(CGFloat)y;
 - (void)hide;
-- (void)animateWithCameraUpdate:(GMSCameraUpdate*)cameraUpdate;
-- (void)moveWithCameraUpdate:(GMSCameraUpdate*)cameraUpdate;
-- (GMSCameraPosition*)cameraPosition;
+- (void)animateWithCameraUpdate:(GMSCameraUpdate *)cameraUpdate;
+- (void)moveWithCameraUpdate:(GMSCameraUpdate *)cameraUpdate;
+- (GMSCameraPosition *)cameraPosition;
 @end
 
 // Allows the engine to create new Google Map instances.
 @interface FLTGoogleMapFactory : NSObject <FlutterPlatformViewFactory>
-- (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar;
+- (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar;
 @end
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index ee95a645001f..b15ab70331f3 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -54,6 +54,7 @@ @implementation FLTGoogleMapController {
   // https://github.com/flutter/flutter/issues/27550
   BOOL _cameraDidInitialSetup;
   FLTMarkersController* _markersController;
+  FLTPolylinesController* _polylinesController;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -84,10 +85,17 @@ - (instancetype)initWithFrame:(CGRect)frame
     _markersController = [[FLTMarkersController alloc] init:_channel
                                                     mapView:_mapView
                                                   registrar:registrar];
+    _polylinesController = [[FLTPolylinesController alloc] init:_channel
+                                                        mapView:_mapView
+                                                      registrar:registrar];
     id markersToAdd = args[@"markersToAdd"];
     if ([markersToAdd isKindOfClass:[NSArray class]]) {
       [_markersController addMarkers:markersToAdd];
     }
+    id polylinesToAdd = args[@"polylinesToAdd"];
+    if ([polylinesToAdd isKindOfClass:[NSArray class]]) {
+      [_polylinesController addPolylines:polylinesToAdd];
+    }
   }
   return self;
 }
@@ -139,6 +147,20 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
       [_markersController removeMarkerIds:markerIdsToRemove];
     }
     result(nil);
+  } else if ([call.method isEqualToString:@"polylines#update"]) {
+    id polylinesToAdd = call.arguments[@"polylinesToAdd"];
+    if ([polylinesToAdd isKindOfClass:[NSArray class]]) {
+      [_polylinesController addPolylines:polylinesToAdd];
+    }
+    id polylinesToChange = call.arguments[@"polylinesToChange"];
+    if ([polylinesToChange isKindOfClass:[NSArray class]]) {
+      [_polylinesController changePolylines:polylinesToChange];
+    }
+    id polylineIdsToRemove = call.arguments[@"polylineIdsToRemove"];
+    if ([polylineIdsToRemove isKindOfClass:[NSArray class]]) {
+      [_polylinesController removePolylineIds:polylineIdsToRemove];
+    }
+    result(nil);
   } else if ([call.method isEqualToString:@"map#isCompassEnabled"]) {
     NSNumber* isCompassEnabled = @(_mapView.settings.compassButton);
     result(isCompassEnabled);
@@ -270,6 +292,10 @@ - (void)mapView:(GMSMapView*)mapView didTapInfoWindowOfMarker:(GMSMarker*)marker
   NSString* markerId = marker.userData[0];
   [_markersController onInfoWindowTap:markerId];
 }
+- (void)mapView:(GMSMapView*)mapView didTapOverlay:(GMSOverlay*)overlay {
+  NSString* polylineId = overlay.userData[0];
+  [_polylinesController onPolylineTap:polylineId];
+}
 
 - (void)mapView:(GMSMapView*)mapView didTapAtCoordinate:(CLLocationCoordinate2D)coordinate {
   [_channel invokeMethod:@"map#onTap" arguments:@{@"position" : LocationToJson(coordinate)}];
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
index 569531ff69f7..96af64da477e 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
@@ -88,6 +88,10 @@ static CLLocationCoordinate2D ToLocation(NSArray* data) {
 
 static CGPoint ToPoint(NSArray* data) { return [FLTGoogleMapJsonConversions toPoint:data]; }
 
+static NSArray* PositionToJson(CLLocationCoordinate2D data) {
+  return [FLTGoogleMapJsonConversions positionToJson:data];
+}
+
 static void InterpretMarkerOptions(NSDictionary* data, id<FLTGoogleMapMarkerOptionsSink> sink,
                                    NSObject<FlutterPluginRegistrar>* registrar) {
   NSNumber* alpha = data[@"alpha"];
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.h
new file mode 100644
index 000000000000..462803060af0
--- /dev/null
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.h
@@ -0,0 +1,35 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <Flutter/Flutter.h>
+#import <GoogleMaps/GoogleMaps.h>
+
+// Defines polyline UI options writable from Flutter.
+@protocol FLTGoogleMapPolylineOptionsSink
+- (void)setConsumeTapEvents:(BOOL)consume;
+- (void)setVisible:(BOOL)visible;
+- (void)setColor:(UIColor*)color;
+- (void)setStrokeWidth:(CGFloat)width;
+- (void)setPoints:(NSArray<CLLocation*>*)points;
+- (void)setZIndex:(int)zIndex;
+@end
+
+// Defines polyline controllable by Flutter.
+@interface FLTGoogleMapPolylineController : NSObject <FLTGoogleMapPolylineOptionsSink>
+@property(atomic, readonly) NSString* polylineId;
+- (instancetype)initPolylineWithPath:(GMSMutablePath*)path
+                          polylineId:(NSString*)polylineId
+                             mapView:(GMSMapView*)mapView;
+- (void)removePolyline;
+@end
+
+@interface FLTPolylinesController : NSObject
+- (instancetype)init:(FlutterMethodChannel*)methodChannel
+             mapView:(GMSMapView*)mapView
+           registrar:(NSObject<FlutterPluginRegistrar>*)registrar;
+- (void)addPolylines:(NSArray*)polylinesToAdd;
+- (void)changePolylines:(NSArray*)polylinesToChange;
+- (void)removePolylineIds:(NSArray*)polylineIdsToRemove;
+- (void)onPolylineTap:(NSString*)polylineId;
+@end
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.m
new file mode 100644
index 000000000000..170c9870fdd7
--- /dev/null
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.m
@@ -0,0 +1,175 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "GoogleMapPolylineController.h"
+#import "JsonConversions.h"
+
+@implementation FLTGoogleMapPolylineController {
+  GMSPolyline* _polyline;
+  GMSMapView* _mapView;
+}
+- (instancetype)initPolylineWithPath:(GMSMutablePath*)path
+                          polylineId:(NSString*)polylineId
+                             mapView:(GMSMapView*)mapView {
+  self = [super init];
+  if (self) {
+    _polyline = [GMSPolyline polylineWithPath:path];
+    _mapView = mapView;
+    _polylineId = polylineId;
+    _polyline.userData = @[ polylineId ];
+  }
+  return self;
+}
+
+- (void)removePolyline {
+  _polyline.map = nil;
+}
+
+#pragma mark - FLTGoogleMapPolylineOptionsSink methods
+
+- (void)setConsumeTapEvents:(BOOL)consumes {
+  _polyline.tappable = consumes;
+}
+- (void)setVisible:(BOOL)visible {
+  _polyline.map = visible ? _mapView : nil;
+}
+- (void)setZIndex:(int)zIndex {
+  _polyline.zIndex = zIndex;
+}
+- (void)setPoints:(NSArray<CLLocation*>*)points {
+  GMSMutablePath* path = [GMSMutablePath path];
+
+  for (CLLocation* location in points) {
+    [path addCoordinate:location.coordinate];
+  }
+  _polyline.path = path;
+}
+
+- (void)setColor:(UIColor*)color {
+  _polyline.strokeColor = color;
+}
+- (void)setStrokeWidth:(CGFloat)width {
+  _polyline.strokeWidth = width;
+}
+@end
+
+static int ToInt(NSNumber* data) { return [FLTGoogleMapJsonConversions toInt:data]; }
+
+static BOOL ToBool(NSNumber* data) { return [FLTGoogleMapJsonConversions toBool:data]; }
+
+static NSArray<CLLocation*>* ToPoints(NSArray* data) {
+  return [FLTGoogleMapJsonConversions toPoints:data];
+}
+
+static UIColor* ToColor(NSNumber* data) { return [FLTGoogleMapJsonConversions toColor:data]; }
+
+static void InterpretPolylineOptions(NSDictionary* data, id<FLTGoogleMapPolylineOptionsSink> sink,
+                                     NSObject<FlutterPluginRegistrar>* registrar) {
+  NSNumber* consumeTapEvents = data[@"consumeTapEvents"];
+  if (consumeTapEvents) {
+    [sink setConsumeTapEvents:ToBool(consumeTapEvents)];
+  }
+
+  NSNumber* visible = data[@"visible"];
+  if (visible) {
+    [sink setVisible:ToBool(visible)];
+  }
+
+  NSNumber* zIndex = data[@"zIndex"];
+  if (zIndex) {
+    [sink setZIndex:ToInt(zIndex)];
+  }
+
+  NSArray* points = data[@"points"];
+  if (points) {
+    [sink setPoints:ToPoints(points)];
+  }
+
+  NSNumber* strokeColor = data[@"color"];
+  if (strokeColor) {
+    [sink setColor:ToColor(strokeColor)];
+  }
+
+  NSNumber* strokeWidth = data[@"width"];
+  if (strokeWidth) {
+    [sink setStrokeWidth:ToInt(strokeWidth)];
+  }
+}
+
+@implementation FLTPolylinesController {
+  NSMutableDictionary* _polylineIdToController;
+  FlutterMethodChannel* _methodChannel;
+  NSObject<FlutterPluginRegistrar>* _registrar;
+  GMSMapView* _mapView;
+}
+- (instancetype)init:(FlutterMethodChannel*)methodChannel
+             mapView:(GMSMapView*)mapView
+           registrar:(NSObject<FlutterPluginRegistrar>*)registrar {
+  self = [super init];
+  if (self) {
+    _methodChannel = methodChannel;
+    _mapView = mapView;
+    _polylineIdToController = [NSMutableDictionary dictionaryWithCapacity:1];
+    _registrar = registrar;
+  }
+  return self;
+}
+- (void)addPolylines:(NSArray*)polylinesToAdd {
+  for (NSDictionary* polyline in polylinesToAdd) {
+    GMSMutablePath* path = [FLTPolylinesController getPath:polyline];
+    NSString* polylineId = [FLTPolylinesController getPolylineId:polyline];
+    FLTGoogleMapPolylineController* controller =
+        [[FLTGoogleMapPolylineController alloc] initPolylineWithPath:path
+                                                          polylineId:polylineId
+                                                             mapView:_mapView];
+    InterpretPolylineOptions(polyline, controller, _registrar);
+    _polylineIdToController[polylineId] = controller;
+  }
+}
+- (void)changePolylines:(NSArray*)polylinesToChange {
+  for (NSDictionary* polyline in polylinesToChange) {
+    NSString* polylineId = [FLTPolylinesController getPolylineId:polyline];
+    FLTGoogleMapPolylineController* controller = _polylineIdToController[polylineId];
+    if (!controller) {
+      continue;
+    }
+    InterpretPolylineOptions(polyline, controller, _registrar);
+  }
+}
+- (void)removePolylineIds:(NSArray*)polylineIdsToRemove {
+  for (NSString* polylineId in polylineIdsToRemove) {
+    if (!polylineId) {
+      continue;
+    }
+    FLTGoogleMapPolylineController* controller = _polylineIdToController[polylineId];
+    if (!controller) {
+      continue;
+    }
+    [controller removePolyline];
+    [_polylineIdToController removeObjectForKey:polylineId];
+  }
+}
+- (void)onPolylineTap:(NSString*)polylineId {
+  if (!polylineId) {
+    return;
+  }
+  FLTGoogleMapPolylineController* controller = _polylineIdToController[polylineId];
+  if (!controller) {
+    return;
+  }
+  [_methodChannel invokeMethod:@"polyline#onTap" arguments:@{@"polylineId" : polylineId}];
+}
++ (GMSMutablePath*)getPath:(NSDictionary*)polyline {
+  NSArray* pointArray = polyline[@"points"];
+  NSArray<CLLocation*>* points = ToPoints(pointArray);
+  GMSMutablePath* path = [GMSMutablePath path];
+  for (CLLocation* location in points) {
+    [path addCoordinate:location.coordinate];
+  }
+  return path;
+}
++ (NSString*)getPolylineId:(NSDictionary*)polyline {
+  return polyline[@"polylineId"];
+}
+@end
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.h b/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.h
index 817f2d2a857f..dfdce8ab0350 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.h
@@ -6,6 +6,7 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import "GoogleMapController.h"
 #import "GoogleMapMarkerController.h"
+#import "GoogleMapPolylineController.h"
 
 @interface FLTGoogleMapsPlugin : NSObject <FlutterPlugin>
 @end
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.m b/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.m
index 8d54082fb20a..7606d1593bcc 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.m
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #import "GoogleMapsPlugin.h"
-#import "GoogleMapController.h"
-#import "GoogleMapMarkerController.h"
 
 #pragma mark - GoogleMaps plugin implementation
 
diff --git a/packages/google_maps_flutter/ios/Classes/JsonConversions.h b/packages/google_maps_flutter/ios/Classes/JsonConversions.h
index 625b2e396f6a..c54b2ad8cc8a 100644
--- a/packages/google_maps_flutter/ios/Classes/JsonConversions.h
+++ b/packages/google_maps_flutter/ios/Classes/JsonConversions.h
@@ -12,4 +12,7 @@
 + (float)toFloat:(NSNumber*)data;
 + (CLLocationCoordinate2D)toLocation:(NSArray*)data;
 + (CGPoint)toPoint:(NSArray*)data;
++ (NSArray*)positionToJson:(CLLocationCoordinate2D)position;
++ (UIColor*)toColor:(NSNumber*)data;
++ (NSArray<CLLocation*>*)toPoints:(NSArray*)data;
 @end
diff --git a/packages/google_maps_flutter/ios/Classes/JsonConversions.m b/packages/google_maps_flutter/ios/Classes/JsonConversions.m
index 7353c333b8dd..ddec920211df 100644
--- a/packages/google_maps_flutter/ios/Classes/JsonConversions.m
+++ b/packages/google_maps_flutter/ios/Classes/JsonConversions.m
@@ -32,4 +32,30 @@ + (CGPoint)toPoint:(NSArray*)data {
                      [FLTGoogleMapJsonConversions toDouble:data[1]]);
 }
 
-@end
\ No newline at end of file
++ (NSArray*)positionToJson:(CLLocationCoordinate2D)position {
+  return @[ @(position.latitude), @(position.longitude) ];
+}
+
++ (UIColor*)toColor:(NSNumber*)numberColor {
+  long value = [numberColor longValue];
+  return [UIColor colorWithRed:((float)((value & 0xFF0000) >> 16)) / 255.0
+                         green:((float)((value & 0xFF00) >> 8)) / 255.0
+                          blue:((float)(value & 0xFF)) / 255.0
+                         alpha:1.0];
+}
+
++ (NSArray<CLLocation*>*)toPoints:(NSArray*)data {
+  NSMutableArray* points = [[NSMutableArray alloc] init];
+  for (unsigned i = 0; i < [data count]; i++) {
+    NSNumber* latitude = data[i][0];
+    NSNumber* longitude = data[i][1];
+    CLLocation* point =
+        [[CLLocation alloc] initWithLatitude:[FLTGoogleMapJsonConversions toDouble:latitude]
+                                   longitude:[FLTGoogleMapJsonConversions toDouble:longitude]];
+    [points addObject:point];
+  }
+
+  return points;
+}
+
+@end
diff --git a/packages/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/lib/google_maps_flutter.dart
index 1ee7cb898210..dad1e59bea9b 100644
--- a/packages/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/lib/google_maps_flutter.dart
@@ -16,9 +16,14 @@ import 'package:flutter/services.dart';
 part 'src/bitmap.dart';
 part 'src/callbacks.dart';
 part 'src/camera.dart';
+part 'src/cap.dart';
 part 'src/controller.dart';
 part 'src/google_map.dart';
+part 'src/joint_type.dart';
 part 'src/marker.dart';
 part 'src/marker_updates.dart';
 part 'src/location.dart';
+part 'src/pattern_item.dart';
+part 'src/polyline.dart';
+part 'src/polyline_updates.dart';
 part 'src/ui.dart';
diff --git a/packages/google_maps_flutter/lib/src/cap.dart b/packages/google_maps_flutter/lib/src/cap.dart
new file mode 100644
index 000000000000..03676c0561fa
--- /dev/null
+++ b/packages/google_maps_flutter/lib/src/cap.dart
@@ -0,0 +1,48 @@
+part of google_maps_flutter;
+
+/// Cap that can be applied at the start or end vertex of a [Polyline].
+@immutable
+class Cap {
+  const Cap._(this._json);
+
+  /// Cap that is squared off exactly at the start or end vertex of a [Polyline]
+  /// with solid stroke pattern, equivalent to having no additional cap beyond
+  /// the start or end vertex.
+  ///
+  /// This is the default cap type at start and end vertices of Polylines with
+  /// solid stroke pattern.
+  static const Cap buttCap = Cap._(<dynamic>['buttCap']);
+
+  /// Cap that is a semicircle with radius equal to half the stroke width,
+  /// centered at the start or end vertex of a [Polyline] with solid stroke
+  /// pattern.
+  static const Cap roundCap = Cap._(<dynamic>['roundCap']);
+
+  /// Cap that is squared off after extending half the stroke width beyond the
+  /// start or end vertex of a [Polyline] with solid stroke pattern.
+  static const Cap squareCap = Cap._(<dynamic>['squareCap']);
+
+  /// Constructs a new CustomCap with a bitmap overlay centered at the start or
+  /// end vertex of a [Polyline], orientated according to the direction of the line's
+  /// first or last edge and scaled with respect to the line's stroke width.
+  ///
+  /// CustomCap can be applied to [Polyline] with any stroke pattern.
+  ///
+  /// [bitmapDescriptor] must not be null.
+  ///
+  /// [refWidth] is the reference stroke width (in pixels) - the stroke width for which
+  /// the cap bitmap at its native dimension is designed. Must be positive. Default value
+  /// is 10 pixels.
+  static Cap customCapFromBitmap(
+    BitmapDescriptor bitmapDescriptor, {
+    double refWidth = 10,
+  }) {
+    assert(bitmapDescriptor != null);
+    assert(refWidth > 0.0);
+    return Cap._(<dynamic>['customCap', bitmapDescriptor._toJson(), refWidth]);
+  }
+
+  final dynamic _json;
+
+  dynamic _toJson() => _json;
+}
diff --git a/packages/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/lib/src/controller.dart
index 93304a64f21c..4df64292e732 100644
--- a/packages/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/lib/src/controller.dart
@@ -63,6 +63,9 @@ class GoogleMapController {
       case 'infoWindow#onTap':
         _googleMapState.onInfoWindowTap(call.arguments['markerId']);
         break;
+      case 'polyline#onTap':
+        _googleMapState.onPolylineTap(call.arguments['polylineId']);
+        break;
       case 'map#onTap':
         _googleMapState.onTap(LatLng._fromJson(call.arguments['position']));
         break;
@@ -107,6 +110,23 @@ class GoogleMapController {
     );
   }
 
+  /// Updates polyline configuration.
+  ///
+  /// Change listeners are notified once the update has been made on the
+  /// platform side.
+  ///
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> _updatePolylines(_PolylineUpdates polylineUpdates) async {
+    assert(polylineUpdates != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    await channel.invokeMethod(
+      'polylines#update',
+      polylineUpdates._toMap(),
+    );
+  }
+
   /// Starts an animated change of the map camera position.
   ///
   /// The returned [Future] completes after the change has been started on the
diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/lib/src/google_map.dart
index a75424b03640..a3b394613e46 100644
--- a/packages/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/lib/src/google_map.dart
@@ -30,6 +30,7 @@ class GoogleMap extends StatefulWidget {
     this.tiltGesturesEnabled = true,
     this.myLocationEnabled = false,
     this.markers,
+    this.polylines,
     this.onCameraMoveStarted,
     this.onCameraMove,
     this.onCameraIdle,
@@ -71,6 +72,9 @@ class GoogleMap extends StatefulWidget {
   /// Markers to be placed on the map.
   final Set<Marker> markers;
 
+  /// Polylines to be placed on the map.
+  final Set<Polyline> polylines;
+
   /// Called when the camera starts moving.
   ///
   /// This can be initiated by the following:
@@ -140,6 +144,7 @@ class _GoogleMapState extends State<GoogleMap> {
       Completer<GoogleMapController>();
 
   Map<MarkerId, Marker> _markers = <MarkerId, Marker>{};
+  Map<PolylineId, Polyline> _polylines = <PolylineId, Polyline>{};
   _GoogleMapOptions _googleMapOptions;
 
   @override
@@ -148,6 +153,7 @@ class _GoogleMapState extends State<GoogleMap> {
       'initialCameraPosition': widget.initialCameraPosition?._toMap(),
       'options': _googleMapOptions.toMap(),
       'markersToAdd': _serializeMarkerSet(widget.markers),
+      'polylinesToAdd': _serializePolylineSet(widget.polylines),
     };
     if (defaultTargetPlatform == TargetPlatform.android) {
       return AndroidView(
@@ -176,6 +182,7 @@ class _GoogleMapState extends State<GoogleMap> {
     super.initState();
     _googleMapOptions = _GoogleMapOptions.fromWidget(widget);
     _markers = _keyByMarkerId(widget.markers);
+    _polylines = _keyByPolylineId(widget.polylines);
   }
 
   @override
@@ -183,6 +190,7 @@ class _GoogleMapState extends State<GoogleMap> {
     super.didUpdateWidget(oldWidget);
     _updateOptions();
     _updateMarkers();
+    _updatePolylines();
   }
 
   void _updateOptions() async {
@@ -204,6 +212,13 @@ class _GoogleMapState extends State<GoogleMap> {
     _markers = _keyByMarkerId(widget.markers);
   }
 
+  void _updatePolylines() async {
+    final GoogleMapController controller = await _controller.future;
+    controller._updatePolylines(
+        _PolylineUpdates.from(_polylines.values.toSet(), widget.polylines));
+    _polylines = _keyByPolylineId(widget.polylines);
+  }
+
   Future<void> onPlatformViewCreated(int id) async {
     final GoogleMapController controller = await GoogleMapController.init(
       id,
@@ -222,6 +237,12 @@ class _GoogleMapState extends State<GoogleMap> {
     _markers[markerId].onTap();
   }
 
+  void onPolylineTap(String polylineIdParam) {
+    assert(polylineIdParam != null);
+    final PolylineId polylineId = PolylineId(polylineIdParam);
+    _polylines[polylineId].onTap();
+  }
+
   void onInfoWindowTap(String markerIdParam) {
     assert(markerIdParam != null);
     final MarkerId markerId = MarkerId(markerIdParam);
diff --git a/packages/google_maps_flutter/lib/src/joint_type.dart b/packages/google_maps_flutter/lib/src/joint_type.dart
new file mode 100644
index 000000000000..26eee4e3ef63
--- /dev/null
+++ b/packages/google_maps_flutter/lib/src/joint_type.dart
@@ -0,0 +1,25 @@
+part of google_maps_flutter;
+
+/// Joint types for [Polyline].
+@immutable
+class JointType {
+  const JointType._(this.value);
+
+  /// The value representing the [JointType] on the sdk.
+  final int value;
+
+  /// Mitered joint, with fixed pointed extrusion equal to half the stroke width on the outside of the joint.
+  ///
+  /// Constant Value: 0
+  static const JointType mitered = JointType._(0);
+
+  /// Flat bevel on the outside of the joint.
+  ///
+  /// Constant Value: 1
+  static const JointType bevel = JointType._(1);
+
+  /// Rounded on the outside of the joint by an arc of radius equal to half the stroke width, centered at the vertex.
+  ///
+  /// Constant Value: 2
+  static const JointType round = JointType._(2);
+}
diff --git a/packages/google_maps_flutter/lib/src/pattern_item.dart b/packages/google_maps_flutter/lib/src/pattern_item.dart
new file mode 100644
index 000000000000..620af0ebd9d4
--- /dev/null
+++ b/packages/google_maps_flutter/lib/src/pattern_item.dart
@@ -0,0 +1,29 @@
+part of google_maps_flutter;
+
+/// Item used in the stroke pattern for a Polyline.
+@immutable
+class PatternItem {
+  const PatternItem._(this._json);
+
+  static const PatternItem dot = PatternItem._(<dynamic>['dot']);
+
+  /// A dash used in the stroke pattern for a [Polyline].
+  ///
+  /// [length] has to be non-negative.
+  static PatternItem dash(double length) {
+    assert(length >= 0.0);
+    return PatternItem._(<dynamic>['dash', length]);
+  }
+
+  /// A gap used in the stroke pattern for a [Polyline].
+  ///
+  /// [length] has to be non-negative.
+  static PatternItem gap(double length) {
+    assert(length >= 0.0);
+    return PatternItem._(<dynamic>['gap', length]);
+  }
+
+  final dynamic _json;
+
+  dynamic _toJson() => _json;
+}
diff --git a/packages/google_maps_flutter/lib/src/polyline.dart b/packages/google_maps_flutter/lib/src/polyline.dart
new file mode 100644
index 000000000000..563b5ec0148e
--- /dev/null
+++ b/packages/google_maps_flutter/lib/src/polyline.dart
@@ -0,0 +1,232 @@
+part of google_maps_flutter;
+
+/// Uniquely identifies a [Polyline] among [GoogleMap] polylines.
+///
+/// This does not have to be globally unique, only unique among the list.
+@immutable
+class PolylineId {
+  PolylineId(this.value) : assert(value != null);
+
+  /// value of the [PolylineId].
+  final String value;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final PolylineId typedOther = other;
+    return value == typedOther.value;
+  }
+
+  @override
+  int get hashCode => value.hashCode;
+
+  @override
+  String toString() {
+    return 'PolylineId{value: $value}';
+  }
+}
+
+/// Draws a line through geographical locations on the map.
+@immutable
+class Polyline {
+  const Polyline({
+    @required this.polylineId,
+    this.consumeTapEvents = false,
+    this.color = Colors.black,
+    this.endCap = Cap.buttCap,
+    this.geodesic = false,
+    this.jointType = JointType.mitered,
+    this.points = const <LatLng>[],
+    this.patterns = const <PatternItem>[],
+    this.startCap = Cap.buttCap,
+    this.visible = true,
+    this.width = 10,
+    this.zIndex = 0,
+    this.onTap,
+  });
+
+  /// Uniquely identifies a [Polyline].
+  final PolylineId polylineId;
+
+  /// True if the [Polyline] consumes tap events.
+  ///
+  /// If this is false, [onTap] callback will not be triggered.
+  final bool consumeTapEvents;
+
+  /// Line segment color in ARGB format, the same format used by Color. The default value is black (0xff000000).
+  final Color color;
+
+  /// Indicates whether the segments of the polyline should be drawn as geodesics, as opposed to straight lines
+  /// on the Mercator projection.
+  ///
+  /// A geodesic is the shortest path between two points on the Earth's surface.
+  /// The geodesic curve is constructed assuming the Earth is a sphere
+  final bool geodesic;
+
+  /// Joint type of the polyline line segments.
+  ///
+  /// The joint type defines the shape to be used when joining adjacent line segments at all vertices of the
+  /// polyline except the start and end vertices. See [JointType] for supported joint types. The default value is
+  /// mitered.
+  ///
+  /// Supported on Android only.
+  final JointType jointType;
+
+  /// The stroke pattern for the polyline.
+  ///
+  /// Solid or a sequence of PatternItem objects to be repeated along the line.
+  /// Available PatternItem types: Gap (defined by gap length in pixels), Dash (defined by line width and dash
+  /// length in pixels) and Dot (circular, centered on the line, diameter defined by line width in pixels).
+  final List<PatternItem> patterns;
+
+  /// The vertices of the polyline to be drawn.
+  ///
+  /// Line segments are drawn between consecutive points. A polyline is not closed by
+  /// default; to form a closed polyline, the start and end points must be the same.
+  final List<LatLng> points;
+
+  /// The cap at the start vertex of the polyline.
+  ///
+  /// The default start cap is ButtCap.
+  ///
+  /// Supported on Android only.
+  final Cap startCap;
+
+  /// The cap at the end vertex of the polyline.
+  ///
+  /// The default end cap is ButtCap.
+  ///
+  /// Supported on Android only.
+  final Cap endCap;
+
+  /// True if the marker is visible.
+  final bool visible;
+
+  /// Width of the polyline, used to define the width of the line segment to be drawn.
+  ///
+  /// The width is constant and independent of the camera's zoom level.
+  /// The default value is 10.
+  final int width;
+
+  /// The z-index of the polyline, used to determine relative drawing order of
+  /// map overlays.
+  ///
+  /// Overlays are drawn in order of z-index, so that lower values means drawn
+  /// earlier, and thus appearing to be closer to the surface of the Earth.
+  final int zIndex;
+
+  /// Callbacks to receive tap events for polyline placed on this map.
+  final VoidCallback onTap;
+
+  /// Creates a new [Polyline] object whose values are the same as this instance,
+  /// unless overwritten by the specified parameters.
+  Polyline copyWith({
+    Color colorParam,
+    bool consumeTapEventsParam,
+    Cap endCapParam,
+    bool geodesicParam,
+    JointType jointTypeParam,
+    List<PatternItem> patternsParam,
+    List<LatLng> pointsParam,
+    Cap startCapParam,
+    bool visibleParam,
+    int widthParam,
+    int zIndexParam,
+    VoidCallback onTapParam,
+  }) {
+    return Polyline(
+      polylineId: polylineId,
+      color: colorParam ?? color,
+      consumeTapEvents: consumeTapEventsParam ?? consumeTapEvents,
+      endCap: endCapParam ?? endCap,
+      geodesic: geodesicParam ?? geodesic,
+      jointType: jointTypeParam ?? jointType,
+      patterns: patternsParam ?? patterns,
+      points: pointsParam ?? points,
+      startCap: startCapParam ?? startCap,
+      visible: visibleParam ?? visible,
+      width: widthParam ?? width,
+      onTap: onTapParam ?? onTap,
+      zIndex: zIndexParam ?? zIndex,
+    );
+  }
+
+  dynamic _toJson() {
+    final Map<String, dynamic> json = <String, dynamic>{};
+
+    void addIfPresent(String fieldName, dynamic value) {
+      if (value != null) {
+        json[fieldName] = value;
+      }
+    }
+
+    addIfPresent('polylineId', polylineId.value);
+    addIfPresent('consumeTapEvents', consumeTapEvents);
+    addIfPresent('color', color.value);
+    addIfPresent('endCap', endCap?._toJson());
+    addIfPresent('geodesic', geodesic);
+    addIfPresent('jointType', jointType?.value);
+    addIfPresent('startCap', startCap?._toJson());
+    addIfPresent('visible', visible);
+    addIfPresent('width', width);
+    addIfPresent('zIndex', zIndex);
+
+    if (points != null) {
+      json['points'] = _pointsToJson();
+    }
+
+    if (patterns != null) {
+      json['pattern'] = _patternToJson();
+    }
+
+    return json;
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final Polyline typedOther = other;
+    return polylineId == typedOther.polylineId;
+  }
+
+  @override
+  int get hashCode => polylineId.hashCode;
+
+  dynamic _pointsToJson() {
+    final List<dynamic> result = <dynamic>[];
+    for (final LatLng point in points) {
+      result.add(point._toJson());
+    }
+    return result;
+  }
+
+  dynamic _patternToJson() {
+    final List<dynamic> result = <dynamic>[];
+    for (final PatternItem patternItem in patterns) {
+      if (patternItem != null) {
+        result.add(patternItem._toJson());
+      }
+    }
+    return result;
+  }
+}
+
+Map<PolylineId, Polyline> _keyByPolylineId(Iterable<Polyline> polylines) {
+  if (polylines == null) {
+    return <PolylineId, Polyline>{};
+  }
+  return Map<PolylineId, Polyline>.fromEntries(polylines.map(
+      (Polyline polyline) =>
+          MapEntry<PolylineId, Polyline>(polyline.polylineId, polyline)));
+}
+
+List<Map<String, dynamic>> _serializePolylineSet(Set<Polyline> polylines) {
+  if (polylines == null) {
+    return null;
+  }
+  return polylines
+      .map<Map<String, dynamic>>((Polyline p) => p._toJson())
+      .toList();
+}
diff --git a/packages/google_maps_flutter/lib/src/polyline_updates.dart b/packages/google_maps_flutter/lib/src/polyline_updates.dart
new file mode 100644
index 000000000000..5d82597fd212
--- /dev/null
+++ b/packages/google_maps_flutter/lib/src/polyline_updates.dart
@@ -0,0 +1,92 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of google_maps_flutter;
+
+/// [Polyline] update events to be applied to the [GoogleMap].
+///
+/// Used in [GoogleMapController] when the map is updated.
+class _PolylineUpdates {
+  /// Computes [_PolylineUpdates] given previous and current [Polyline]s.
+  _PolylineUpdates.from(Set<Polyline> previous, Set<Polyline> current) {
+    if (previous == null) {
+      previous = Set<Polyline>.identity();
+    }
+
+    if (current == null) {
+      current = Set<Polyline>.identity();
+    }
+
+    final Map<PolylineId, Polyline> previousPolylines =
+        _keyByPolylineId(previous);
+    final Map<PolylineId, Polyline> currentPolylines =
+        _keyByPolylineId(current);
+
+    final Set<PolylineId> prevPolylineIds = previousPolylines.keys.toSet();
+    final Set<PolylineId> currentPolylineIds = currentPolylines.keys.toSet();
+
+    Polyline idToCurrentPolyline(PolylineId id) {
+      return currentPolylines[id];
+    }
+
+    final Set<PolylineId> _polylineIdsToRemove =
+        prevPolylineIds.difference(currentPolylineIds);
+
+    final Set<Polyline> _polylinesToAdd = currentPolylineIds
+        .difference(prevPolylineIds)
+        .map(idToCurrentPolyline)
+        .toSet();
+
+    final Set<Polyline> _polylinesToChange = currentPolylineIds
+        .intersection(prevPolylineIds)
+        .map(idToCurrentPolyline)
+        .toSet();
+
+    polylinesToAdd = _polylinesToAdd;
+    polylineIdsToRemove = _polylineIdsToRemove;
+    polylinesToChange = _polylinesToChange;
+  }
+
+  Set<Polyline> polylinesToAdd;
+  Set<PolylineId> polylineIdsToRemove;
+  Set<Polyline> polylinesToChange;
+
+  Map<String, dynamic> _toMap() {
+    final Map<String, dynamic> updateMap = <String, dynamic>{};
+
+    void addIfNonNull(String fieldName, dynamic value) {
+      if (value != null) {
+        updateMap[fieldName] = value;
+      }
+    }
+
+    addIfNonNull('polylinesToAdd', _serializePolylineSet(polylinesToAdd));
+    addIfNonNull('polylinesToChange', _serializePolylineSet(polylinesToChange));
+    addIfNonNull('polylineIdsToRemove',
+        polylineIdsToRemove.map<dynamic>((PolylineId m) => m.value).toList());
+
+    return updateMap;
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final _PolylineUpdates typedOther = other;
+    return setEquals(polylinesToAdd, typedOther.polylinesToAdd) &&
+        setEquals(polylineIdsToRemove, typedOther.polylineIdsToRemove) &&
+        setEquals(polylinesToChange, typedOther.polylinesToChange);
+  }
+
+  @override
+  int get hashCode =>
+      hashValues(polylinesToAdd, polylineIdsToRemove, polylinesToChange);
+
+  @override
+  String toString() {
+    return '_PolylineUpdates{polylinesToAdd: $polylinesToAdd, '
+        'polylineIdsToRemove: $polylineIdsToRemove, '
+        'polylinesToChange: $polylinesToChange}';
+  }
+}
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 63421952e540..fd6241caed11 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.5
+version: 0.5.6
 
 dependencies:
   flutter:
diff --git a/packages/google_maps_flutter/test/fake_maps_controllers.dart b/packages/google_maps_flutter/test/fake_maps_controllers.dart
index fb7308c01e82..8b793eb5112b 100644
--- a/packages/google_maps_flutter/test/fake_maps_controllers.dart
+++ b/packages/google_maps_flutter/test/fake_maps_controllers.dart
@@ -16,6 +16,7 @@ class FakePlatformGoogleMap {
     channel.setMockMethodCallHandler(onMethodCall);
     updateOptions(params['options']);
     updateMarkers(params);
+    updatePolylines(params);
   }
 
   MethodChannel channel;
@@ -48,6 +49,12 @@ class FakePlatformGoogleMap {
 
   Set<Marker> markersToChange;
 
+  Set<PolylineId> polylineIdsToRemove;
+
+  Set<Polyline> polylinesToAdd;
+
+  Set<Polyline> polylinesToChange;
+
   Future<dynamic> onMethodCall(MethodCall call) {
     switch (call.method) {
       case 'map#update':
@@ -56,6 +63,9 @@ class FakePlatformGoogleMap {
       case 'markers#update':
         updateMarkers(call.arguments);
         return Future<void>.sync(() {});
+      case 'polylines#update':
+        updatePolylines(call.arguments);
+        return Future<void>.sync(() {});
       default:
         return Future<void>.sync(() {});
     }
@@ -119,6 +129,56 @@ class FakePlatformGoogleMap {
     return result;
   }
 
+  void updatePolylines(Map<dynamic, dynamic> polylineUpdates) {
+    if (polylineUpdates == null) {
+      return;
+    }
+    polylinesToAdd = _deserializePolylines(polylineUpdates['polylinesToAdd']);
+    polylineIdsToRemove =
+        _deserializePolylineIds(polylineUpdates['polylineIdsToRemove']);
+    polylinesToChange =
+        _deserializePolylines(polylineUpdates['polylinesToChange']);
+  }
+
+  Set<PolylineId> _deserializePolylineIds(List<dynamic> polylineIds) {
+    if (polylineIds == null) {
+      // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+      // https://github.com/flutter/flutter/issues/28312
+      // ignore: prefer_collection_literals
+      return Set<PolylineId>();
+    }
+    return polylineIds
+        .map((dynamic polylineId) => PolylineId(polylineId))
+        .toSet();
+  }
+
+  Set<Polyline> _deserializePolylines(dynamic polylines) {
+    if (polylines == null) {
+      // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+      // https://github.com/flutter/flutter/issues/28312
+      // ignore: prefer_collection_literals
+      return Set<Polyline>();
+    }
+    final List<dynamic> polylinesData = polylines;
+    // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+    // https://github.com/flutter/flutter/issues/28312
+    // ignore: prefer_collection_literals
+    final Set<Polyline> result = Set<Polyline>();
+    for (Map<dynamic, dynamic> polylineData in polylinesData) {
+      final String polylineId = polylineData['polylineId'];
+      final bool visible = polylineData['visible'];
+      final bool geodesic = polylineData['geodesic'];
+
+      result.add(Polyline(
+        polylineId: PolylineId(polylineId),
+        visible: visible,
+        geodesic: geodesic,
+      ));
+    }
+
+    return result;
+  }
+
   void updateOptions(Map<dynamic, dynamic> options) {
     if (options.containsKey('compassEnabled')) {
       compassEnabled = options['compassEnabled'];
diff --git a/packages/google_maps_flutter/test/polyline_updates_test.dart b/packages/google_maps_flutter/test/polyline_updates_test.dart
new file mode 100644
index 000000000000..1d04aef485fb
--- /dev/null
+++ b/packages/google_maps_flutter/test/polyline_updates_test.dart
@@ -0,0 +1,200 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+
+import 'fake_maps_controllers.dart';
+
+Set<Polyline> _toSet({Polyline p1, Polyline p2, Polyline p3}) {
+  final Set<Polyline> res = Set<Polyline>.identity();
+  if (p1 != null) {
+    res.add(p1);
+  }
+  if (p2 != null) {
+    res.add(p2);
+  }
+  if (p3 != null) {
+    res.add(p3);
+  }
+  return res;
+}
+
+Widget _mapWithPolylines(Set<Polyline> polylines) {
+  return Directionality(
+    textDirection: TextDirection.ltr,
+    child: GoogleMap(
+      initialCameraPosition: const CameraPosition(target: LatLng(10.0, 15.0)),
+      polylines: polylines,
+    ),
+  );
+}
+
+void main() {
+  final FakePlatformViewsController fakePlatformViewsController =
+      FakePlatformViewsController();
+
+  setUpAll(() {
+    SystemChannels.platform_views.setMockMethodCallHandler(
+        fakePlatformViewsController.fakePlatformViewsMethodHandler);
+  });
+
+  setUp(() {
+    fakePlatformViewsController.reset();
+  });
+
+  testWidgets('Initializing a polyline', (WidgetTester tester) async {
+    final Polyline p1 = Polyline(polylineId: PolylineId("polyline_1"));
+    await tester.pumpWidget(_mapWithPolylines(_toSet(p1: p1)));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.polylinesToAdd.length, 1);
+
+    final Polyline initializedPolyline = platformGoogleMap.polylinesToAdd.first;
+    expect(initializedPolyline, equals(p1));
+    expect(platformGoogleMap.polylineIdsToRemove.isEmpty, true);
+    expect(platformGoogleMap.polylinesToChange.isEmpty, true);
+  });
+
+  testWidgets("Adding a polyline", (WidgetTester tester) async {
+    final Polyline p1 = Polyline(polylineId: PolylineId("polyline_1"));
+    final Polyline p2 = Polyline(polylineId: PolylineId("polyline_2"));
+
+    await tester.pumpWidget(_mapWithPolylines(_toSet(p1: p1)));
+    await tester.pumpWidget(_mapWithPolylines(_toSet(p1: p1, p2: p2)));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.polylinesToAdd.length, 1);
+
+    final Polyline addedPolyline = platformGoogleMap.polylinesToAdd.first;
+    expect(addedPolyline, equals(p2));
+    expect(platformGoogleMap.polylineIdsToRemove.isEmpty, true);
+
+    expect(platformGoogleMap.polylinesToChange.length, 1);
+    expect(platformGoogleMap.polylinesToChange.first, equals(p1));
+  });
+
+  testWidgets("Removing a polyline", (WidgetTester tester) async {
+    final Polyline p1 = Polyline(polylineId: PolylineId("polyline_1"));
+
+    await tester.pumpWidget(_mapWithPolylines(_toSet(p1: p1)));
+    await tester.pumpWidget(_mapWithPolylines(null));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.polylineIdsToRemove.length, 1);
+    expect(platformGoogleMap.polylineIdsToRemove.first, equals(p1.polylineId));
+
+    expect(platformGoogleMap.polylinesToChange.isEmpty, true);
+    expect(platformGoogleMap.polylinesToAdd.isEmpty, true);
+  });
+
+  testWidgets("Updating a polyline", (WidgetTester tester) async {
+    final Polyline p1 = Polyline(polylineId: PolylineId("polyline_1"));
+    final Polyline p2 =
+        Polyline(polylineId: PolylineId("polyline_1"), geodesic: true);
+
+    await tester.pumpWidget(_mapWithPolylines(_toSet(p1: p1)));
+    await tester.pumpWidget(_mapWithPolylines(_toSet(p1: p2)));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.polylinesToChange.length, 1);
+    expect(platformGoogleMap.polylinesToChange.first, equals(p2));
+
+    expect(platformGoogleMap.polylineIdsToRemove.isEmpty, true);
+    expect(platformGoogleMap.polylinesToAdd.isEmpty, true);
+  });
+
+  testWidgets("Updating a polyline", (WidgetTester tester) async {
+    final Polyline p1 = Polyline(polylineId: PolylineId("polyline_1"));
+    final Polyline p2 =
+        Polyline(polylineId: PolylineId("polyline_1"), geodesic: true);
+
+    await tester.pumpWidget(_mapWithPolylines(_toSet(p1: p1)));
+    await tester.pumpWidget(_mapWithPolylines(_toSet(p1: p2)));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.polylinesToChange.length, 1);
+
+    final Polyline update = platformGoogleMap.polylinesToChange.first;
+    expect(update, equals(p2));
+    expect(update.geodesic, true);
+  });
+
+  testWidgets("Multi Update", (WidgetTester tester) async {
+    Polyline p1 = Polyline(polylineId: PolylineId("polyline_1"));
+    Polyline p2 = Polyline(polylineId: PolylineId("polyline_2"));
+    final Set<Polyline> prev = _toSet(p1: p1, p2: p2);
+    p1 = Polyline(polylineId: PolylineId("polyline_1"), visible: false);
+    p2 = Polyline(polylineId: PolylineId("polyline_2"), geodesic: true);
+    final Set<Polyline> cur = _toSet(p1: p1, p2: p2);
+
+    await tester.pumpWidget(_mapWithPolylines(prev));
+    await tester.pumpWidget(_mapWithPolylines(cur));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.polylinesToChange, cur);
+    expect(platformGoogleMap.polylineIdsToRemove.isEmpty, true);
+    expect(platformGoogleMap.polylinesToAdd.isEmpty, true);
+  });
+
+  testWidgets("Multi Update", (WidgetTester tester) async {
+    Polyline p2 = Polyline(polylineId: PolylineId("polyline_2"));
+    final Polyline p3 = Polyline(polylineId: PolylineId("polyline_3"));
+    final Set<Polyline> prev = _toSet(p2: p2, p3: p3);
+
+    // p1 is added, p2 is updated, p3 is removed.
+    final Polyline p1 = Polyline(polylineId: PolylineId("polyline_1"));
+    p2 = Polyline(polylineId: PolylineId("polyline_2"), geodesic: true);
+    final Set<Polyline> cur = _toSet(p1: p1, p2: p2);
+
+    await tester.pumpWidget(_mapWithPolylines(prev));
+    await tester.pumpWidget(_mapWithPolylines(cur));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.polylinesToChange.length, 1);
+    expect(platformGoogleMap.polylinesToAdd.length, 1);
+    expect(platformGoogleMap.polylineIdsToRemove.length, 1);
+
+    expect(platformGoogleMap.polylinesToChange.first, equals(p2));
+    expect(platformGoogleMap.polylinesToAdd.first, equals(p1));
+    expect(platformGoogleMap.polylineIdsToRemove.first, equals(p3.polylineId));
+  });
+
+  testWidgets(
+    "Partial Update",
+    (WidgetTester tester) async {
+      final Polyline p1 = Polyline(polylineId: PolylineId("polyline_1"));
+      Polyline p2 = Polyline(polylineId: PolylineId("polyline_2"));
+      final Set<Polyline> prev = _toSet(p1: p1, p2: p2);
+      p2 = Polyline(polylineId: PolylineId("polyline_2"), geodesic: true);
+      final Set<Polyline> cur = _toSet(p1: p1, p2: p2);
+
+      await tester.pumpWidget(_mapWithPolylines(prev));
+      await tester.pumpWidget(_mapWithPolylines(cur));
+
+      final FakePlatformGoogleMap platformGoogleMap =
+          fakePlatformViewsController.lastCreatedView;
+
+      expect(platformGoogleMap.polylinesToChange, _toSet(p2: p2));
+      expect(platformGoogleMap.polylineIdsToRemove.isEmpty, true);
+      expect(platformGoogleMap.polylinesToAdd.isEmpty, true);
+    },
+    // The test is currently broken due to a bug (we're updating all polylines
+    // instead of just the ones that were changed):
+    // https://github.com/flutter/flutter/issues/30764
+    // TODO(amirh): enable this test when the issue is fixed.
+    skip: true,
+  );
+}

From 4069817571bfb1167d95f4a1dac26bba4b907ab0 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Thu, 11 Apr 2019 10:33:51 -0700
Subject: [PATCH 322/410] [google_maps_flutter] Add a bitmap descriptor that is
 aware of scale (#1478)

* commit scaled assets

* make distinct colors for diff dpi

* example app for all icons issues

* fix all issues

* changelog and pubspec

* Update packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m

Co-Authored-By: iskakaushik <iska.kaushik@gmail.com>
---
 packages/google_maps_flutter/CHANGELOG.md     |   4 +
 .../flutter/plugins/googlemaps/Convert.java   |   8 ++
 .../example/assets/2.0x/red_square.png        | Bin 0 -> 304 bytes
 .../example/assets/3.0x/red_square.png        | Bin 0 -> 312 bytes
 .../example/assets/red_square.png             | Bin 4383 -> 195 bytes
 .../google_maps_flutter/example/lib/main.dart |   2 +
 .../example/lib/marker_icons.dart             |  87 ++++++++++++++++++
 .../example/lib/place_marker.dart             |   2 +-
 .../google_maps_flutter/example/pubspec.yaml  |   2 +-
 .../ios/Classes/GoogleMapMarkerController.m   |  27 ++++++
 .../google_maps_flutter/lib/src/bitmap.dart   |  27 ++++++
 packages/google_maps_flutter/pubspec.yaml     |   2 +-
 12 files changed, 158 insertions(+), 3 deletions(-)
 create mode 100644 packages/google_maps_flutter/example/assets/2.0x/red_square.png
 create mode 100644 packages/google_maps_flutter/example/assets/3.0x/red_square.png
 create mode 100644 packages/google_maps_flutter/example/lib/marker_icons.dart

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index fe9a33b97b65..7ee2d58ba441 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.7
+
+* Add a BitmapDescriptor that is aware of scale.
+
 ## 0.5.6
 
 * Add support for Polylines on GoogleMap.
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
index dc400fb602e3..9ef0283743f6 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
@@ -50,6 +50,14 @@ private static BitmapDescriptor toBitmapDescriptor(Object o) {
           return BitmapDescriptorFactory.fromAsset(
               FlutterMain.getLookupKeyForAsset(toString(data.get(1)), toString(data.get(2))));
         }
+      case "fromAssetImage":
+        if (data.size() == 3) {
+          return BitmapDescriptorFactory.fromAsset(
+              FlutterMain.getLookupKeyForAsset(toString(data.get(1))));
+        } else {
+          throw new IllegalArgumentException(
+              "'fromAssetImage' Expected exactly 3 arguments, got: " + data.size());
+        }
       case "fromBytes":
         return getBitmapFromBytes(data);
       default:
diff --git a/packages/google_maps_flutter/example/assets/2.0x/red_square.png b/packages/google_maps_flutter/example/assets/2.0x/red_square.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f82237796bf8fd2f178f9e758330b88cf715db2
GIT binary patch
literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8Uxs6XMFi@E-`O@66Nz
ziZCX5ySp&{XVSd~<Zu>vL>4nJh^c}wqi2xH2cRH(iKnkC`(qX^4o2nTuqlgyLPDM{
zjv*GOlM^IZ7bl4HG(F^GV0pm6c<KAQ5}>SViEBhjN@7W>RdP`(kYX@0FtpS)Fwr$M
z2r)FZGBC0-FwiwH2a=`jO&~8KH00)|WTsW3YcRAjHic*~j#{}AsDZ)L)z4*}Q$iB}
Dk-bi6

literal 0
HcmV?d00001

diff --git a/packages/google_maps_flutter/example/assets/3.0x/red_square.png b/packages/google_maps_flutter/example/assets/3.0x/red_square.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e2739974e7bb4101cc42f520ece096cb2f5ade7
GIT binary patch
literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^6F``e8A#skDEJMeSkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPMC&ZPZf#LuE|04GK
z{y-7NByV>Y#{W#Z_kbME0*}aI1_m)z5N7lYQuzQBWH0gbb!C6d!o|U8+TNu22`D7x
z>EamTas2H;Lq;I)(1Nf2xxD-f7#JR0XW-hvz-VXkX+BU~wZt`|BqgyV)hf9t6-Y4{
z85mmX8kp!B8iW{{S{WExnHuXFm|GbbJl~<a0!2e^eoAIqC2kGVo=z13YGCkm^>bP0
Hl+XkKwG2>~

literal 0
HcmV?d00001

diff --git a/packages/google_maps_flutter/example/assets/red_square.png b/packages/google_maps_flutter/example/assets/red_square.png
index af570f4f58b4e5c325590edafffe9bacc322cae5..650a2dee711d0d404163de8d0e479d68e31d1662 100644
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=CqbAk63)r1AkM7~$#S7?R=q_WVZP1_OZu2ihZzoWI>~S6q<T
v9;_1o_}2B!*R9!i|Cd|MxRwN%{fzl#B-4`1Z=J3K?O^b9^>bP0l+XkKvphU~

literal 4383
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
SEzg`@XAKoybm2{_(0>7_n48=H

diff --git a/packages/google_maps_flutter/example/lib/main.dart b/packages/google_maps_flutter/example/lib/main.dart
index 9b99b4f9ea56..45a77bddf031 100644
--- a/packages/google_maps_flutter/example/lib/main.dart
+++ b/packages/google_maps_flutter/example/lib/main.dart
@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'animate_camera.dart';
 import 'map_coordinates.dart';
 import 'map_ui.dart';
+import 'marker_icons.dart';
 import 'move_camera.dart';
 import 'page.dart';
 import 'place_marker.dart';
@@ -18,6 +19,7 @@ final List<Page> _allPages = <Page>[
   AnimateCameraPage(),
   MoveCameraPage(),
   PlaceMarkerPage(),
+  MarkerIconsPage(),
   ScrollingMapPage(),
   PlacePolylinePage(),
 ];
diff --git a/packages/google_maps_flutter/example/lib/marker_icons.dart b/packages/google_maps_flutter/example/lib/marker_icons.dart
new file mode 100644
index 000000000000..b5445b9982ff
--- /dev/null
+++ b/packages/google_maps_flutter/example/lib/marker_icons.dart
@@ -0,0 +1,87 @@
+import 'package:flutter/material.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+
+import 'page.dart';
+
+class MarkerIconsPage extends Page {
+  MarkerIconsPage() : super(const Icon(Icons.image), 'Marker icons');
+
+  @override
+  Widget build(BuildContext context) {
+    return const MarkerIconsBody();
+  }
+}
+
+class MarkerIconsBody extends StatefulWidget {
+  const MarkerIconsBody();
+
+  @override
+  State<StatefulWidget> createState() => MarkerIconsBodyState();
+}
+
+const LatLng _kMapCenter = LatLng(52.4478, -3.5402);
+
+class MarkerIconsBodyState extends State<MarkerIconsBody> {
+  GoogleMapController controller;
+  BitmapDescriptor _markerIcon;
+
+  @override
+  Widget build(BuildContext context) {
+    _createMarkerImageFromAsset(context);
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: <Widget>[
+        Center(
+          child: SizedBox(
+            width: 350.0,
+            height: 300.0,
+            child: GoogleMap(
+              initialCameraPosition: const CameraPosition(
+                target: _kMapCenter,
+                zoom: 7.0,
+              ),
+              markers: _createMarker(),
+              onMapCreated: _onMapCreated,
+            ),
+          ),
+        )
+      ],
+    );
+  }
+
+  Set<Marker> _createMarker() {
+    // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+    // https://github.com/flutter/flutter/issues/28312
+    // ignore: prefer_collection_literals
+    return <Marker>[
+      Marker(
+        markerId: MarkerId("marker_1"),
+        position: _kMapCenter,
+        icon: _markerIcon,
+      ),
+    ].toSet();
+  }
+
+  Future<void> _createMarkerImageFromAsset(BuildContext context) async {
+    if (_markerIcon == null) {
+      final ImageConfiguration imageConfiguration =
+          createLocalImageConfiguration(context);
+      BitmapDescriptor.fromAssetImage(
+              imageConfiguration, 'assets/red_square.png')
+          .then(_updateBitmap);
+    }
+  }
+
+  void _updateBitmap(BitmapDescriptor bitmap) {
+    setState(() {
+      _markerIcon = bitmap;
+    });
+  }
+
+  void _onMapCreated(GoogleMapController controllerParam) {
+    setState(() {
+      controller = controllerParam;
+    });
+  }
+}
diff --git a/packages/google_maps_flutter/example/lib/place_marker.dart b/packages/google_maps_flutter/example/lib/place_marker.dart
index 1487ddfe2a49..7699239fa427 100644
--- a/packages/google_maps_flutter/example/lib/place_marker.dart
+++ b/packages/google_maps_flutter/example/lib/place_marker.dart
@@ -233,7 +233,7 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
         Completer<BitmapDescriptor>();
     final ImageConfiguration config = createLocalImageConfiguration(context);
 
-    const AssetImage("assets/red_square.png")
+    const AssetImage('assets/red_square.png')
         .resolve(config)
         .addListener((ImageInfo image, bool sync) async {
       final ByteData bytes =
diff --git a/packages/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/example/pubspec.yaml
index e804e2880393..799d80e76328 100644
--- a/packages/google_maps_flutter/example/pubspec.yaml
+++ b/packages/google_maps_flutter/example/pubspec.yaml
@@ -29,7 +29,7 @@ flutter:
 
   # To add assets to your application, add an assets section, like this:
   assets:
-    - assets/red_square.png
+    - assets/
   #  - images/a_dot_ham.jpeg
 
   # An image asset can refer to one or more resolution-specific "variants", see
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
index 96af64da477e..d7c895a2e5df 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
@@ -153,6 +153,19 @@ static void InterpretInfoWindow(id<FLTGoogleMapMarkerOptionsSink> sink, NSDictio
   }
 }
 
+static UIImage* scaleImage(UIImage* image, NSNumber* scaleParam) {
+  double scale = 1.0;
+  if ([scaleParam isKindOfClass:[NSNumber class]]) {
+    scale = scaleParam.doubleValue;
+  }
+  if (fabs(scale - 1) > 1e-3) {
+    return [UIImage imageWithCGImage:[image CGImage]
+                               scale:(image.scale * scale)
+                         orientation:(image.imageOrientation)];
+  }
+  return image;
+}
+
 static UIImage* ExtractIcon(NSObject<FlutterPluginRegistrar>* registrar, NSArray* iconData) {
   UIImage* image;
   if ([iconData.firstObject isEqualToString:@"defaultMarker"]) {
@@ -168,6 +181,20 @@ static void InterpretInfoWindow(id<FLTGoogleMapMarkerOptionsSink> sink, NSDictio
       image = [UIImage imageNamed:[registrar lookupKeyForAsset:iconData[1]
                                                    fromPackage:iconData[2]]];
     }
+  } else if ([iconData.firstObject isEqualToString:@"fromAssetImage"]) {
+    if (iconData.count == 3) {
+      image = [UIImage imageNamed:[registrar lookupKeyForAsset:iconData[1]]];
+      NSNumber* scaleParam = iconData[2];
+      image = scaleImage(image, scaleParam);
+    } else {
+      NSString* error =
+          [NSString stringWithFormat:@"'fromAssetImage' should have exactly 3 arguments. Got: %lu",
+                                     iconData.count];
+      NSException* exception = [NSException exceptionWithName:@"InvalidBitmapDescriptor"
+                                                       reason:error
+                                                     userInfo:nil];
+      @throw exception;
+    }
   } else if ([iconData[0] isEqualToString:@"fromBytes"]) {
     if (iconData.count == 2) {
       @try {
diff --git a/packages/google_maps_flutter/lib/src/bitmap.dart b/packages/google_maps_flutter/lib/src/bitmap.dart
index e64147df7d23..2027eee3394e 100644
--- a/packages/google_maps_flutter/lib/src/bitmap.dart
+++ b/packages/google_maps_flutter/lib/src/bitmap.dart
@@ -35,6 +35,10 @@ class BitmapDescriptor {
 
   /// Creates a BitmapDescriptor using the name of a bitmap image in the assets
   /// directory.
+  ///
+  /// Use [fromAssetImage]. This method does not respect the screen dpi when
+  /// picking an asset image.
+  @Deprecated("Use fromAssetImage instead")
   static BitmapDescriptor fromAsset(String assetName, {String package}) {
     if (package == null) {
       return BitmapDescriptor._(<dynamic>['fromAsset', assetName]);
@@ -43,6 +47,29 @@ class BitmapDescriptor {
     }
   }
 
+  /// Creates a [BitmapDescriptor] from an asset image.
+  ///
+  /// Asset images in flutter are stored per:
+  /// https://flutter.dev/docs/development/ui/assets-and-images#declaring-resolution-aware-image-assets
+  /// This method takes into consideration various asset resolutions
+  /// and scales the images to the right resolution depending on the dpi.
+  static Future<BitmapDescriptor> fromAssetImage(
+    ImageConfiguration configuration,
+    String assetName, {
+    AssetBundle bundle,
+    String package,
+  }) async {
+    final AssetImage assetImage =
+        AssetImage(assetName, package: package, bundle: bundle);
+    final AssetBundleImageKey assetBundleImageKey =
+        await assetImage.obtainKey(configuration);
+    return BitmapDescriptor._(<dynamic>[
+      'fromAssetImage',
+      assetBundleImageKey.name,
+      assetBundleImageKey.scale,
+    ]);
+  }
+
   /// Creates a BitmapDescriptor using an array of bytes that must be encoded
   /// as PNG.
   static BitmapDescriptor fromBytes(Uint8List byteData) {
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index fd6241caed11..4854974d0d9e 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.6
+version: 0.5.7
 
 dependencies:
   flutter:

From a4e303b7330067099acc3dadf71a0aa3ca25f927 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Thu, 11 Apr 2019 10:34:51 -0700
Subject: [PATCH 323/410] [Image_picker] ios minimum deployment target to 8.0.
 (#1483)

Flutter requires minimum iOS to be 8.0 so the plugin should be the same.
---
 packages/image_picker/CHANGELOG.md             | 4 ++++
 packages/image_picker/ios/image_picker.podspec | 1 +
 packages/image_picker/pubspec.yaml             | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index e5d2bcf031ab..0d0f440f2b27 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.3
+
+* Update minimum deploy iOS version to 8.0.
+
 ## 0.5.3
 
 * Fixed incorrect path being returned from Google Photos on Android.
diff --git a/packages/image_picker/ios/image_picker.podspec b/packages/image_picker/ios/image_picker.podspec
index 1a0f2d4c8024..c11cb1cf92a0 100755
--- a/packages/image_picker/ios/image_picker.podspec
+++ b/packages/image_picker/ios/image_picker.podspec
@@ -14,5 +14,6 @@ Flutter plugin that shows an image picker.
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
+  s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
 end
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 66674e2c7113..bffea3a197b5 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.3
+version: 0.6.3
 
 flutter:
   plugin:

From 07b486f16bbb48a86d7c707bf4c6be03ba634c89 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Thu, 11 Apr 2019 11:14:00 -0700
Subject: [PATCH 324/410] Fix unused vars and rename (#1485)

* Remove unused field, also rename better

* Update changelog and pubspec

* fix format

* camera position
---
 packages/google_maps_flutter/CHANGELOG.md        |  4 ++++
 .../io/flutter/plugins/googlemaps/Convert.java   | 16 ++++++++--------
 .../plugins/googlemaps/GoogleMapController.java  |  6 ++----
 packages/google_maps_flutter/pubspec.yaml        |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 7ee2d58ba441..5d3d4ae5917e 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.8
+
+* Remove some unused variables and rename method
+
 ## 0.5.7
 
 * Add a BitmapDescriptor that is aware of scale.
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
index 9ef0283743f6..fa037ceda5a6 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
@@ -142,7 +142,7 @@ private static int toInt(Object o) {
     return ((Number) o).intValue();
   }
 
-  static Object latlngBoundsToJson(CameraPosition position) {
+  static Object cameraPositionToJson(CameraPosition position) {
     if (position == null) {
       return null;
     }
@@ -154,6 +154,13 @@ static Object latlngBoundsToJson(CameraPosition position) {
     return data;
   }
 
+  static Object latlngBoundsToJson(LatLngBounds latLngBounds) {
+    final Map<String, Object> arguments = new HashMap<>(2);
+    arguments.put("southwest", latLngToJson(latLngBounds.southwest));
+    arguments.put("northeast", latLngToJson(latLngBounds.northeast));
+    return arguments;
+  }
+
   static Object markerIdToJson(String markerId) {
     if (markerId == null) {
       return null;
@@ -176,13 +183,6 @@ static Object latLngToJson(LatLng latLng) {
     return Arrays.asList(latLng.latitude, latLng.longitude);
   }
 
-  public static Object latlngBoundsToJson(LatLngBounds latLngBounds) {
-    final Map<String, Object> arguments = new HashMap<>(2);
-    arguments.put("southwest", latLngToJson(latLngBounds.southwest));
-    arguments.put("northeast", latLngToJson(latLngBounds.northeast));
-    return arguments;
-  }
-
   private static LatLng toLatLng(Object o) {
     final List<?> data = toList(o);
     return new LatLng(toDouble(data.get(0)), toDouble(data.get(1)));
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index a8a005387aec..fc921d08bdf8 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -62,7 +62,6 @@ final class GoogleMapController
   private final MethodChannel methodChannel;
   private final PluginRegistry.Registrar registrar;
   private final MapView mapView;
-  private final Map<String, PolylineController> polylines;
   private GoogleMap googleMap;
   private boolean trackCameraPosition = false;
   private boolean myLocationEnabled = false;
@@ -87,7 +86,6 @@ final class GoogleMapController
     this.activityState = activityState;
     this.registrar = registrar;
     this.mapView = new MapView(context, options);
-    this.polylines = new HashMap<>();
     this.density = context.getResources().getDisplayMetrics().density;
     methodChannel =
         new MethodChannel(registrar.messenger(), "plugins.flutter.io/google_maps_" + id);
@@ -186,7 +184,7 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
       case "map#update":
         {
           Convert.interpretGoogleMapOptions(call.argument("options"), this);
-          result.success(Convert.latlngBoundsToJson(getCameraPosition()));
+          result.success(Convert.cameraPositionToJson(getCameraPosition()));
           break;
         }
       case "map#getVisibleRegion":
@@ -304,7 +302,7 @@ public void onCameraMove() {
       return;
     }
     final Map<String, Object> arguments = new HashMap<>(2);
-    arguments.put("position", Convert.latlngBoundsToJson(googleMap.getCameraPosition()));
+    arguments.put("position", Convert.cameraPositionToJson(googleMap.getCameraPosition()));
     methodChannel.invokeMethod("camera#onMove", arguments);
   }
 
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 4854974d0d9e..3e37aa222a36 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.7
+version: 0.5.8
 
 dependencies:
   flutter:

From 029327d91ff5dfca8bbd2ea70d25eccae06e01d1 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Thu, 11 Apr 2019 14:20:26 -0700
Subject: [PATCH 325/410] [firebase_performance] Firebase Performance
 integration tests (#1486)

---
 .../firebase_performance/example/pubspec.yaml |  3 +++
 .../test_driver/firebase_performance.dart     | 26 +++++++++++++++++++
 .../firebase_performance_test.dart            | 10 +++++++
 packages/firebase_performance/pubspec.yaml    |  3 +++
 4 files changed, 42 insertions(+)
 create mode 100644 packages/firebase_performance/example/test_driver/firebase_performance.dart
 create mode 100644 packages/firebase_performance/example/test_driver/firebase_performance_test.dart

diff --git a/packages/firebase_performance/example/pubspec.yaml b/packages/firebase_performance/example/pubspec.yaml
index b7d250876461..ef9440d129f5 100644
--- a/packages/firebase_performance/example/pubspec.yaml
+++ b/packages/firebase_performance/example/pubspec.yaml
@@ -13,6 +13,9 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  test: any
 
 
 
diff --git a/packages/firebase_performance/example/test_driver/firebase_performance.dart b/packages/firebase_performance/example/test_driver/firebase_performance.dart
new file mode 100644
index 000000000000..daa0b582df87
--- /dev/null
+++ b/packages/firebase_performance/example/test_driver/firebase_performance.dart
@@ -0,0 +1,26 @@
+import 'dart:async';
+
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:firebase_performance/firebase_performance.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('firebase_performance test driver', () {
+    final FirebasePerformance performance = FirebasePerformance.instance;
+
+    test('setPerformanceCollectionEnabled', () async {
+      await performance.setPerformanceCollectionEnabled(true);
+
+      final bool enabled = await performance.isPerformanceCollectionEnabled();
+      expect(enabled, isTrue);
+
+      await performance.setPerformanceCollectionEnabled(false);
+      final bool disabled = await performance.isPerformanceCollectionEnabled();
+      expect(disabled, isFalse);
+    });
+  });
+}
diff --git a/packages/firebase_performance/example/test_driver/firebase_performance_test.dart b/packages/firebase_performance/example/test_driver/firebase_performance_test.dart
new file mode 100644
index 000000000000..bf95bfb51ea6
--- /dev/null
+++ b/packages/firebase_performance/example/test_driver/firebase_performance_test.dart
@@ -0,0 +1,10 @@
+import 'package:flutter_driver/flutter_driver.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('firebase_performance', () async {
+    final FlutterDriver driver = await FlutterDriver.connect();
+    await driver.requestData(null, timeout: const Duration(minutes: 1));
+    driver.close();
+  });
+}
diff --git a/packages/firebase_performance/pubspec.yaml b/packages/firebase_performance/pubspec.yaml
index 5c7d34b07e7d..2a6c93db57ad 100644
--- a/packages/firebase_performance/pubspec.yaml
+++ b/packages/firebase_performance/pubspec.yaml
@@ -15,6 +15,9 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   firebase_core: ^0.3.0
+  flutter_driver:
+    sdk: flutter
+  test: any
 
 flutter:
   plugin:

From be7333f19473e3c8db3711273b6b38db828b7c07 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Thu, 11 Apr 2019 17:53:35 -0700
Subject: [PATCH 326/410] version fix (#1488)

---
 packages/image_picker/CHANGELOG.md | 2 +-
 packages/image_picker/pubspec.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 0d0f440f2b27..17451c0f66dd 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.6.3
+## 0.5.3+1
 
 * Update minimum deploy iOS version to 8.0.
 
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index bffea3a197b5..17adca140909 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.6.3
+version: 0.5.3+1
 
 flutter:
   plugin:

From 046bbc92ee8129afe4a66519d287daa6e279709a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= <linus@folkdatorn.se>
Date: Fri, 12 Apr 2019 02:13:12 +0100
Subject: [PATCH 327/410] [video_player] Explicitly indicate that self should
 be retained (#1484)

Explicitly indicate that self should be retained. Fixes the `implicit-retain-self` warnings that otherwise prints whenever you build this project.
---
 packages/video_player/CHANGELOG.md                   |  4 ++++
 .../video_player/ios/Classes/VideoPlayerPlugin.m     | 12 ++++++------
 packages/video_player/pubspec.yaml                   |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md
index de5f66e5afd7..2cc77e4904f9 100644
--- a/packages/video_player/CHANGELOG.md
+++ b/packages/video_player/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.0+5
+
+* Fixed iOS build warnings about implicit retains.
+
 ## 0.10.0+4
 
 * Android: Upgrade ExoPlayer to 2.9.6.
diff --git a/packages/video_player/ios/Classes/VideoPlayerPlugin.m b/packages/video_player/ios/Classes/VideoPlayerPlugin.m
index cbe109bc7c35..5554b21006a4 100644
--- a/packages/video_player/ios/Classes/VideoPlayerPlugin.m
+++ b/packages/video_player/ios/Classes/VideoPlayerPlugin.m
@@ -86,12 +86,12 @@ - (void)addObservers:(AVPlayerItem*)item {
                                                     object:[_player currentItem]
                                                      queue:[NSOperationQueue mainQueue]
                                                 usingBlock:^(NSNotification* note) {
-                                                  if (_isLooping) {
+                                                  if (self->_isLooping) {
                                                     AVPlayerItem* p = [note object];
                                                     [p seekToTime:kCMTimeZero];
                                                   } else {
-                                                    if (_eventSink) {
-                                                      _eventSink(@{@"event" : @"completed"});
+                                                    if (self->_eventSink) {
+                                                      self->_eventSink(@{@"event" : @"completed"});
                                                     }
                                                   }
                                                 }];
@@ -185,17 +185,17 @@ - (instancetype)initWithPlayerItem:(AVPlayerItem*)item frameUpdater:(FLTFrameUpd
       if ([tracks count] > 0) {
         AVAssetTrack* videoTrack = [tracks objectAtIndex:0];
         void (^trackCompletionHandler)(void) = ^{
-          if (_disposed) return;
+          if (self->_disposed) return;
           if ([videoTrack statusOfValueForKey:@"preferredTransform"
                                         error:nil] == AVKeyValueStatusLoaded) {
             // Rotate the video by using a videoComposition and the preferredTransform
-            _preferredTransform = [self fixTransform:videoTrack];
+            self->_preferredTransform = [self fixTransform:videoTrack];
             // Note:
             // https://developer.apple.com/documentation/avfoundation/avplayeritem/1388818-videocomposition
             // Video composition can only be used with file-based media and is not supported for
             // use with media served using HTTP Live Streaming.
             AVMutableVideoComposition* videoComposition =
-                [self getVideoCompositionWithTransform:_preferredTransform
+                [self getVideoCompositionWithTransform:self->_preferredTransform
                                              withAsset:asset
                                         withVideoTrack:videoTrack];
             item.videoComposition = videoComposition;
diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml
index 5d006914ba7a..8cae1f2811ff 100644
--- a/packages/video_player/pubspec.yaml
+++ b/packages/video_player/pubspec.yaml
@@ -2,7 +2,7 @@ name: video_player
 description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
-version: 0.10.0+4
+version: 0.10.0+5
 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player
 
 flutter:

From 8a9f7044372b0c149619ce9db45d00030ec4dce7 Mon Sep 17 00:00:00 2001
From: Brett Morgan <brett.morgan@gmail.com>
Date: Thu, 11 Apr 2019 19:31:06 -0700
Subject: [PATCH 328/410] Adding links to the firebase_analytics  example
 (#1479)

* Adding links to the example

* Update pubspec.yaml

* Update CHANGELOG.md

* Update CHANGELOG.md
---
 packages/firebase_analytics/CHANGELOG.md | 4 ++++
 packages/firebase_analytics/README.md    | 7 +++++--
 packages/firebase_analytics/pubspec.yaml | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index 47e65a44c8b7..190649f1bd07 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.1+1
+
+* Added hyperlinks to example app reference in README.md.
+
 ## 2.1.1
 
 * Added screen_view tracking of Navigator.pushReplacement
diff --git a/packages/firebase_analytics/README.md b/packages/firebase_analytics/README.md
index 41f3f01403c9..f8874acc1480 100755
--- a/packages/firebase_analytics/README.md
+++ b/packages/firebase_analytics/README.md
@@ -29,9 +29,12 @@ MaterialApp(
 ```
 
 You can also track transitions within your `PageRoute` (e.g. when the user switches from one tab to another) by
-implementing `RouteAware` and subscribing it to `FirebaseAnalyticsObserver`. See `examples/lib/tabs_page.dart`
+implementing `RouteAware` and subscribing it to `FirebaseAnalyticsObserver`. See [`example/lib/tabs_page.dart`][tabs_page]
 for an example of how to wire that up.
 
 ## Getting Started
 
-See the `example` directory for a complete sample app using Google Analytics for Firebase.
+See the [`example`][example] directory for a complete sample app using Google Analytics for Firebase.
+
+[example]: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics/example
+[tabs_page]: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics/example/lib/tabs_page.dart
\ No newline at end of file
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index 5dfe71db6477..893b246e8fca 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 2.1.1
+version: 2.1.1+1
 
 flutter:
   plugin:

From 434b9fc3e35bb9b39a276154c5d5095347a310c5 Mon Sep 17 00:00:00 2001
From: Paito Anderson <pj.paito@gmail.com>
Date: Fri, 12 Apr 2019 13:03:47 -0400
Subject: [PATCH 329/410] [firebase_messaging] Additional step for iOS (#1405)

Additional firebase_messaging step for iOS in documentation
---
 packages/firebase_messaging/CHANGELOG.md | 4 ++++
 packages/firebase_messaging/README.md    | 2 +-
 packages/firebase_messaging/pubspec.yaml | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index 988a26ddd596..ed659dffb2b3 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.0+3
+
+* Update iOS configuration documentation.
+
 ## 4.0.0+2
 
 * Fix example app's floating action button that stopped working due to a breaking change.
diff --git a/packages/firebase_messaging/README.md b/packages/firebase_messaging/README.md
index 9952edb3a9b4..379e2d4f7b37 100644
--- a/packages/firebase_messaging/README.md
+++ b/packages/firebase_messaging/README.md
@@ -39,7 +39,7 @@ To integrate your plugin into the iOS part of your app, follow these steps:
 
 1. Using the [Firebase Console](https://console.firebase.google.com/) add an iOS app to your project: Follow the assistant, download the generated `GoogleService-Info.plist` file, open `ios/Runner.xcworkspace` with Xcode, and within Xcode place the file inside `ios/Runner`. **Don't** follow the steps named "Add Firebase SDK" and "Add initialization code" in the Firebase assistant.
 
-1. In Xcode, select `Runner` in the Project Navigator. In the Capabilities Tab turn on `Push Notifications`.
+1. In Xcode, select `Runner` in the Project Navigator. In the Capabilities Tab turn on `Push Notifications` and `Background Modes`, and enable `Background fetch` and `Remote notifications` under `Background Modes`.
 
 1. Remove the `use_frameworks!` line from `ios/Podfile` (workaround for [flutter/flutter#9694](https://github.com/flutter/flutter/issues/9694)).
 
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
index 2d73fe466dc2..ebc12e22d736 100644
--- a/packages/firebase_messaging/pubspec.yaml
+++ b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 4.0.0+2
+version: 4.0.0+3
 
 flutter:
   plugin:

From 9a412707c9eba5b088dd7713767625afb626f9cc Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Fri, 12 Apr 2019 18:45:18 -0700
Subject: [PATCH 330/410] BitmapDescriptor#fromBytes should be consistent
 across platforms (#1489)

- Android Bitmaps scale images to account for dpi.
- iOS UIImages do not, we need to account for that.
---
 packages/google_maps_flutter/CHANGELOG.md                     | 4 ++++
 .../ios/Classes/GoogleMapMarkerController.m                   | 3 ++-
 packages/google_maps_flutter/pubspec.yaml                     | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 5d3d4ae5917e..e737f0deea7f 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.9
+
+* BitmapDescriptor#fromBytes accounts for screen scale on ios.
+
 ## 0.5.8
 
 * Remove some unused variables and rename method
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
index d7c895a2e5df..cb5ef461c38c 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
@@ -199,7 +199,8 @@ static void InterpretInfoWindow(id<FLTGoogleMapMarkerOptionsSink> sink, NSDictio
     if (iconData.count == 2) {
       @try {
         FlutterStandardTypedData* byteData = iconData[1];
-        image = [UIImage imageWithData:[byteData data]];
+        CGFloat screenScale = [[UIScreen mainScreen] scale];
+        image = [UIImage imageWithData:[byteData data] scale:screenScale];
       } @catch (NSException* exception) {
         @throw [NSException exceptionWithName:@"InvalidByteDescriptor"
                                        reason:@"Unable to interpret bytes as a valid image."
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 3e37aa222a36..22ac204a0bba 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.8
+version: 0.5.9
 
 dependencies:
   flutter:

From 8cd76d25db13cf3b8970e4cec13e6a7228a9eb13 Mon Sep 17 00:00:00 2001
From: Daniyil Yakovlev <danny.yakovlev@gmail.com>
Date: Sun, 14 Apr 2019 19:57:34 +0300
Subject: [PATCH 331/410] [firebase_analytics] Fixes errors in
 firebase_analytics docs (#1490)

Fixes navigation examples in firebase_analytics docs
---
 packages/firebase_analytics/CHANGELOG.md      |  4 ++++
 packages/firebase_analytics/lib/observer.dart | 12 ++++++------
 packages/firebase_analytics/pubspec.yaml      |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index 190649f1bd07..cc9ad662b0c6 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.1+2
+
+* Fixed errors in code sample for `FirebaseAnalyticsObserver`.
+
 ## 2.1.1+1
 
 * Added hyperlinks to example app reference in README.md.
diff --git a/packages/firebase_analytics/lib/observer.dart b/packages/firebase_analytics/lib/observer.dart
index fc16030f17f1..d11db332573d 100644
--- a/packages/firebase_analytics/lib/observer.dart
+++ b/packages/firebase_analytics/lib/observer.dart
@@ -28,13 +28,13 @@ String defaultNameExtractor(RouteSettings settings) => settings.name;
 /// ```dart
 /// Navigator.pushNamed(context, '/contact/123');
 ///
-/// Navigator.push(context, MaterialPageRoute(
-///   settings: RouteSettings(name: '/contact/123',
-///   builder: ContactDetail(123)))),
+/// Navigator.push<void>(context, MaterialPageRoute(
+///   settings: RouteSettings(name: '/contact/123'),
+///   builder: (_) => ContactDetail(123)));
 ///
-/// Navigator.pushReplacement(context, MaterialPageRoute(
-///   settings: RouteSettings(name: '/contact/123',
-///   builder: ContactDetail(123)))),
+/// Navigator.pushReplacement<void>(context, MaterialPageRoute(
+///   settings: RouteSettings(name: '/contact/123'),
+///   builder: (_) => ContactDetail(123)));
 ///
 /// Navigator.pop(context);
 /// ```
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index 893b246e8fca..c3e2b251bd6e 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 2.1.1+1
+version: 2.1.1+2
 
 flutter:
   plugin:

From 1ca83b009bcd7d84a0db4e8358526a7efe1fd7d0 Mon Sep 17 00:00:00 2001
From: Sebastian Roth <sebastian.roth@gmail.com>
Date: Mon, 15 Apr 2019 20:01:33 +0100
Subject: [PATCH 332/410] [firebase_crashlytics] Do not break debug log
 formatting. (#1427)

* Do not break debug log formatting.
---
 packages/firebase_crashlytics/CHANGELOG.md                    | 4 ++++
 .../firebase_crashlytics/lib/src/firebase_crashlytics.dart    | 2 +-
 packages/firebase_crashlytics/pubspec.yaml                    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_crashlytics/CHANGELOG.md b/packages/firebase_crashlytics/CHANGELOG.md
index 0899d126c2ff..256ee642f31b 100644
--- a/packages/firebase_crashlytics/CHANGELOG.md
+++ b/packages/firebase_crashlytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.4+2
+
+* Keep debug log formatting.
+
 ## 0.0.4+1
 
 * Added an integration test.
diff --git a/packages/firebase_crashlytics/lib/src/firebase_crashlytics.dart b/packages/firebase_crashlytics/lib/src/firebase_crashlytics.dart
index b6fed22776da..ae2a46769d9c 100644
--- a/packages/firebase_crashlytics/lib/src/firebase_crashlytics.dart
+++ b/packages/firebase_crashlytics/lib/src/firebase_crashlytics.dart
@@ -34,7 +34,7 @@ class Crashlytics {
     }
 
     if (inDebugMode && !enableInDevMode) {
-      print(Trace.format(details.stack).trimRight().split('\n'));
+      print(Trace.format(details.stack));
     } else {
       // Report error
       final List<String> stackTraceLines =
diff --git a/packages/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/pubspec.yaml
index 3e276708753f..569dbdf30a4e 100644
--- a/packages/firebase_crashlytics/pubspec.yaml
+++ b/packages/firebase_crashlytics/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_crashlytics
 description: Flutter plugin for Firebase Crashlytics. It reports uncaught errors to the
   Firebase console.
-version: 0.0.4+1
+version: 0.0.4+2
 author: Flutter Team <flutter-dev@google.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_crashlytics
 

From 7e15d7148567253356fdc2e68656eb8518cfafc8 Mon Sep 17 00:00:00 2001
From: Quentin Le Guennec <quentin@tengio.com>
Date: Mon, 15 Apr 2019 21:21:37 +0100
Subject: [PATCH 333/410] [video_player] Android: Added missing
 event.put("event", "completed"); (#1470)

* [video_player] Added missing call to completed when the video is over in Android.

* [video_player] Updated video position to duration when video is completed.
---
 packages/video_player/CHANGELOG.md                   |  4 ++++
 .../plugins/videoplayer/VideoPlayerPlugin.java       | 12 +++++++++---
 packages/video_player/lib/video_player.dart          |  2 +-
 packages/video_player/pubspec.yaml                   |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md
index 2cc77e4904f9..362b6b02ea90 100644
--- a/packages/video_player/CHANGELOG.md
+++ b/packages/video_player/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.0+6
+
+* Android: Fix missing call to `event.put("event", "completed");` which makes it possible to detect when the video is over.
+
 ## 0.10.0+5
 
 * Fixed iOS build warnings about implicit retains.
diff --git a/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java b/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
index de4f44cdb567..0fdaa2572c92 100644
--- a/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
+++ b/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
@@ -163,9 +163,15 @@ public void onPlayerStateChanged(final boolean playWhenReady, final int playback
                 // iOS supports a list of buffered ranges, so here is a list with a single range.
                 event.put("values", Collections.singletonList(range));
                 eventSink.success(event);
-              } else if (playbackState == Player.STATE_READY && !isInitialized) {
-                isInitialized = true;
-                sendInitialized();
+              } else if (playbackState == Player.STATE_READY) {
+                if (!isInitialized) {
+                  isInitialized = true;
+                  sendInitialized();
+                }
+              } else if (playbackState == Player.STATE_ENDED) {
+                Map<String, Object> event = new HashMap<>();
+                event.put("event", "completed");
+                eventSink.success(event);
               }
             }
 
diff --git a/packages/video_player/lib/video_player.dart b/packages/video_player/lib/video_player.dart
index 441057de32b6..ce4ac70cff43 100644
--- a/packages/video_player/lib/video_player.dart
+++ b/packages/video_player/lib/video_player.dart
@@ -242,7 +242,7 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
           _applyPlayPause();
           break;
         case 'completed':
-          value = value.copyWith(isPlaying: false);
+          value = value.copyWith(isPlaying: false, position: value.duration);
           _timer?.cancel();
           break;
         case 'bufferingUpdate':
diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml
index 8cae1f2811ff..01b6a041c115 100644
--- a/packages/video_player/pubspec.yaml
+++ b/packages/video_player/pubspec.yaml
@@ -2,7 +2,7 @@ name: video_player
 description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
-version: 0.10.0+5
+version: 0.10.0+6
 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player
 
 flutter:

From fdd5189df8004d09758b164c2f23d543706ddc4e Mon Sep 17 00:00:00 2001
From: Vince Varga <vargavince91@gmail.com>
Date: Mon, 15 Apr 2019 22:23:26 +0200
Subject: [PATCH 334/410] [connectivity] Enable fetching current Wi-Fi
 network's BSSID (#1331)

Add getWifiBSSID method
---
 AUTHORS                                       |  1 +
 packages/connectivity/CHANGELOG.md            |  4 +++
 .../connectivity/ConnectivityPlugin.java      | 21 ++++++++++-----
 packages/connectivity/example/lib/main.dart   | 16 +++++++----
 .../example/test_driver/connectivity.dart     |  3 ++-
 .../ios/Classes/ConnectivityPlugin.m          | 27 ++++++++++++-------
 packages/connectivity/lib/connectivity.dart   | 10 +++++++
 packages/connectivity/pubspec.yaml            |  2 +-
 .../connectivity/test/connectivity_test.dart  | 16 +++++++++++
 9 files changed, 78 insertions(+), 22 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f497b6c6ad5d..5ab83295ae9e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,7 @@ Sarthak Verma <sarthak@artiosys.com>
 Mike Diarmid <mike@invertase.io>
 Invertase <oss@invertase.io>
 Elliot Hesp <elliot@invertase.io>
+Vince Varga <vince.varga@smaho.com>
 Aawaz Gyawali <awazgyawali@gmail.com>
 EUI Limited <ian.evans3@admiralgroup.co.uk>
 Katarina Sheremet <katarina@sheremet.ch>
diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md
index 65270ebfa150..bbd924fb29c7 100644
--- a/packages/connectivity/CHANGELOG.md
+++ b/packages/connectivity/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.3
+
+* Add getWifiBSSID to obtain current wifi network's BSSID.
+
 ## 0.4.2+2
 
 * Add integration test.
diff --git a/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java b/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
index 5694df6006ca..05b4608723f9 100644
--- a/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
+++ b/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
@@ -81,6 +81,9 @@ public void onMethodCall(MethodCall call, Result result) {
       case "wifiName":
         handleWifiName(call, result);
         break;
+      case "wifiBSSID":
+        handleBSSID(call, result);
+        break;
       case "wifiIPAddress":
         handleWifiIPAddress(call, result);
         break;
@@ -99,21 +102,27 @@ private void handleCheck(MethodCall call, final Result result) {
     }
   }
 
-  private void handleWifiName(MethodCall call, final Result result) {
+  private WifiInfo getWifiInfo() {
     WifiManager wifiManager =
         (WifiManager) registrar.context().getSystemService(Context.WIFI_SERVICE);
+    return wifiManager == null ? null : wifiManager.getConnectionInfo();
+  }
 
-    WifiInfo wifiInfo = null;
-    if (wifiManager != null) wifiInfo = wifiManager.getConnectionInfo();
-
+  private void handleWifiName(MethodCall call, final Result result) {
+    WifiInfo wifiInfo = getWifiInfo();
     String ssid = null;
     if (wifiInfo != null) ssid = wifiInfo.getSSID();
-
     if (ssid != null) ssid = ssid.replaceAll("\"", ""); // Android returns "SSID"
-
     result.success(ssid);
   }
 
+  private void handleBSSID(MethodCall call, MethodChannel.Result result) {
+    WifiInfo wifiInfo = getWifiInfo();
+    String bssid = null;
+    if (wifiInfo != null) bssid = wifiInfo.getBSSID();
+    result.success(bssid);
+  }
+
   private void handleWifiIPAddress(MethodCall call, final Result result) {
     WifiManager wifiManager =
         (WifiManager) registrar.context().getSystemService(Context.WIFI_SERVICE);
diff --git a/packages/connectivity/example/lib/main.dart b/packages/connectivity/example/lib/main.dart
index 243412e1edd1..3784a22fc241 100644
--- a/packages/connectivity/example/lib/main.dart
+++ b/packages/connectivity/example/lib/main.dart
@@ -87,27 +87,33 @@ class _MyHomePageState extends State<MyHomePage> {
   Future<void> _updateConnectionStatus(ConnectivityResult result) async {
     switch (result) {
       case ConnectivityResult.wifi:
-        String wifiName, wifiIP;
+        String wifiName, wifiBSSID, wifiIP;
 
         try {
-          wifiName = (await _connectivity.getWifiName()).toString();
+          wifiName = await _connectivity.getWifiName();
         } on PlatformException catch (e) {
           print(e.toString());
-
           wifiName = "Failed to get Wifi Name";
         }
 
         try {
-          wifiIP = (await _connectivity.getWifiIP()).toString();
+          wifiBSSID = await _connectivity.getWifiBSSID();
         } on PlatformException catch (e) {
           print(e.toString());
+          wifiBSSID = "Failed to get Wifi BSSID";
+        }
 
-          wifiName = "Failed to get Wifi IP";
+        try {
+          wifiIP = await _connectivity.getWifiIP();
+        } on PlatformException catch (e) {
+          print(e.toString());
+          wifiIP = "Failed to get Wifi IP";
         }
 
         setState(() {
           _connectionStatus = '$result\n'
               'Wifi Name: $wifiName\n'
+              'Wifi BSSID: $wifiBSSID\n'
               'Wifi IP: $wifiIP\n';
         });
         break;
diff --git a/packages/connectivity/example/test_driver/connectivity.dart b/packages/connectivity/example/test_driver/connectivity.dart
index 634a00985d8a..7efba5e4ab50 100644
--- a/packages/connectivity/example/test_driver/connectivity.dart
+++ b/packages/connectivity/example/test_driver/connectivity.dart
@@ -20,7 +20,8 @@ void main() {
       expect(result, isNotNull);
       switch (result) {
         case ConnectivityResult.wifi:
-          expect((_connectivity.getWifiName()), completes);
+          expect(_connectivity.getWifiName(), completes);
+          expect(_connectivity.getWifiBSSID(), completes);
           expect((await _connectivity.getWifiIP()), isNotNull);
           break;
         default:
diff --git a/packages/connectivity/ios/Classes/ConnectivityPlugin.m b/packages/connectivity/ios/Classes/ConnectivityPlugin.m
index 722b797cff3a..e92fff220a2e 100644
--- a/packages/connectivity/ios/Classes/ConnectivityPlugin.m
+++ b/packages/connectivity/ios/Classes/ConnectivityPlugin.m
@@ -33,18 +33,25 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
   [streamChannel setStreamHandler:instance];
 }
 
-- (NSString*)getWifiName {
-  NSString* wifiName = nil;
-  NSArray* interFaceNames = (__bridge_transfer id)CNCopySupportedInterfaces();
-
-  for (NSString* name in interFaceNames) {
-    NSDictionary* info = (__bridge_transfer id)CNCopyCurrentNetworkInfo((__bridge CFStringRef)name);
-    if (info[@"SSID"]) {
-      wifiName = info[@"SSID"];
+- (NSString*)findNetworkInfo:(NSString*)key {
+  NSString* info = nil;
+  NSArray* interfaceNames = (__bridge_transfer id)CNCopySupportedInterfaces();
+  for (NSString* interfaceName in interfaceNames) {
+    NSDictionary* networkInfo =
+        (__bridge_transfer id)CNCopyCurrentNetworkInfo((__bridge CFStringRef)interfaceName);
+    if (networkInfo[key]) {
+      info = networkInfo[key];
     }
   }
+  return info;
+}
+
+- (NSString*)getWifiName {
+  return [self findNetworkInfo:@"SSID"];
+}
 
-  return wifiName;
+- (NSString*)getBSSID {
+  return [self findNetworkInfo:@"BSSID"];
 }
 
 - (NSString*)getWifiIP {
@@ -100,6 +107,8 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     result([self statusFromReachability:[Reachability reachabilityForInternetConnection]]);
   } else if ([call.method isEqualToString:@"wifiName"]) {
     result([self getWifiName]);
+  } else if ([call.method isEqualToString:@"wifiBSSID"]) {
+    result([self getBSSID]);
   } else if ([call.method isEqualToString:@"wifiIPAddress"]) {
     result([self getWifiIP]);
   } else {
diff --git a/packages/connectivity/lib/connectivity.dart b/packages/connectivity/lib/connectivity.dart
index 8726278426ac..808e7dcc0e52 100644
--- a/packages/connectivity/lib/connectivity.dart
+++ b/packages/connectivity/lib/connectivity.dart
@@ -79,6 +79,16 @@ class Connectivity {
     return wifiName;
   }
 
+  /// Obtains the wifi BSSID of the connected network.
+  ///
+  /// Please note that it DOESN'T WORK on emulators (returns null).
+  ///
+  /// From Android 8.0 onwards the GPS must be ON (high accuracy)
+  /// in order to be able to obtain the BSSID.
+  Future<String> getWifiBSSID() async {
+    return await methodChannel.invokeMethod('wifiBSSID');
+  }
+
   /// Obtains the IP address of the connected wifi network
   Future<String> getWifiIP() async {
     return await methodChannel.invokeMethod<String>('wifiIPAddress');
diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml
index 8eff3e6e2bff..3ed7aae0c109 100644
--- a/packages/connectivity/pubspec.yaml
+++ b/packages/connectivity/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi &
   mobile/cellular) connectivity on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
-version: 0.4.2+2
+version: 0.4.3
 
 flutter:
   plugin:
diff --git a/packages/connectivity/test/connectivity_test.dart b/packages/connectivity/test/connectivity_test.dart
index 5dc2cbb0fa94..8e1b435c019e 100644
--- a/packages/connectivity/test/connectivity_test.dart
+++ b/packages/connectivity/test/connectivity_test.dart
@@ -15,6 +15,8 @@ void main() {
             return 'wifi';
           case 'wifiName':
             return '1337wifi';
+          case 'wifiBSSID':
+            return 'c0:ff:33:c0:d3:55';
           case 'wifiIPAddress':
             return '127.0.0.1';
           default:
@@ -59,6 +61,20 @@ void main() {
       );
     });
 
+    test('getWifiBSSID', () async {
+      final String result = await Connectivity().getWifiBSSID();
+      expect(result, 'c0:ff:33:c0:d3:55');
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall(
+            'wifiBSSID',
+            arguments: null,
+          ),
+        ],
+      );
+    });
+
     test('getWifiIP', () async {
       final String result = await Connectivity().getWifiIP();
       expect(result, '127.0.0.1');

From 8bdd77661c1cfc899eaad9cd14b9222611f49a39 Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@users.noreply.github.com>
Date: Mon, 15 Apr 2019 13:40:51 -0700
Subject: [PATCH 335/410] [firebase_auth] Migrate FlutterAuthPlugin from
 deprecated APIs (#1487)

* Migrate FlutterAuthPlugin from deprecated APIs

This is to mirror a change Firebase team has done in Google.

* Require FirebaseAuth v5 in the podspec
---
 packages/firebase_auth/CHANGELOG.md           |  5 +++
 .../ios/Classes/FirebaseAuthPlugin.m          | 37 ++++++++++++-------
 .../firebase_auth/ios/firebase_auth.podspec   |  2 +-
 packages/firebase_auth/pubspec.yaml           |  2 +-
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index 98e06a18f06c..a6cd6652f89a 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.8.4+3
+
+* Updated deprecated API usage on iOS to use non-deprecated versions.
+* Updated FirebaseAuth CocoaPod dependency to ensure a minimum version of 5.0.
+
 ## 0.8.4+2
 
 * Fixes an error in the documentation of createUserWithEmailAndPassword.
diff --git a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
index 3490bc9f9de7..0aeabe66d6cd 100644
--- a/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
+++ b/packages/firebase_auth/ios/Classes/FirebaseAuthPlugin.m
@@ -7,7 +7,7 @@
 #import "Firebase/Firebase.h"
 
 static NSString *getFlutterErrorCode(NSError *error) {
-  NSString *code = [error userInfo][FIRAuthErrorNameKey];
+  NSString *code = [error userInfo][FIRAuthErrorUserInfoNameKey];
   if (code != nil) {
     return code;
   }
@@ -62,6 +62,15 @@ - (FIRAuth *_Nullable)getAuth:(NSDictionary *)args {
   return [FIRAuth authWithApp:[FIRApp appNamed:appName]];
 }
 
+// TODO(jackson): We should use the renamed versions of the following methods
+// when they are available in the Firebase SDK that this plugin is dependent on.
+// * fetchSignInMethodsForEmail:completion:
+// * reauthenticateAndRetrieveDataWithCredential:completion:
+// * linkAndRetrieveDataWithCredential:completion:
+// * signInAndRetrieveDataWithCredential:completion:
+// See discussion at https://github.com/flutter/plugins/pull/1487
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
   if ([@"currentUser" isEqualToString:call.method]) {
     id __block listener = [[self getAuth:call.arguments]
@@ -170,16 +179,17 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
                       }];
   } else if ([@"reauthenticateWithCredential" isEqualToString:call.method]) {
     [[self getAuth:call.arguments].currentUser
-        reauthenticateWithCredential:[self getCredential:call.arguments]
-                          completion:^(NSError *_Nullable error) {
-                            [self sendResult:result forObject:nil error:error];
-                          }];
+        reauthenticateAndRetrieveDataWithCredential:[self getCredential:call.arguments]
+                                         completion:^(FIRAuthDataResult *r,
+                                                      NSError *_Nullable error) {
+                                           [self sendResult:result forObject:nil error:error];
+                                         }];
   } else if ([@"linkWithCredential" isEqualToString:call.method]) {
     [[self getAuth:call.arguments].currentUser
-        linkWithCredential:[self getCredential:call.arguments]
-                completion:^(FIRUser *user, NSError *error) {
-                  [self sendResult:result forUser:user error:error];
-                }];
+        linkAndRetrieveDataWithCredential:[self getCredential:call.arguments]
+                               completion:^(FIRAuthDataResult *r, NSError *error) {
+                                 [self sendResult:result forUser:r.user error:error];
+                               }];
   } else if ([@"unlinkFromProvider" isEqualToString:call.method]) {
     NSString *provider = call.arguments[@"provider"];
     [[self getAuth:call.arguments].currentUser
@@ -282,10 +292,10 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
         [[FIRPhoneAuthProvider provider] credentialWithVerificationID:verificationId
                                                      verificationCode:smsCode];
     [[self getAuth:call.arguments]
-        signInWithCredential:credential
-                  completion:^(FIRUser *_Nullable user, NSError *_Nullable error) {
-                    [self sendResult:result forUser:user error:error];
-                  }];
+        signInAndRetrieveDataWithCredential:credential
+                                 completion:^(FIRAuthDataResult *r, NSError *_Nullable error) {
+                                   [self sendResult:result forUser:r.user error:error];
+                                 }];
   } else if ([@"setLanguageCode" isEqualToString:call.method]) {
     NSString *language = call.arguments[@"language"];
     [[self getAuth:call.arguments] setLanguageCode:language];
@@ -313,6 +323,7 @@ - (NSMutableDictionary *)dictionaryFromUser:(FIRUser *)user {
   userData[@"providerData"] = providerData;
   return userData;
 }
+#pragma clang diagnostic pop
 
 - (void)sendResult:(FlutterResult)result forUser:(FIRUser *)user error:(NSError *)error {
   [self sendResult:result
diff --git a/packages/firebase_auth/ios/firebase_auth.podspec b/packages/firebase_auth/ios/firebase_auth.podspec
index 09b13032641b..39e3d7e4a62f 100755
--- a/packages/firebase_auth/ios/firebase_auth.podspec
+++ b/packages/firebase_auth/ios/firebase_auth.podspec
@@ -16,7 +16,7 @@ Firebase Auth plugin for Flutter.
   s.public_header_files = 'Classes/**/*.h'
   s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
-  s.dependency 'Firebase/Auth'
+  s.dependency 'Firebase/Auth', '~> 5.0'
   s.dependency 'Firebase/Core'
   s.static_framework = true
 end
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index e0b3ba3952c7..25aa0fe895e1 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.4+2"
+version: "0.8.4+3"
 
 flutter:
   plugin:

From 405670e916d56bebacc387a38a0381efec7841e0 Mon Sep 17 00:00:00 2001
From: Kenneth Liang <KaYBlitZ@users.noreply.github.com>
Date: Tue, 16 Apr 2019 20:37:09 -0400
Subject: [PATCH 336/410] [firebase_admob] Update documentation to add iOS
 Admob ID & add iOS Admob ID in example project (#1377)

---
 packages/firebase_admob/CHANGELOG.md          |  5 ++++
 packages/firebase_admob/README.md             | 27 ++++++++++++++++++-
 .../example/ios/Runner/Info.plist             |  2 ++
 packages/firebase_admob/pubspec.yaml          |  2 +-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_admob/CHANGELOG.md b/packages/firebase_admob/CHANGELOG.md
index 5863bb5558a0..6e3aff899926 100644
--- a/packages/firebase_admob/CHANGELOG.md
+++ b/packages/firebase_admob/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.8.0+4
+
+* Update documentation to add AdMob App ID in Info.plist
+* Add iOS AdMob App ID in Info.plist in example project
+
 ## 0.8.0+3
 
 * Log messages about automatic configuration of the default app are now less confusing.
diff --git a/packages/firebase_admob/README.md b/packages/firebase_admob/README.md
index fb6966e9b592..80a1ca5f416e 100644
--- a/packages/firebase_admob/README.md
+++ b/packages/firebase_admob/README.md
@@ -25,13 +25,26 @@ initialize the plugin in your Dart code.
 See https://goo.gl/fQ2neu for more information about configuring `AndroidManifest.xml`
 and setting up your App ID.
 
+## Info.plist changes
+
+Admob 7.42.0 requires the App ID to be included in `Info.plist`. Failure to do so will result in a crash on launch of your app. The lines should look like:
+
+```xml
+<key>GADApplicationIdentifier</key>
+<string>[ADMOB_APP_ID]</string>
+```
+
+where `[ADMOB_APP_ID]` is your App ID.  You must pass the same value when you initialize the plugin in your Dart code.
+
+See https://developers.google.com/admob/ios/quick-start#update_your_infoplist for more information about configuring `Info.plist` and setting up your App ID.
+
 ## Initializing the plugin
 The AdMob plugin must be initialized with an AdMob App ID.
 
 ```dart
 FirebaseAdMob.instance.initialize(appId: appId);
 ```
-*Note Android*:
+### Android
 Starting in version 17.0.0, if you are an AdMob publisher you are now required to add your AdMob app ID in your **AndroidManifest.xml** file. Once you find your AdMob app ID in the AdMob UI, add it to your manifest adding the following tag:
 
 ```xml
@@ -50,6 +63,18 @@ Failure to add this tag will result in the app crashing at app launch with a mes
 On Android, this value must be the same as the App ID value set in your 
 `AndroidManifest.xml`.
 
+### iOS
+Starting in version 7.42.0, you are required to add your AdMob app ID in your **Info.plist** file under the Runner directory. You can add it using Xcode or edit the file manually:
+
+```xml
+<dict>
+	<key>GADApplicationIdentifier</key>
+	<string>ca-app-pub-################~##########</string>
+</dict>
+```
+
+Failure to add this tag will result in the app crashing at app launch with a message including *"GADVerifyApplicationID."*
+
 ## Using banners and interstitials
 Banner and interstitial ads can be configured with target information.
 And in the example below, the ads are given test ad unit IDs for a quick start.
diff --git a/packages/firebase_admob/example/ios/Runner/Info.plist b/packages/firebase_admob/example/ios/Runner/Info.plist
index 6738212b6191..dc157b6af2ac 100644
--- a/packages/firebase_admob/example/ios/Runner/Info.plist
+++ b/packages/firebase_admob/example/ios/Runner/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>GADApplicationIdentifier</key>
+	<string>ca-app-pub-3940256099942544~1458002511</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
diff --git a/packages/firebase_admob/pubspec.yaml b/packages/firebase_admob/pubspec.yaml
index 196b9a3e08bf..c59ca5263543 100644
--- a/packages/firebase_admob/pubspec.yaml
+++ b/packages/firebase_admob/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_admob
 description: Firebase AdMob plugin for Flutter applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_admob
-version: 0.8.0+3
+version: 0.8.0+4
 
 flutter:
   plugin:

From 4020326ed165c1b46606198ab33ce836fcdca402 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Tue, 16 Apr 2019 23:03:38 -0700
Subject: [PATCH 337/410] Update firebase_auth CocoaPod dependency (#1503)

---
 packages/firebase_auth/CHANGELOG.md              | 4 ++++
 packages/firebase_auth/ios/firebase_auth.podspec | 2 +-
 packages/firebase_auth/pubspec.yaml              | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index a6cd6652f89a..cb5d9dc89b2d 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.4+4
+
+* Update FirebaseAuth CocoaPod dependency to ensure availability of `FIRAuthErrorUserInfoNameKey`.
+
 ## 0.8.4+3
 
 * Updated deprecated API usage on iOS to use non-deprecated versions.
diff --git a/packages/firebase_auth/ios/firebase_auth.podspec b/packages/firebase_auth/ios/firebase_auth.podspec
index 39e3d7e4a62f..d9be29037134 100755
--- a/packages/firebase_auth/ios/firebase_auth.podspec
+++ b/packages/firebase_auth/ios/firebase_auth.podspec
@@ -16,7 +16,7 @@ Firebase Auth plugin for Flutter.
   s.public_header_files = 'Classes/**/*.h'
   s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
-  s.dependency 'Firebase/Auth', '~> 5.0'
+  s.dependency 'Firebase/Auth', '~> 5.4'
   s.dependency 'Firebase/Core'
   s.static_framework = true
 end
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 25aa0fe895e1..2969f79a52de 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.4+3"
+version: "0.8.4+4"
 
 flutter:
   plugin:

From 820a1cc3302b2bf975f058a0a2093e7b32f923bd Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Wed, 17 Apr 2019 10:18:49 -0700
Subject: [PATCH 338/410] Add myself to video_player CODEOWNERS (#1496)

---
 CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CODEOWNERS b/CODEOWNERS
index e9e14ad2fcfb..80b622d78eeb 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -22,4 +22,5 @@ packages/google_sign_in/* @cyanglaz @mehmetf
 packages/image_picker/* @cyanglaz
 packages/in_app_purchase/* @mklim
 packages/package_info/* @cyanglaz
+packages/video_player/* @iskakaushik
 packages/webview_flutter/* @amirh

From 7e6cdaacdaf3aa6b4ceb52ef9b02983728e601a1 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 17 Apr 2019 15:18:45 -0700
Subject: [PATCH 339/410] Increase Firebase/Auth dependency to 5.19 (#1508)

---
 packages/firebase_auth/CHANGELOG.md              | 4 ++++
 packages/firebase_auth/ios/firebase_auth.podspec | 2 +-
 packages/firebase_auth/pubspec.yaml              | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index cb5d9dc89b2d..f76cb544c06e 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.4+5
+
+* Increase Firebase/Auth CocoaPod dependency to '~> 5.19'.
+
 ## 0.8.4+4
 
 * Update FirebaseAuth CocoaPod dependency to ensure availability of `FIRAuthErrorUserInfoNameKey`.
diff --git a/packages/firebase_auth/ios/firebase_auth.podspec b/packages/firebase_auth/ios/firebase_auth.podspec
index d9be29037134..44ac216a5fc7 100755
--- a/packages/firebase_auth/ios/firebase_auth.podspec
+++ b/packages/firebase_auth/ios/firebase_auth.podspec
@@ -16,7 +16,7 @@ Firebase Auth plugin for Flutter.
   s.public_header_files = 'Classes/**/*.h'
   s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
-  s.dependency 'Firebase/Auth', '~> 5.4'
+  s.dependency 'Firebase/Auth', '~> 5.19'
   s.dependency 'Firebase/Core'
   s.static_framework = true
 end
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 2969f79a52de..45881f0771a3 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.4+4"
+version: "0.8.4+5"
 
 flutter:
   plugin:

From 37706c42f4d54f886dbfca88c0d786ae6f615486 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Thu, 18 Apr 2019 09:24:54 -0700
Subject: [PATCH 340/410] [Image_picker] Android: fix a crash when the
 MainActivity is destroyed after selecting the image/video.  (#1509)

On Android, the MainActivity can be killed and restarted after launching the image picker for various of reasons. this can be tested by selecting `don't keep activities alive' option in the developer options in phone's setting app.

This PR first prevents the crash by not trying to access the already nulled pendingResult.

Directly fixing the crashing in flutter/flutter#17950

Possibly: flutter/flutter#23788, flutter/flutter#21102,
flutter/flutter#18700
---
 packages/image_picker/CHANGELOG.md               |  4 ++++
 .../plugins/imagepicker/ImagePickerDelegate.java | 16 ++++++++--------
 packages/image_picker/pubspec.yaml               |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 17451c0f66dd..79cc70920744 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.3+2
+
+* Android: fix a crash when the MainActivity is destroyed after selecting the image/video. 
+
 ## 0.5.3+1
 
 * Update minimum deploy iOS version to 8.0.
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
index d6aa35533ea1..33f58fbde9d0 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
@@ -142,7 +142,7 @@ public Uri resolveFileProviderUriForFile(String fileProviderName, File file) {
           public void getFullImagePath(final Uri imageUri, final OnPathReadyListener listener) {
             MediaScannerConnection.scanFile(
                 activity,
-                new String[] {imageUri.getPath()},
+                new String[] {(imageUri != null) ? imageUri.getPath() : ""},
                 null,
                 new MediaScannerConnection.OnScanCompletedListener() {
                   @Override
@@ -434,17 +434,11 @@ private void handleImageResult(String path, boolean shouldDeleteOriginalIfScaled
       if (!finalImagePath.equals(path) && shouldDeleteOriginalIfScaled) {
         new File(path).delete();
       }
-    } else {
-      throw new IllegalStateException("Received image from picker that was not requested");
     }
   }
 
   private void handleVideoResult(String path) {
-    if (pendingResult != null) {
-      finishWithSuccess(path);
-    } else {
-      throw new IllegalStateException("Received video from picker that was not requested");
-    }
+    finishWithSuccess(path);
   }
 
   private boolean setPendingMethodCallAndResult(
@@ -459,6 +453,9 @@ private boolean setPendingMethodCallAndResult(
   }
 
   private void finishWithSuccess(String imagePath) {
+    if (pendingResult == null) {
+      return;
+    }
     pendingResult.success(imagePath);
     clearMethodCallAndResult();
   }
@@ -468,6 +465,9 @@ private void finishWithAlreadyActiveError(MethodChannel.Result result) {
   }
 
   private void finishWithError(String errorCode, String errorMessage) {
+    if (pendingResult == null) {
+      return;
+    }
     pendingResult.error(errorCode, errorMessage, null);
     clearMethodCallAndResult();
   }
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 17adca140909..ec4bad861019 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.3+1
+version: 0.5.3+2
 
 flutter:
   plugin:

From 756b1a301858593ec613dc68b81695c55e866211 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Thu, 18 Apr 2019 11:02:59 -0700
Subject: [PATCH 341/410] add cyanglaz to lap (#1495)

---
 CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 80b622d78eeb..789ddbdb4ed4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -20,7 +20,7 @@ packages/firebase_storage/* @collinjackson @kroikie
 packages/google_maps_flutter/* @amirh @iskakaushik
 packages/google_sign_in/* @cyanglaz @mehmetf
 packages/image_picker/* @cyanglaz
-packages/in_app_purchase/* @mklim
+packages/in_app_purchase/* @mklim @cyanglaz
 packages/package_info/* @cyanglaz
 packages/video_player/* @iskakaushik
 packages/webview_flutter/* @amirh

From 384e248cea41af988a14888866c4ffd492fa8846 Mon Sep 17 00:00:00 2001
From: apm29 <835170486@qq.com>
Date: Fri, 19 Apr 2019 02:04:05 +0800
Subject: [PATCH 342/410] [webview_flutter]bugfix:webview example should be
 statefulWidget (#1511)

bugfix:webview example should be statefulWidget
---
 packages/webview_flutter/CHANGELOG.md          | 4 ++++
 packages/webview_flutter/example/lib/main.dart | 7 ++++++-
 packages/webview_flutter/pubspec.yaml          | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index fc34c1cc50bb..8185c00615e9 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.5+4
+
+* Fix bugs in the example app by updating it to use a `StatefulWidget`.
+
 ## 0.3.5+3
 
 * Make sure to post javascript channel messages from the platform thread.
diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index 0ec572956df7..7dfac5437632 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -24,7 +24,12 @@ The navigation delegate is set to block navigation to the youtube website.
 </html>
 ''';
 
-class WebViewExample extends StatelessWidget {
+class WebViewExample extends StatefulWidget {
+  @override
+  _WebViewExampleState createState() => _WebViewExampleState();
+}
+
+class _WebViewExampleState extends State<WebViewExample> {
   final Completer<WebViewController> _controller =
       Completer<WebViewController>();
 
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 77c0ce90a707..7dc030e25d20 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.5+3
+version: 0.3.5+4
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From d3c96e94d17410e5b50a2993fc2e8583668c95b7 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 18 Apr 2019 14:23:41 -0700
Subject: [PATCH 343/410] [firebase_analytics] Initial integration test (#1492)

Initial integration test for firebase_analytics
---
 packages/firebase_analytics/CHANGELOG.md      |  4 ++
 .../firebase_analytics/example/pubspec.yaml   |  7 ++++
 .../test_driver/firebase_analytics.dart       | 38 +++++++++++++++++++
 .../test_driver/firebase_analytics_test.dart  | 11 ++++++
 packages/firebase_analytics/pubspec.yaml      |  4 +-
 5 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 packages/firebase_analytics/example/test_driver/firebase_analytics.dart
 create mode 100644 packages/firebase_analytics/example/test_driver/firebase_analytics_test.dart

diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index cc9ad662b0c6..a2942b699519 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.1+3
+
+* Added an initial integration test.
+
 ## 2.1.1+2
 
 * Fixed errors in code sample for `FirebaseAnalyticsObserver`.
diff --git a/packages/firebase_analytics/example/pubspec.yaml b/packages/firebase_analytics/example/pubspec.yaml
index 2139deb04a91..299dabeffbef 100755
--- a/packages/firebase_analytics/example/pubspec.yaml
+++ b/packages/firebase_analytics/example/pubspec.yaml
@@ -8,6 +8,13 @@ dependencies:
     path: ../
   firebase_core: ^0.3.0
 
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  test: any
+
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec
 
diff --git a/packages/firebase_analytics/example/test_driver/firebase_analytics.dart b/packages/firebase_analytics/example/test_driver/firebase_analytics.dart
new file mode 100644
index 000000000000..40f994203284
--- /dev/null
+++ b/packages/firebase_analytics/example/test_driver/firebase_analytics.dart
@@ -0,0 +1,38 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:io';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:firebase_analytics/firebase_analytics.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('$FirebaseAnalytics', () {
+    FirebaseAnalytics analytics;
+
+    setUp(() {
+      analytics = FirebaseAnalytics();
+    });
+
+    test('Android-only functionality', () async {
+      if (Platform.isIOS) {
+        expect(analytics.android, isNull);
+      }
+      if (Platform.isAndroid) {
+        await analytics.android.setMinimumSessionDuration(9000);
+      }
+    });
+
+    test('logging', () async {
+      expect(analytics.setAnalyticsCollectionEnabled(true), completes);
+      expect(analytics.setCurrentScreen(screenName: 'testing'), completes);
+      expect(analytics.logEvent(name: 'testing'), completes);
+    });
+  });
+}
diff --git a/packages/firebase_analytics/example/test_driver/firebase_analytics_test.dart b/packages/firebase_analytics/example/test_driver/firebase_analytics_test.dart
new file mode 100644
index 000000000000..db46258dfebe
--- /dev/null
+++ b/packages/firebase_analytics/example/test_driver/firebase_analytics_test.dart
@@ -0,0 +1,11 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:flutter_driver/flutter_driver.dart';
+
+Future<void> main() async {
+  final FlutterDriver driver = await FlutterDriver.connect();
+  await driver.requestData(null, timeout: const Duration(minutes: 1));
+  driver.close();
+}
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index c3e2b251bd6e..843ecf78e695 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 2.1.1+2
+version: 2.1.1+3
 
 flutter:
   plugin:
@@ -22,6 +22,8 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   firebase_core: ^0.3.0
+  flutter_driver:
+    sdk: flutter
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"

From c928a0e50a49698392d1408b2e1b891cba560fbb Mon Sep 17 00:00:00 2001
From: Josh Burton <athor3d@gmail.com>
Date: Fri, 19 Apr 2019 12:36:56 +1200
Subject: [PATCH 344/410] [connectivity] Fixes lint error by using
 getApplicationContext() (#1502)

Fixes lint error by using getApplicationContext()
---
 packages/connectivity/CHANGELOG.md                   |  4 ++++
 .../plugins/connectivity/ConnectivityPlugin.java     | 12 +++++++++---
 packages/connectivity/pubspec.yaml                   |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md
index bbd924fb29c7..484f3445e412 100644
--- a/packages/connectivity/CHANGELOG.md
+++ b/packages/connectivity/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.3+1
+
+* Fixes lint error by using `getApplicationContext()` when accessing the Wifi Service.
+
 ## 0.4.3
 
 * Add getWifiBSSID to obtain current wifi network's BSSID.
diff --git a/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java b/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
index 05b4608723f9..ca2f5220ea6b 100644
--- a/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
+++ b/packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
@@ -41,7 +41,11 @@ public static void registerWith(Registrar registrar) {
   private ConnectivityPlugin(Registrar registrar) {
     this.registrar = registrar;
     this.manager =
-        (ConnectivityManager) registrar.context().getSystemService(Context.CONNECTIVITY_SERVICE);
+        (ConnectivityManager)
+            registrar
+                .context()
+                .getApplicationContext()
+                .getSystemService(Context.CONNECTIVITY_SERVICE);
   }
 
   @Override
@@ -104,7 +108,8 @@ private void handleCheck(MethodCall call, final Result result) {
 
   private WifiInfo getWifiInfo() {
     WifiManager wifiManager =
-        (WifiManager) registrar.context().getSystemService(Context.WIFI_SERVICE);
+        (WifiManager)
+            registrar.context().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
     return wifiManager == null ? null : wifiManager.getConnectionInfo();
   }
 
@@ -125,7 +130,8 @@ private void handleBSSID(MethodCall call, MethodChannel.Result result) {
 
   private void handleWifiIPAddress(MethodCall call, final Result result) {
     WifiManager wifiManager =
-        (WifiManager) registrar.context().getSystemService(Context.WIFI_SERVICE);
+        (WifiManager)
+            registrar.context().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
 
     WifiInfo wifiInfo = null;
     if (wifiManager != null) wifiInfo = wifiManager.getConnectionInfo();
diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml
index 3ed7aae0c109..eadbdf7ee46a 100644
--- a/packages/connectivity/pubspec.yaml
+++ b/packages/connectivity/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi &
   mobile/cellular) connectivity on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
-version: 0.4.3
+version: 0.4.3+1
 
 flutter:
   plugin:

From cee0f138e63f7193ec897da4c1f840204be4f080 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Thu, 18 Apr 2019 17:59:09 -0700
Subject: [PATCH 345/410] [firebase_remote_config] Initial integration tests
 (#1514)

---
 packages/firebase_remote_config/CHANGELOG.md  |  4 ++
 .../example/pubspec.yaml                      | 45 ++-----------------
 .../test_driver/firebase_remote_config.dart   | 34 ++++++++++++++
 .../firebase_remote_config_test.dart          |  7 +++
 packages/firebase_remote_config/pubspec.yaml  |  5 ++-
 5 files changed, 52 insertions(+), 43 deletions(-)
 create mode 100644 packages/firebase_remote_config/example/test_driver/firebase_remote_config.dart
 create mode 100644 packages/firebase_remote_config/example/test_driver/firebase_remote_config_test.dart

diff --git a/packages/firebase_remote_config/CHANGELOG.md b/packages/firebase_remote_config/CHANGELOG.md
index d7b7966f8d31..280bf9a77641 100644
--- a/packages/firebase_remote_config/CHANGELOG.md
+++ b/packages/firebase_remote_config/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0+3
+
+* Initial integration tests.
+
 ## 0.1.0+2
 
 * Log messages about automatic configuration of the default app are now less confusing.
diff --git a/packages/firebase_remote_config/example/pubspec.yaml b/packages/firebase_remote_config/example/pubspec.yaml
index 4c4a4e0c5d7a..99c4879fd7b2 100644
--- a/packages/firebase_remote_config/example/pubspec.yaml
+++ b/packages/firebase_remote_config/example/pubspec.yaml
@@ -15,45 +15,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-
-# For information on the generic Dart part of this file, see the
-# following page: https://www.dartlang.org/tools/pub/pubspec
-
-# The following section is specific to Flutter.
-flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
-  uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #  - images/a_dot_burr.jpeg
-  #  - images/a_dot_ham.jpeg
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.io/assets-and-images/#resolution-aware.
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.io/assets-and-images/#from-packages
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.io/custom-fonts/#from-packages
+  flutter_driver:
+    sdk: flutter
+  test: any
diff --git a/packages/firebase_remote_config/example/test_driver/firebase_remote_config.dart b/packages/firebase_remote_config/example/test_driver/firebase_remote_config.dart
new file mode 100644
index 000000000000..ee01bcb988a5
--- /dev/null
+++ b/packages/firebase_remote_config/example/test_driver/firebase_remote_config.dart
@@ -0,0 +1,34 @@
+import 'dart:async';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:firebase_remote_config/firebase_remote_config.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('$RemoteConfig', () {
+    RemoteConfig remoteConfig;
+
+    setUp(() async {
+      remoteConfig = await RemoteConfig.instance;
+      remoteConfig.setConfigSettings(RemoteConfigSettings(debugMode: true));
+      remoteConfig.setDefaults(<String, dynamic>{
+        'welcome': 'default welcome',
+        'hello': 'default hello',
+      });
+    });
+
+    test('fetch', () async {
+      final DateTime lastFetchTime = remoteConfig.lastFetchTime;
+      expect(lastFetchTime.isBefore(DateTime.now()), true);
+      await remoteConfig.fetch(expiration: const Duration(seconds: 0));
+      expect(remoteConfig.lastFetchTime.isAfter(lastFetchTime), true);
+      expect(remoteConfig.lastFetchStatus, LastFetchStatus.success);
+      await remoteConfig.activateFetched();
+      expect(remoteConfig.getString('welcome'), 'Earth, welcome! Hello!');
+      expect(remoteConfig.getString('hello'), 'default hello');
+    });
+  });
+}
diff --git a/packages/firebase_remote_config/example/test_driver/firebase_remote_config_test.dart b/packages/firebase_remote_config/example/test_driver/firebase_remote_config_test.dart
new file mode 100644
index 000000000000..38fe6c447e05
--- /dev/null
+++ b/packages/firebase_remote_config/example/test_driver/firebase_remote_config_test.dart
@@ -0,0 +1,7 @@
+import 'package:flutter_driver/flutter_driver.dart';
+
+Future<void> main() async {
+  final FlutterDriver driver = await FlutterDriver.connect();
+  await driver.requestData(null, timeout: const Duration(minutes: 1));
+  driver.close();
+}
diff --git a/packages/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/pubspec.yaml
index e9dd6074d861..e0b6bcb16775 100644
--- a/packages/firebase_remote_config/pubspec.yaml
+++ b/packages/firebase_remote_config/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Remote Config. Update your application
   re-releasing.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_remote_config
-version: 0.1.0+2
+version: 0.1.0+3
 
 dependencies:
   flutter:
@@ -13,6 +13,9 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   firebase_core: ^0.3.0
+  flutter_driver:
+    sdk: flutter
+  test: any
 
 flutter:
   plugin:

From d9a3cb6f886d5ec45cac576eda0286ca660832bf Mon Sep 17 00:00:00 2001
From: Lara Martin <13904500+laramartin@users.noreply.github.com>
Date: Fri, 19 Apr 2019 05:33:56 +0200
Subject: [PATCH 346/410] [webview_flutter] Fixed documentation for usage
 example of JavaScript message (#1501)

---
 packages/webview_flutter/CHANGELOG.md             | 4 ++++
 packages/webview_flutter/lib/webview_flutter.dart | 2 +-
 packages/webview_flutter/pubspec.yaml             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 8185c00615e9..8985c7b4fc88 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.5+5
+
+* Fixed error in documentation of `javascriptChannels`.
+
 ## 0.3.5+4
 
 * Fix bugs in the example app by updating it to use a `StatefulWidget`.
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index d67e769fb1bb..49063a27a066 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -150,7 +150,7 @@ class WebView extends StatefulWidget {
   /// For example for the following JavascriptChannel:
   ///
   /// ```dart
-  /// JavascriptChannel(name: 'Print', onMessageReceived: (JavascriptMessage message) { print(message); });
+  /// JavascriptChannel(name: 'Print', onMessageReceived: (JavascriptMessage message) { print(message.message); });
   /// ```
   ///
   /// JavaScript code can call:
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 7dc030e25d20..943f62470521 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.5+4
+version: 0.3.5+5
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From d140c7180ba8c6695ed762204313467faa096340 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Fri, 19 Apr 2019 10:37:40 -0700
Subject: [PATCH 347/410] [firebase_storage] Initial integration testing
 (#1513)

Initial integration test for firebase_storage
---
 packages/firebase_storage/CHANGELOG.md        |  4 ++
 .../firebase_storage/example/pubspec.yaml     |  7 +++
 .../example/test_driver/firebase_storage.dart | 60 +++++++++++++++++++
 .../test_driver/firebase_storage_test.dart    |  7 +++
 packages/firebase_storage/pubspec.yaml        |  5 +-
 5 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 packages/firebase_storage/example/test_driver/firebase_storage.dart
 create mode 100644 packages/firebase_storage/example/test_driver/firebase_storage_test.dart

diff --git a/packages/firebase_storage/CHANGELOG.md b/packages/firebase_storage/CHANGELOG.md
index 822a74bcace5..d4d4561182ad 100644
--- a/packages/firebase_storage/CHANGELOG.md
+++ b/packages/firebase_storage/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.1
+
+* Added integration tests.
+
 ## 2.1.0+1
 
 * Reverting error.code casting/formatting to what it was until version 2.0.1.
diff --git a/packages/firebase_storage/example/pubspec.yaml b/packages/firebase_storage/example/pubspec.yaml
index 8acbfafef8ac..9301adf1d6d2 100755
--- a/packages/firebase_storage/example/pubspec.yaml
+++ b/packages/firebase_storage/example/pubspec.yaml
@@ -11,6 +11,13 @@ dependencies:
   uuid: "^1.0.0"
   http: ^0.12.0
 
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  test: any
+
 flutter:
   uses-material-design: true
 
diff --git a/packages/firebase_storage/example/test_driver/firebase_storage.dart b/packages/firebase_storage/example/test_driver/firebase_storage.dart
new file mode 100644
index 000000000000..677192196fd6
--- /dev/null
+++ b/packages/firebase_storage/example/test_driver/firebase_storage.dart
@@ -0,0 +1,60 @@
+import 'dart:async';
+import 'dart:io';
+import 'package:http/http.dart' as http;
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:firebase_storage/firebase_storage.dart';
+import 'package:uuid/uuid.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('$FirebaseStorage', () {
+    const String kTestString = 'hello world';
+    FirebaseStorage firebaseStorage;
+
+    setUp(() async {
+      firebaseStorage = FirebaseStorage();
+    });
+
+    test('putFile, getDownloadURL, writeToFile', () async {
+      final String uuid = Uuid().v1();
+      final Directory systemTempDir = Directory.systemTemp;
+      final File file =
+          await File('${systemTempDir.path}/foo$uuid.txt').create();
+      await file.writeAsString(kTestString);
+      final StorageReference ref =
+          firebaseStorage.ref().child('text').child('foo$uuid.txt');
+      expect(await ref.getName(), 'foo$uuid.txt');
+      expect(await ref.getPath(), 'text/foo$uuid.txt');
+      final StorageUploadTask uploadTask = ref.putFile(
+        file,
+        StorageMetadata(
+          contentLanguage: 'en',
+          customMetadata: <String, String>{'activity': 'test'},
+        ),
+      );
+      final StorageTaskSnapshot complete = await uploadTask.onComplete;
+      expect(complete.storageMetadata.sizeBytes, kTestString.length);
+      expect(complete.storageMetadata.contentLanguage, 'en');
+      expect(complete.storageMetadata.customMetadata['activity'], 'test');
+
+      final String url = await ref.getDownloadURL();
+      final http.Response downloadData = await http.get(url);
+      expect(downloadData.body, kTestString);
+      final File tempFile = File('${systemTempDir.path}/tmp$uuid.txt');
+      if (tempFile.existsSync()) {
+        await tempFile.delete();
+      }
+      await tempFile.create();
+      expect(await tempFile.readAsString(), '');
+      final StorageFileDownloadTask task = ref.writeToFile(tempFile);
+      final int byteCount = (await task.future).totalByteCount;
+      final String tempFileContents = await tempFile.readAsString();
+      expect(tempFileContents, kTestString);
+      expect(byteCount, kTestString.length);
+    });
+  });
+}
diff --git a/packages/firebase_storage/example/test_driver/firebase_storage_test.dart b/packages/firebase_storage/example/test_driver/firebase_storage_test.dart
new file mode 100644
index 000000000000..38fe6c447e05
--- /dev/null
+++ b/packages/firebase_storage/example/test_driver/firebase_storage_test.dart
@@ -0,0 +1,7 @@
+import 'package:flutter_driver/flutter_driver.dart';
+
+Future<void> main() async {
+  final FlutterDriver driver = await FlutterDriver.connect();
+  await driver.requestData(null, timeout: const Duration(minutes: 1));
+  driver.close();
+}
diff --git a/packages/firebase_storage/pubspec.yaml b/packages/firebase_storage/pubspec.yaml
index 6bca9061bd71..ff2e6ef9af1d 100755
--- a/packages/firebase_storage/pubspec.yaml
+++ b/packages/firebase_storage/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Storage, a powerful, simple, and
   cost-effective object storage service for Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_storage
-version: 2.1.0+1
+version: 2.1.1
 
 flutter:
   plugin:
@@ -21,6 +21,9 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   uuid: "^1.0.0"
+  flutter_driver:
+    sdk: flutter
+  test: any
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"

From 8e2141974f5a765f4642ee2f633692e82c308c0e Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Fri, 19 Apr 2019 14:01:28 -0700
Subject: [PATCH 348/410] [firebase_ml_vision] Start of ML Kit integration
 tests (#1506)

---
 .../example/assets/test_barcode.jpg           | Bin 0 -> 58252 bytes
 .../example/assets/test_face.jpg              | Bin 0 -> 78450 bytes
 .../example/assets/test_text.png              | Bin 0 -> 5870 bytes
 .../firebase_ml_vision/example/pubspec.yaml   |  13 +++
 .../test_driver/firebase_ml_vision.dart       | 101 ++++++++++++++++++
 .../test_driver/firebase_ml_vision_test.dart  |  11 ++
 packages/firebase_ml_vision/pubspec.yaml      |   5 +
 7 files changed, 130 insertions(+)
 create mode 100644 packages/firebase_ml_vision/example/assets/test_barcode.jpg
 create mode 100644 packages/firebase_ml_vision/example/assets/test_face.jpg
 create mode 100644 packages/firebase_ml_vision/example/assets/test_text.png
 create mode 100644 packages/firebase_ml_vision/example/test_driver/firebase_ml_vision.dart
 create mode 100644 packages/firebase_ml_vision/example/test_driver/firebase_ml_vision_test.dart

diff --git a/packages/firebase_ml_vision/example/assets/test_barcode.jpg b/packages/firebase_ml_vision/example/assets/test_barcode.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9b00a21a9b5b62d558822e04ff339195070a401a
GIT binary patch
literal 58252
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
Tn{8W^s9=Ky!r}O@{{8+xZ=T^Z

literal 0
HcmV?d00001

diff --git a/packages/firebase_ml_vision/example/assets/test_face.jpg b/packages/firebase_ml_vision/example/assets/test_face.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f87458b4db81e33e1b32e68accf5cd1da3d54912
GIT binary patch
literal 78450
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
UkoZ-8tfsLL=H?aV)&I@@AK&o?>;M1&

literal 0
HcmV?d00001

diff --git a/packages/firebase_ml_vision/example/assets/test_text.png b/packages/firebase_ml_vision/example/assets/test_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a316527d9cfab4b036298bae4ddd29c678886e2
GIT binary patch
literal 5870
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

literal 0
HcmV?d00001

diff --git a/packages/firebase_ml_vision/example/pubspec.yaml b/packages/firebase_ml_vision/example/pubspec.yaml
index 026b13a5cdba..5e82de2c3397 100644
--- a/packages/firebase_ml_vision/example/pubspec.yaml
+++ b/packages/firebase_ml_vision/example/pubspec.yaml
@@ -12,5 +12,18 @@ dependencies:
     path: ../
   firebase_core: ^0.3.0
 
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  test: any
+  path: ^1.6.2
+  path_provider: ^0.5.0+1
+
 flutter:
   uses-material-design: true
+  assets:
+    - assets/test_face.jpg
+    - assets/test_barcode.jpg
+    - assets/test_text.png
diff --git a/packages/firebase_ml_vision/example/test_driver/firebase_ml_vision.dart b/packages/firebase_ml_vision/example/test_driver/firebase_ml_vision.dart
new file mode 100644
index 000000000000..74f0ba5cd67d
--- /dev/null
+++ b/packages/firebase_ml_vision/example/test_driver/firebase_ml_vision.dart
@@ -0,0 +1,101 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:flutter/services.dart';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:firebase_ml_vision/firebase_ml_vision.dart';
+import 'package:path/path.dart' as path;
+import 'package:path_provider/path_provider.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('$FirebaseVision', () {
+    final FirebaseVision vision = FirebaseVision.instance;
+
+    group('$BarcodeDetector', () {
+      test('detectInImage', () async {
+        final String tmpFilename = await _loadImage('assets/test_barcode.jpg');
+        final FirebaseVisionImage visionImage =
+            FirebaseVisionImage.fromFilePath(tmpFilename);
+
+        final BarcodeDetector detector = vision.barcodeDetector();
+        final List<Barcode> barcodes = await detector.detectInImage(
+          visionImage,
+        );
+
+        expect(barcodes.length, 1);
+      });
+    });
+
+    group('$FaceDetector', () {
+      test('processImage', () async {
+        final String tmpFilename = await _loadImage('assets/test_face.jpg');
+        final FirebaseVisionImage visionImage =
+            FirebaseVisionImage.fromFilePath(tmpFilename);
+
+        final FaceDetector detector = vision.faceDetector();
+        final List<Face> faces = await detector.processImage(visionImage);
+
+        expect(faces.length, 1);
+      });
+    });
+
+    group('$ImageLabeler', () {
+      test('processImage', () async {
+        final String tmpFilename = await _loadImage('assets/test_barcode.jpg');
+        final FirebaseVisionImage visionImage =
+            FirebaseVisionImage.fromFilePath(tmpFilename);
+
+        final ImageLabeler labeler = vision.imageLabeler();
+        final List<ImageLabel> labels = await labeler.processImage(visionImage);
+
+        expect(labels.length, greaterThan(0));
+      });
+    });
+
+    group('$TextRecognizer', () {
+      test('processImage', () async {
+        final String tmpFilename = await _loadImage('assets/test_text.png');
+        final FirebaseVisionImage visionImage =
+            FirebaseVisionImage.fromFilePath(tmpFilename);
+
+        final TextRecognizer recognizer = vision.textRecognizer();
+        final VisionText text = await recognizer.processImage(visionImage);
+
+        expect(text.text, 'TEXT');
+      });
+    });
+  });
+}
+
+int nextHandle = 0;
+
+// Since there is no way to get the full asset filename, this method loads the
+// image into a temporary file.
+Future<String> _loadImage(String assetFilename) async {
+  final Directory directory = await getTemporaryDirectory();
+
+  final String tmpFilename = path.join(
+    directory.path,
+    "tmp${nextHandle++}.jpg",
+  );
+
+  final ByteData data = await rootBundle.load(assetFilename);
+  final Uint8List bytes = data.buffer.asUint8List(
+    data.offsetInBytes,
+    data.lengthInBytes,
+  );
+
+  await File(tmpFilename).writeAsBytes(bytes);
+
+  return tmpFilename;
+}
diff --git a/packages/firebase_ml_vision/example/test_driver/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/example/test_driver/firebase_ml_vision_test.dart
new file mode 100644
index 000000000000..b9753054ad5b
--- /dev/null
+++ b/packages/firebase_ml_vision/example/test_driver/firebase_ml_vision_test.dart
@@ -0,0 +1,11 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter_driver/flutter_driver.dart';
+
+void main() async {
+  final FlutterDriver driver = await FlutterDriver.connect();
+  await driver.requestData(null, timeout: const Duration(minutes: 1));
+  driver.close();
+}
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index d34def348341..89b2b26702d3 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -13,6 +13,11 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   firebase_core: ^0.3.0
+  flutter_driver:
+    sdk: flutter
+  test: any
+  path: ^1.6.2
+  path_provider: ^0.5.0+1
 
 flutter:
   plugin:

From 0fd8c92b8c8cb0bc70368a76c263a37600e35f51 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bparr2450@gmail.com>
Date: Fri, 19 Apr 2019 14:02:01 -0700
Subject: [PATCH 349/410] [camera] Remove activity lifecycle (#1477)

---
 packages/camera/CHANGELOG.md                  |   6 +
 .../flutter/plugins/camera/CameraPlugin.java  | 104 +++++-------------
 packages/camera/example/lib/main.dart         |  26 ++++-
 packages/camera/pubspec.yaml                  |   2 +-
 4 files changed, 61 insertions(+), 77 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 4f4f160cf85a..3f6872d79ad4 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.5.0
+
+* **Breaking Change** This plugin no longer handles closing and opening the camera on Android
+  lifecycle changes. Please use `WidgetsBindingObserver` to control camera resources on lifecycle
+  changes. See example project for example using `WidgetsBindingObserver`.
+
 ## 0.4.3+2
 
 * Bump the minimum Flutter version to 1.2.0.
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index 2fafb7d5c3a1..3258993e49f4 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -4,7 +4,6 @@
 
 import android.Manifest;
 import android.app.Activity;
-import android.app.Application;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.ImageFormat;
@@ -23,7 +22,6 @@
 import android.media.ImageReader;
 import android.media.MediaRecorder;
 import android.os.Build;
-import android.os.Bundle;
 import android.util.Size;
 import android.view.Display;
 import android.view.OrientationEventListener;
@@ -58,22 +56,18 @@ public class CameraPlugin implements MethodCallHandler {
   private static CameraManager cameraManager;
   private final FlutterView view;
   private Camera camera;
-  private Activity activity;
   private Registrar registrar;
-  private Application.ActivityLifecycleCallbacks activityLifecycleCallbacks;
   // The code to run after requesting camera permissions.
   private Runnable cameraPermissionContinuation;
-  private boolean requestingPermission;
   private final OrientationEventListener orientationEventListener;
   private int currentOrientation = ORIENTATION_UNKNOWN;
 
-  private CameraPlugin(Registrar registrar, FlutterView view, Activity activity) {
+  private CameraPlugin(Registrar registrar, FlutterView view) {
     this.registrar = registrar;
     this.view = view;
-    this.activity = activity;
 
     orientationEventListener =
-        new OrientationEventListener(activity.getApplicationContext()) {
+        new OrientationEventListener(registrar.activity().getApplicationContext()) {
           @Override
           public void onOrientationChanged(int i) {
             if (i == ORIENTATION_UNKNOWN) {
@@ -85,55 +79,6 @@ public void onOrientationChanged(int i) {
         };
 
     registrar.addRequestPermissionsResultListener(new CameraRequestPermissionsListener());
-
-    this.activityLifecycleCallbacks =
-        new Application.ActivityLifecycleCallbacks() {
-          @Override
-          public void onActivityCreated(Activity activity, Bundle savedInstanceState) {}
-
-          @Override
-          public void onActivityStarted(Activity activity) {}
-
-          @Override
-          public void onActivityResumed(Activity activity) {
-            boolean wasRequestingPermission = requestingPermission;
-            if (requestingPermission) {
-              requestingPermission = false;
-            }
-            if (activity != CameraPlugin.this.activity) {
-              return;
-            }
-            orientationEventListener.enable();
-            if (camera != null && !wasRequestingPermission) {
-              camera.open(null);
-            }
-          }
-
-          @Override
-          public void onActivityPaused(Activity activity) {
-            if (activity == CameraPlugin.this.activity) {
-              orientationEventListener.disable();
-              if (camera != null) {
-                camera.close();
-              }
-            }
-          }
-
-          @Override
-          public void onActivityStopped(Activity activity) {
-            if (activity == CameraPlugin.this.activity) {
-              if (camera != null) {
-                camera.close();
-              }
-            }
-          }
-
-          @Override
-          public void onActivitySaveInstanceState(Activity activity, Bundle outState) {}
-
-          @Override
-          public void onActivityDestroyed(Activity activity) {}
-        };
   }
 
   public static void registerWith(Registrar registrar) {
@@ -147,8 +92,7 @@ public static void registerWith(Registrar registrar) {
 
     cameraManager = (CameraManager) registrar.activity().getSystemService(Context.CAMERA_SERVICE);
 
-    channel.setMethodCallHandler(
-        new CameraPlugin(registrar, registrar.view(), registrar.activity()));
+    channel.setMethodCallHandler(new CameraPlugin(registrar, registrar.view()));
   }
 
   @Override
@@ -194,9 +138,6 @@ public void onMethodCall(MethodCall call, final Result result) {
             camera.close();
           }
           camera = new Camera(cameraName, resolutionPreset, result);
-          this.activity
-              .getApplication()
-              .registerActivityLifecycleCallbacks(this.activityLifecycleCallbacks);
           orientationEventListener.enable();
           break;
         }
@@ -247,11 +188,7 @@ public void onMethodCall(MethodCall call, final Result result) {
           if (camera != null) {
             camera.dispose();
           }
-          if (this.activity != null && this.activityLifecycleCallbacks != null) {
-            this.activity
-                .getApplication()
-                .unregisterActivityLifecycleCallbacks(this.activityLifecycleCallbacks);
-          }
+          orientationEventListener.disable();
           result.success(null);
           break;
         }
@@ -355,17 +292,18 @@ public void run() {
                 open(result);
               }
             };
-        requestingPermission = false;
         if (hasCameraPermission() && hasAudioPermission()) {
           cameraPermissionContinuation.run();
         } else {
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            requestingPermission = true;
-            registrar
-                .activity()
-                .requestPermissions(
-                    new String[] {Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO},
-                    CAMERA_REQUEST_ID);
+            final Activity activity = registrar.activity();
+            if (activity == null) {
+              throw new IllegalStateException("No activity available!");
+            }
+
+            activity.requestPermissions(
+                new String[] {Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO},
+                CAMERA_REQUEST_ID);
           }
         }
       } catch (CameraAccessException e) {
@@ -393,14 +331,24 @@ public void onCancel(Object arguments) {
     }
 
     private boolean hasCameraPermission() {
+      final Activity activity = registrar.activity();
+      if (activity == null) {
+        throw new IllegalStateException("No activity available!");
+      }
+
       return Build.VERSION.SDK_INT < Build.VERSION_CODES.M
           || activity.checkSelfPermission(Manifest.permission.CAMERA)
               == PackageManager.PERMISSION_GRANTED;
     }
 
     private boolean hasAudioPermission() {
+      final Activity activity = registrar.activity();
+      if (activity == null) {
+        throw new IllegalStateException("No activity available!");
+      }
+
       return Build.VERSION.SDK_INT < Build.VERSION_CODES.M
-          || registrar.activity().checkSelfPermission(Manifest.permission.RECORD_AUDIO)
+          || activity.checkSelfPermission(Manifest.permission.RECORD_AUDIO)
               == PackageManager.PERMISSION_GRANTED;
     }
 
@@ -410,6 +358,12 @@ private void computeBestPreviewAndRecordingSize(
 
       // Preview size and video size should not be greater than screen resolution or 1080.
       Point screenResolution = new Point();
+
+      final Activity activity = registrar.activity();
+      if (activity == null) {
+        throw new IllegalStateException("No activity available!");
+      }
+
       Display display = activity.getWindowManager().getDefaultDisplay();
       display.getRealSize(screenResolution);
 
diff --git a/packages/camera/example/lib/main.dart b/packages/camera/example/lib/main.dart
index ca01a7ac0f57..7b5ee4fad365 100644
--- a/packages/camera/example/lib/main.dart
+++ b/packages/camera/example/lib/main.dart
@@ -29,13 +29,37 @@ IconData getCameraLensIcon(CameraLensDirection direction) {
 void logError(String code, String message) =>
     print('Error: $code\nError Message: $message');
 
-class _CameraExampleHomeState extends State<CameraExampleHome> {
+class _CameraExampleHomeState extends State<CameraExampleHome>
+    with WidgetsBindingObserver {
   CameraController controller;
   String imagePath;
   String videoPath;
   VideoPlayerController videoController;
   VoidCallback videoPlayerListener;
 
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state == AppLifecycleState.inactive) {
+      controller?.dispose();
+    } else if (state == AppLifecycleState.resumed) {
+      if (controller != null) {
+        onNewCameraSelected(controller.description);
+      }
+    }
+  }
+
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
 
   @override
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 4649e80bb429..aee83b1e5fc6 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.4.3+2
+version: 0.5.0
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Luigi Agosti <luigi@tengio.com>

From c43177f50ead03286c6cb474ea50b0e7ba2a21df Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 19 Apr 2019 15:00:17 -0700
Subject: [PATCH 350/410] [Image_picker] retrieve lost image. (#1512)

On Android, the MainActivity can be killed and restarted after launching the image picker for various of reasons. this can be tested by selecting `don't keep activities alive' option in the developer options in phone's setting app.

This PR adds a method retrieveLostData to retrieve the lost image/videos.

flutter/flutter#17950
---
 packages/image_picker/CHANGELOG.md            |   4 +
 packages/image_picker/README.md               |  27 +++
 .../plugins/imagepicker/ImagePickerCache.java | 166 ++++++++++++++++++
 .../imagepicker/ImagePickerDelegate.java      |  50 +++++-
 .../imagepicker/ImagePickerPlugin.java        | 113 ++++++++----
 packages/image_picker/example/lib/main.dart   | 166 ++++++++++++------
 packages/image_picker/lib/image_picker.dart   | 104 +++++++++++
 packages/image_picker/pubspec.yaml            |   2 +-
 .../image_picker/test/image_picker_test.dart  |  47 +++++
 9 files changed, 593 insertions(+), 86 deletions(-)
 create mode 100644 packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerCache.java

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 79cc70920744..de401b2c4179 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.4
+
+* Add `retrieveLostData` to retrieve lost data after MainActivity is killed.
+
 ## 0.5.3+2
 
 * Android: fix a crash when the MainActivity is destroyed after selecting the image/video. 
diff --git a/packages/image_picker/README.md b/packages/image_picker/README.md
index 32cd88ef21c1..101a46cd14d2 100755
--- a/packages/image_picker/README.md
+++ b/packages/image_picker/README.md
@@ -64,3 +64,30 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 }
 ```
+
+### Handling MainActivity destruction on Android
+
+Android system -- although very rarely -- sometimes kills the MainActivity after the image_picker finishes. When this happens, we lost the data selected from the image_picker. You can use `retrieveLostData` to retrieve the lost data in this situation. For example: 
+
+```dart
+Future<void> retrieveLostData() async {
+  final RetrieveLostDataResponse response =
+      await ImagePicker.retrieveLostData();
+  if (response == null) {
+    return;
+  }
+  if (response.file != null) {
+    setState(() {
+      if (response.type == RetrieveType.video) {
+        _handleVideo(response.file);
+      } else {
+        _handleImage(response.file);
+      }
+    });
+  } else {
+    _handleError(response.exception);
+  }
+}
+```
+
+There's no way to detect when this happens, so calling this method at the right place is essential. We recommend to wire this into some kind of start up check. Please refer to the example app to see how we used it.
\ No newline at end of file
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerCache.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerCache.java
new file mode 100644
index 000000000000..0f4e97681a1a
--- /dev/null
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerCache.java
@@ -0,0 +1,166 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.imagepicker;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import androidx.annotation.Nullable;
+import io.flutter.plugin.common.MethodCall;
+import java.util.HashMap;
+import java.util.Map;
+
+class ImagePickerCache {
+
+  static final String MAP_KEY_PATH = "path";
+  static final String MAP_KEY_MAX_WIDTH = "maxWidth";
+  static final String MAP_KEY_MAX_HEIGHT = "maxHeight";
+  private static final String MAP_KEY_TYPE = "type";
+  private static final String MAP_KEY_ERROR_CODE = "errorCode";
+  private static final String MAP_KEY_ERROR_MESSAGE = "errorMessage";
+
+  private static final String FLUTTER_IMAGE_PICKER_IMAGE_PATH_KEY =
+      "flutter_image_picker_image_path";
+  private static final String SHARED_PREFERENCE_ERROR_CODE_KEY = "flutter_image_picker_error_code";
+  private static final String SHARED_PREFERENCE_ERROR_MESSAGE_KEY =
+      "flutter_image_picker_error_message";
+  private static final String SHARED_PREFERENCE_MAX_WIDTH_KEY = "flutter_image_picker_max_width";
+  private static final String SHARED_PREFERENCE_MAX_HEIGHT_KEY = "flutter_image_picker_max_height";
+  private static final String SHARED_PREFERENCE_TYPE_KEY = "flutter_image_picker_type";
+  private static final String SHARED_PREFERENCE_PENDING_IMAGE_URI_PATH_KEY =
+      "flutter_image_picker_pending_image_uri";
+  private static final String SHARED_PREFERENCES_NAME = "flutter_image_picker_shared_preference";
+
+  private static SharedPreferences getFilePref;
+
+  static void setUpWithActivity(Activity activity) {
+    getFilePref =
+        activity
+            .getApplicationContext()
+            .getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
+  }
+
+  static void saveTypeWithMethodCallName(String methodCallName) {
+    if (methodCallName.equals(ImagePickerPlugin.METHOD_CALL_IMAGE)) {
+      setType("image");
+    } else if (methodCallName.equals(ImagePickerPlugin.METHOD_CALL_VIDEO)) {
+      setType("video");
+    }
+  }
+
+  private static void setType(String type) {
+    if (getFilePref == null) {
+      return;
+    }
+    getFilePref.edit().putString(SHARED_PREFERENCE_TYPE_KEY, type).apply();
+  }
+
+  static void saveDemensionWithMethodCall(MethodCall methodCall) {
+    Double maxWidth = methodCall.argument("maxWidth");
+    Double maxHeight = methodCall.argument("maxHeight");
+    setMaxDimension(maxWidth, maxHeight);
+  }
+
+  private static void setMaxDimension(Double maxWidth, Double maxHeight) {
+    if (getFilePref == null) {
+      return;
+    }
+
+    SharedPreferences.Editor editor = getFilePref.edit();
+    if (maxWidth != null) {
+      editor.putLong(SHARED_PREFERENCE_MAX_WIDTH_KEY, Double.doubleToRawLongBits(maxWidth));
+    }
+    if (maxHeight != null) {
+      editor.putLong(SHARED_PREFERENCE_MAX_HEIGHT_KEY, Double.doubleToRawLongBits(maxHeight));
+    }
+    editor.apply();
+  }
+
+  static void savePendingCameraMediaUriPath(Uri uri) {
+    if (getFilePref == null) {
+      return;
+    }
+    getFilePref
+        .edit()
+        .putString(SHARED_PREFERENCE_PENDING_IMAGE_URI_PATH_KEY, uri.getPath())
+        .apply();
+  }
+
+  static String retrievePendingCameraMediaUriPath() {
+    if (getFilePref == null) {
+      return null;
+    }
+    return getFilePref.getString(SHARED_PREFERENCE_PENDING_IMAGE_URI_PATH_KEY, "");
+  }
+
+  static void saveResult(
+      @Nullable String path, @Nullable String errorCode, @Nullable String errorMessage) {
+    if (getFilePref == null) {
+      return;
+    }
+    SharedPreferences.Editor editor = getFilePref.edit();
+    if (path != null) {
+      editor.putString(FLUTTER_IMAGE_PICKER_IMAGE_PATH_KEY, path);
+    }
+    if (errorCode != null) {
+      editor.putString(SHARED_PREFERENCE_ERROR_CODE_KEY, errorCode);
+    }
+    if (errorMessage != null) {
+      editor.putString(SHARED_PREFERENCE_ERROR_MESSAGE_KEY, errorMessage);
+    }
+    editor.apply();
+  }
+
+  static void clear() {
+    if (getFilePref == null) {
+      return;
+    }
+    getFilePref.edit().clear().apply();
+  }
+
+  static Map<String, Object> getCacheMap() {
+    if (getFilePref == null) {
+      return new HashMap<>();
+    }
+    Map<String, Object> resultMap = new HashMap<>();
+    Boolean hasData = false;
+
+    if (getFilePref.contains(FLUTTER_IMAGE_PICKER_IMAGE_PATH_KEY)) {
+      resultMap.put(MAP_KEY_PATH, getFilePref.getString(FLUTTER_IMAGE_PICKER_IMAGE_PATH_KEY, ""));
+      hasData = true;
+    }
+
+    if (getFilePref.contains(SHARED_PREFERENCE_ERROR_CODE_KEY)) {
+      resultMap.put(
+          MAP_KEY_ERROR_CODE, getFilePref.getString(SHARED_PREFERENCE_ERROR_CODE_KEY, ""));
+      hasData = true;
+      if (getFilePref.contains(SHARED_PREFERENCE_ERROR_MESSAGE_KEY)) {
+        resultMap.put(
+            MAP_KEY_ERROR_MESSAGE, getFilePref.getString(SHARED_PREFERENCE_ERROR_MESSAGE_KEY, ""));
+      }
+    }
+
+    if (hasData) {
+      if (getFilePref.contains(SHARED_PREFERENCE_TYPE_KEY)) {
+        resultMap.put(MAP_KEY_TYPE, getFilePref.getString(SHARED_PREFERENCE_TYPE_KEY, ""));
+      }
+
+      if (getFilePref.contains(SHARED_PREFERENCE_MAX_WIDTH_KEY)) {
+        resultMap.put(
+            MAP_KEY_MAX_WIDTH,
+            Double.longBitsToDouble(getFilePref.getLong(SHARED_PREFERENCE_MAX_WIDTH_KEY, 0)));
+      }
+
+      if (getFilePref.contains(SHARED_PREFERENCE_MAX_HEIGHT_KEY)) {
+        resultMap.put(
+            MAP_KEY_MAX_HEIGHT,
+            Double.longBitsToDouble(getFilePref.getLong(SHARED_PREFERENCE_MAX_HEIGHT_KEY, 0)));
+      }
+    }
+
+    return resultMap;
+  }
+}
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
index 33f58fbde9d0..6ddee11897ed 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -182,6 +183,35 @@ public void onScanCompleted(String path, Uri uri) {
     this.fileUtils = fileUtils;
   }
 
+  void saveStateBeforeResult() {
+    if (methodCall == null) {
+      return;
+    }
+
+    ImagePickerCache.saveTypeWithMethodCallName(methodCall.method);
+    ImagePickerCache.saveDemensionWithMethodCall(methodCall);
+    if (pendingCameraMediaUri != null) {
+      ImagePickerCache.savePendingCameraMediaUriPath(pendingCameraMediaUri);
+    }
+  }
+
+  void retrieveLostImage(MethodChannel.Result result) {
+    Map<String, Object> resultMap = ImagePickerCache.getCacheMap();
+    String path = (String) resultMap.get(ImagePickerCache.MAP_KEY_PATH);
+    if (path != null) {
+      Double maxWidth = (Double) resultMap.get(ImagePickerCache.MAP_KEY_MAX_WIDTH);
+      Double maxHeight = (Double) resultMap.get(ImagePickerCache.MAP_KEY_MAX_HEIGHT);
+      String newPath = imageResizer.resizeImageIfNeeded(path, maxWidth, maxHeight);
+      resultMap.put(ImagePickerCache.MAP_KEY_PATH, newPath);
+    }
+    if (resultMap.isEmpty()) {
+      result.success(null);
+    } else {
+      result.success(resultMap);
+    }
+    ImagePickerCache.clear();
+  }
+
   public void chooseVideoFromGallery(MethodCall methodCall, MethodChannel.Result result) {
     if (!setPendingMethodCallAndResult(methodCall, result)) {
       finishWithAlreadyActiveError(result);
@@ -391,7 +421,9 @@ private void handleChooseVideoResult(int resultCode, Intent data) {
   private void handleCaptureImageResult(int resultCode) {
     if (resultCode == Activity.RESULT_OK) {
       fileUriResolver.getFullImagePath(
-          pendingCameraMediaUri,
+          pendingCameraMediaUri != null
+              ? pendingCameraMediaUri
+              : Uri.parse(ImagePickerCache.retrievePendingCameraMediaUriPath()),
           new OnPathReadyListener() {
             @Override
             public void onPathReady(String path) {
@@ -408,7 +440,9 @@ public void onPathReady(String path) {
   private void handleCaptureVideoResult(int resultCode) {
     if (resultCode == Activity.RESULT_OK) {
       fileUriResolver.getFullImagePath(
-          pendingCameraMediaUri,
+          pendingCameraMediaUri != null
+              ? pendingCameraMediaUri
+              : Uri.parse(ImagePickerCache.retrievePendingCameraMediaUriPath()),
           new OnPathReadyListener() {
             @Override
             public void onPathReady(String path) {
@@ -423,17 +457,19 @@ public void onPathReady(String path) {
   }
 
   private void handleImageResult(String path, boolean shouldDeleteOriginalIfScaled) {
-    if (pendingResult != null) {
+    if (methodCall != null) {
       Double maxWidth = methodCall.argument("maxWidth");
       Double maxHeight = methodCall.argument("maxHeight");
-
       String finalImagePath = imageResizer.resizeImageIfNeeded(path, maxWidth, maxHeight);
+
       finishWithSuccess(finalImagePath);
 
       //delete original file if scaled
       if (!finalImagePath.equals(path) && shouldDeleteOriginalIfScaled) {
         new File(path).delete();
       }
+    } else {
+      finishWithSuccess(path);
     }
   }
 
@@ -449,11 +485,16 @@ private boolean setPendingMethodCallAndResult(
 
     this.methodCall = methodCall;
     pendingResult = result;
+
+    // Clean up cache if a new image picker is launched.
+    ImagePickerCache.clear();
+
     return true;
   }
 
   private void finishWithSuccess(String imagePath) {
     if (pendingResult == null) {
+      ImagePickerCache.saveResult(imagePath, null, null);
       return;
     }
     pendingResult.success(imagePath);
@@ -466,6 +507,7 @@ private void finishWithAlreadyActiveError(MethodChannel.Result result) {
 
   private void finishWithError(String errorCode, String errorMessage) {
     if (pendingResult == null) {
+      ImagePickerCache.saveResult(null, errorCode, errorMessage);
       return;
     }
     pendingResult.error(errorCode, errorMessage, null);
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
index 7e736b082df1..dbcdf2d6f2eb 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
@@ -4,6 +4,9 @@
 
 package io.flutter.plugins.imagepicker;
 
+import android.app.Activity;
+import android.app.Application;
+import android.os.Bundle;
 import android.os.Environment;
 import androidx.annotation.VisibleForTesting;
 import io.flutter.plugin.common.MethodCall;
@@ -12,13 +15,19 @@
 import java.io.File;
 
 public class ImagePickerPlugin implements MethodChannel.MethodCallHandler {
+
+  static final String METHOD_CALL_IMAGE = "pickImage";
+  static final String METHOD_CALL_VIDEO = "pickVideo";
+  private static final String METHOD_CALL_RETRIEVE = "retrieve";
+
   private static final String CHANNEL = "plugins.flutter.io/image_picker";
 
   private static final int SOURCE_CAMERA = 0;
   private static final int SOURCE_GALLERY = 1;
 
   private final PluginRegistry.Registrar registrar;
-  private final ImagePickerDelegate delegate;
+  private ImagePickerDelegate delegate;
+  private Application.ActivityLifecycleCallbacks activityLifecycleCallbacks;
 
   public static void registerWith(PluginRegistry.Registrar registrar) {
     if (registrar.activity() == null) {
@@ -26,26 +35,63 @@ public static void registerWith(PluginRegistry.Registrar registrar) {
       // we stop the registering process immediately because the ImagePicker requires an activity.
       return;
     }
+    ImagePickerCache.setUpWithActivity(registrar.activity());
+
     final MethodChannel channel = new MethodChannel(registrar.messenger(), CHANNEL);
 
     final File externalFilesDirectory =
         registrar.activity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
     final ExifDataCopier exifDataCopier = new ExifDataCopier();
     final ImageResizer imageResizer = new ImageResizer(externalFilesDirectory, exifDataCopier);
-
     final ImagePickerDelegate delegate =
         new ImagePickerDelegate(registrar.activity(), externalFilesDirectory, imageResizer);
+
     registrar.addActivityResultListener(delegate);
     registrar.addRequestPermissionsResultListener(delegate);
-
     final ImagePickerPlugin instance = new ImagePickerPlugin(registrar, delegate);
     channel.setMethodCallHandler(instance);
   }
 
   @VisibleForTesting
-  ImagePickerPlugin(PluginRegistry.Registrar registrar, ImagePickerDelegate delegate) {
+  ImagePickerPlugin(final PluginRegistry.Registrar registrar, final ImagePickerDelegate delegate) {
     this.registrar = registrar;
     this.delegate = delegate;
+    this.activityLifecycleCallbacks =
+        new Application.ActivityLifecycleCallbacks() {
+          @Override
+          public void onActivityCreated(Activity activity, Bundle savedInstanceState) {}
+
+          @Override
+          public void onActivityStarted(Activity activity) {}
+
+          @Override
+          public void onActivityResumed(Activity activity) {}
+
+          @Override
+          public void onActivityPaused(Activity activity) {}
+
+          @Override
+          public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+            if (activity == registrar.activity()) {
+              delegate.saveStateBeforeResult();
+            }
+          }
+
+          @Override
+          public void onActivityDestroyed(Activity activity) {}
+
+          @Override
+          public void onActivityStopped(Activity activity) {}
+        };
+
+    if (this.registrar != null
+        && this.registrar.activity() != null
+        && this.registrar.activity().getApplication() != null) {
+      this.registrar
+          .activity()
+          .getApplication()
+          .registerActivityLifecycleCallbacks(this.activityLifecycleCallbacks);
+    }
   }
 
   @Override
@@ -54,32 +100,39 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
       result.error("no_activity", "image_picker plugin requires a foreground activity.", null);
       return;
     }
-    if (call.method.equals("pickImage")) {
-      int imageSource = call.argument("source");
-      switch (imageSource) {
-        case SOURCE_GALLERY:
-          delegate.chooseImageFromGallery(call, result);
-          break;
-        case SOURCE_CAMERA:
-          delegate.takeImageWithCamera(call, result);
-          break;
-        default:
-          throw new IllegalArgumentException("Invalid image source: " + imageSource);
-      }
-    } else if (call.method.equals("pickVideo")) {
-      int imageSource = call.argument("source");
-      switch (imageSource) {
-        case SOURCE_GALLERY:
-          delegate.chooseVideoFromGallery(call, result);
-          break;
-        case SOURCE_CAMERA:
-          delegate.takeVideoWithCamera(call, result);
-          break;
-        default:
-          throw new IllegalArgumentException("Invalid video source: " + imageSource);
-      }
-    } else {
-      throw new IllegalArgumentException("Unknown method " + call.method);
+    int imageSource;
+    switch (call.method) {
+      case METHOD_CALL_IMAGE:
+        imageSource = call.argument("source");
+        switch (imageSource) {
+          case SOURCE_GALLERY:
+            delegate.chooseImageFromGallery(call, result);
+            break;
+          case SOURCE_CAMERA:
+            delegate.takeImageWithCamera(call, result);
+            break;
+          default:
+            throw new IllegalArgumentException("Invalid image source: " + imageSource);
+        }
+        break;
+      case METHOD_CALL_VIDEO:
+        imageSource = call.argument("source");
+        switch (imageSource) {
+          case SOURCE_GALLERY:
+            delegate.chooseVideoFromGallery(call, result);
+            break;
+          case SOURCE_CAMERA:
+            delegate.takeVideoWithCamera(call, result);
+            break;
+          default:
+            throw new IllegalArgumentException("Invalid video source: " + imageSource);
+        }
+        break;
+      case METHOD_CALL_RETRIEVE:
+        delegate.retrieveLostImage(result);
+        break;
+      default:
+        throw new IllegalArgumentException("Unknown method " + call.method);
     }
   }
 }
diff --git a/packages/image_picker/example/lib/main.dart b/packages/image_picker/example/lib/main.dart
index 79ceb35a61f6..4dbd34201709 100755
--- a/packages/image_picker/example/lib/main.dart
+++ b/packages/image_picker/example/lib/main.dart
@@ -33,34 +33,39 @@ class MyHomePage extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  Future<File> _imageFile;
+  File _imageFile;
+  dynamic _pickImageError;
   bool isVideo = false;
   VideoPlayerController _controller;
-  VoidCallback listener;
+  VoidCallback listener = () {};
+  String _retrieveDataError;
 
-  void _onImageButtonPressed(ImageSource source) {
-    setState(() {
-      if (_controller != null) {
-        _controller.setVolume(0.0);
-        _controller.removeListener(listener);
-      }
-      if (isVideo) {
-        ImagePicker.pickVideo(source: source).then((File file) {
-          if (file != null && mounted) {
-            setState(() {
-              _controller = VideoPlayerController.file(file)
-                ..addListener(listener)
-                ..setVolume(1.0)
-                ..initialize()
-                ..setLooping(true)
-                ..play();
-            });
-          }
-        });
-      } else {
-        _imageFile = ImagePicker.pickImage(source: source);
+  void _onImageButtonPressed(ImageSource source) async {
+    if (_controller != null) {
+      _controller.setVolume(0.0);
+      _controller.removeListener(listener);
+    }
+    if (isVideo) {
+      ImagePicker.pickVideo(source: source).then((File file) {
+        if (file != null && mounted) {
+          setState(() {
+            _controller = VideoPlayerController.file(file)
+              ..addListener(listener)
+              ..setVolume(1.0)
+              ..initialize()
+              ..setLooping(true)
+              ..play();
+          });
+        }
+      });
+    } else {
+      try {
+        _imageFile = await ImagePicker.pickImage(source: source);
+      } catch (e) {
+        _pickImageError = e;
       }
-    });
+      setState(() {});
+    }
   }
 
   @override
@@ -80,15 +85,11 @@ class _MyHomePageState extends State<MyHomePage> {
     super.dispose();
   }
 
-  @override
-  void initState() {
-    super.initState();
-    listener = () {
-      setState(() {});
-    };
-  }
-
   Widget _previewVideo(VideoPlayerController controller) {
+    final Text retrieveError = _getRetrieveErrorWidget();
+    if (retrieveError != null) {
+      return retrieveError;
+    }
     if (controller == null) {
       return const Text(
         'You have not yet picked a video',
@@ -108,24 +109,48 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   Widget _previewImage() {
-    return FutureBuilder<File>(
-        future: _imageFile,
-        builder: (BuildContext context, AsyncSnapshot<File> snapshot) {
-          if (snapshot.connectionState == ConnectionState.done &&
-              snapshot.data != null) {
-            return Image.file(snapshot.data);
-          } else if (snapshot.error != null) {
-            return const Text(
-              'Error picking image.',
-              textAlign: TextAlign.center,
-            );
-          } else {
-            return const Text(
-              'You have not yet picked an image.',
-              textAlign: TextAlign.center,
-            );
-          }
-        });
+    final Text retrieveError = _getRetrieveErrorWidget();
+    if (retrieveError != null) {
+      return retrieveError;
+    }
+    if (_imageFile != null) {
+      return Image.file(_imageFile);
+    } else if (_pickImageError != null) {
+      return Text(
+        'Pick image error: $_pickImageError',
+        textAlign: TextAlign.center,
+      );
+    } else {
+      return const Text(
+        'You have not yet picked an image.',
+        textAlign: TextAlign.center,
+      );
+    }
+  }
+
+  Future<void> retrieveLostData() async {
+    final LostDataResponse response = await ImagePicker.retrieveLostData();
+    if (response.isEmpty) {
+      return;
+    }
+    if (response.file != null) {
+      setState(() {
+        if (response.type == RetrieveType.video) {
+          isVideo = true;
+          _controller = VideoPlayerController.file(response.file)
+            ..addListener(listener)
+            ..setVolume(1.0)
+            ..initialize()
+            ..setLooping(true)
+            ..play();
+        } else {
+          isVideo = false;
+          _imageFile = response.file;
+        }
+      });
+    } else {
+      _retrieveDataError = response.exception.code;
+    }
   }
 
   @override
@@ -135,7 +160,37 @@ class _MyHomePageState extends State<MyHomePage> {
         title: Text(widget.title),
       ),
       body: Center(
-        child: isVideo ? _previewVideo(_controller) : _previewImage(),
+        child: Platform.isAndroid
+            ? FutureBuilder<void>(
+                future: retrieveLostData(),
+                builder: (BuildContext context, AsyncSnapshot<void> snapshot) {
+                  switch (snapshot.connectionState) {
+                    case ConnectionState.none:
+                    case ConnectionState.waiting:
+                      return const Text(
+                        'You have not yet picked an image.',
+                        textAlign: TextAlign.center,
+                      );
+                    case ConnectionState.done:
+                      return isVideo
+                          ? _previewVideo(_controller)
+                          : _previewImage();
+                    default:
+                      if (snapshot.hasError) {
+                        return Text(
+                          'Pick image/video error: ${snapshot.error}}',
+                          textAlign: TextAlign.center,
+                        );
+                      } else {
+                        const Text(
+                          'You have not yet picked an image.',
+                          textAlign: TextAlign.center,
+                        );
+                      }
+                  }
+                },
+              )
+            : (isVideo ? _previewVideo(_controller) : _previewImage()),
       ),
       floatingActionButton: Column(
         mainAxisAlignment: MainAxisAlignment.end,
@@ -191,6 +246,15 @@ class _MyHomePageState extends State<MyHomePage> {
       ),
     );
   }
+
+  Text _getRetrieveErrorWidget() {
+    if (_retrieveDataError != null) {
+      final Text result = Text(_retrieveDataError);
+      _retrieveDataError = null;
+      return result;
+    }
+    return null;
+  }
 }
 
 class AspectRatioVideo extends StatefulWidget {
diff --git a/packages/image_picker/lib/image_picker.dart b/packages/image_picker/lib/image_picker.dart
index ae1d366d428b..92c1b3d6b5ea 100755
--- a/packages/image_picker/lib/image_picker.dart
+++ b/packages/image_picker/lib/image_picker.dart
@@ -8,6 +8,9 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
+const String kTypeImage = 'image';
+const String kTypeVideo = 'video';
+
 /// Specifies the source where the picked image should come from.
 enum ImageSource {
   /// Opens up the device camera, letting the user to take a new picture.
@@ -29,6 +32,9 @@ class ImagePicker {
   /// If specified, the image will be at most [maxWidth] wide and
   /// [maxHeight] tall. Otherwise the image will be returned at it's
   /// original width and height.
+  ///
+  /// In Android, the MainActivity can be destroyed for various reasons. If that happens, the result will be lost
+  /// in this call. You can then call [retrieveLostData] when your app relaunches to retrieve the lost data.
   static Future<File> pickImage({
     @required ImageSource source,
     double maxWidth,
@@ -59,6 +65,13 @@ class ImagePicker {
     return path == null ? null : File(path);
   }
 
+  /// Returns a [File] object pointing to the video that was picked.
+  ///
+  /// The [source] argument controls where the video comes from. This can
+  /// be either [ImageSource.camera] or [ImageSource.gallery].
+  ///
+  /// In Android, the MainActivity can be destroyed for various fo reasons. If that happens, the result will be lost
+  /// in this call. You can then call [retrieveLostData] when your app relaunches to retrieve the lost data.
   static Future<File> pickVideo({
     @required ImageSource source,
   }) async {
@@ -75,4 +88,95 @@ class ImagePicker {
     );
     return path == null ? null : File(path);
   }
+
+  /// Retrieve the lost image file when [pickImage] or [pickVideo] failed because the  MainActivity is destroyed. (Android only)
+  ///
+  /// Image or video can be lost if the MainActivity is destroyed. And there is no guarantee that the MainActivity is always alive.
+  /// Call this method to retrieve the lost data and process the data according to your APP's business logic.
+  ///
+  /// Returns a [LostDataResponse] if successfully retrieved the lost data. The [LostDataResponse] can represent either a
+  /// successful image/video selection, or a failure.
+  ///
+  /// Calling this on a non-Android platform will throw [UnimplementedError] exception.
+  ///
+  /// See also:
+  /// * [LostDataResponse], for what's included in the response.
+  /// * [Android Activity Lifecycle](https://developer.android.com/reference/android/app/Activity.html), for more information on MainActivity destruction.
+  static Future<LostDataResponse> retrieveLostData() async {
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    final Map<dynamic, dynamic> result =
+        await _channel.invokeMethod('retrieve');
+    if (result == null) {
+      return LostDataResponse.empty();
+    }
+    assert(result.containsKey('path') ^ result.containsKey('errorCode'));
+
+    final String type = result['type'];
+    assert(type == kTypeImage || type == kTypeVideo);
+
+    RetrieveType retrieveType;
+    if (type == kTypeImage) {
+      retrieveType = RetrieveType.image;
+    } else if (type == kTypeVideo) {
+      retrieveType = RetrieveType.video;
+    }
+
+    PlatformException exception;
+    if (result.containsKey('errorCode')) {
+      exception = PlatformException(
+          code: result['errorCode'], message: result['errorMessage']);
+    }
+
+    final String path = result['path'];
+
+    return LostDataResponse(
+        file: path == null ? null : File(path),
+        exception: exception,
+        type: retrieveType);
+  }
+}
+
+/// The response object of [ImagePicker.retrieveLostData].
+///
+/// Only applies to Android.
+/// See also:
+/// * [ImagePicker.retrieveLostData] for more details on retrieving lost data.
+class LostDataResponse {
+  LostDataResponse({this.file, this.exception, this.type});
+
+  LostDataResponse.empty()
+      : file = null,
+        exception = null,
+        type = null {
+    _empty = true;
+  }
+
+  /// Whether it is an empty response.
+  ///
+  /// An empty response should have [file], [exception] and [type] to be null.
+  bool get isEmpty => _empty;
+
+  /// The file that was lost in a previous [pickImage] or [pickVideo] call due to MainActivity being destroyed.
+  ///
+  /// Can be null if [exception] exists.
+  final File file;
+
+  /// The exception of the last [pickImage] or [pickVideo].
+  ///
+  /// If the last [pickImage] or [pickVideo] threw some exception before the MainActivity destruction, this variable keeps that
+  /// exception.
+  /// You should handle this exception as if the [pickImage] or [pickVideo] got an exception when the MainActivity was not destroyed.
+  ///
+  /// Note that it is not the exception that caused the destruction of the MainActivity.
+  final PlatformException exception;
+
+  /// Can either be [RetrieveType.image] or [RetrieveType.video];
+  final RetrieveType type;
+
+  bool _empty = false;
 }
+
+/// The type of the retrieved data in a [LostDataResponse].
+enum RetrieveType { image, video }
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index ec4bad861019..d011baf3f88f 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.3+2
+version: 0.5.4
 
 flutter:
   plugin:
diff --git a/packages/image_picker/test/image_picker_test.dart b/packages/image_picker/test/image_picker_test.dart
index cb6be17dc055..40226afb77ce 100644
--- a/packages/image_picker/test/image_picker_test.dart
+++ b/packages/image_picker/test/image_picker_test.dart
@@ -107,5 +107,52 @@ void main() {
         expect(await ImagePicker.pickImage(source: ImageSource.camera), isNull);
       });
     });
+
+    group('#retrieveLostData', () {
+      test('retrieveLostData get success response', () async {
+        channel.setMockMethodCallHandler((MethodCall methodCall) async {
+          return <String, String>{
+            'type': 'image',
+            'path': '/example/path',
+          };
+        });
+        final LostDataResponse response = await ImagePicker.retrieveLostData();
+        expect(response.type, RetrieveType.image);
+        expect(response.file.path, '/example/path');
+      });
+
+      test('retrieveLostData get error response', () async {
+        channel.setMockMethodCallHandler((MethodCall methodCall) async {
+          return <String, String>{
+            'type': 'video',
+            'errorCode': 'test_error_code',
+            'errorMessage': 'test_error_message',
+          };
+        });
+        final LostDataResponse response = await ImagePicker.retrieveLostData();
+        expect(response.type, RetrieveType.video);
+        expect(response.exception.code, 'test_error_code');
+        expect(response.exception.message, 'test_error_message');
+      });
+
+      test('retrieveLostData get null response', () async {
+        channel.setMockMethodCallHandler((MethodCall methodCall) async {
+          return null;
+        });
+        expect((await ImagePicker.retrieveLostData()).isEmpty, true);
+      });
+
+      test('retrieveLostData get both path and error should throw', () async {
+        channel.setMockMethodCallHandler((MethodCall methodCall) async {
+          return <String, String>{
+            'type': 'video',
+            'errorCode': 'test_error_code',
+            'errorMessage': 'test_error_message',
+            'path': '/example/path',
+          };
+        });
+        expect(ImagePicker.retrieveLostData(), throwsAssertionError);
+      });
+    });
   });
 }

From b82ae1a6624e80d49f085b0f5ba42bfc2a44443a Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Fri, 19 Apr 2019 16:15:02 -0700
Subject: [PATCH 351/410] [in_app_purchase] Rename the unified API (#1517)

Also moves the example keystore file into the right directory.
---
 packages/in_app_purchase/README.md                         | 2 +-
 .../example/{ => android}/keystore.example.properties      | 0
 packages/in_app_purchase/example/lib/main.dart             | 2 +-
 packages/in_app_purchase/lib/in_app_purchase.dart          | 7 +++++++
 .../in_app_purchase/lib/in_app_purchase_connection.dart    | 7 -------
 .../lib/src/billing_client_wrappers/purchase_wrapper.dart  | 2 +-
 .../src/billing_client_wrappers/sku_details_wrapper.dart   | 2 +-
 .../app_store_connection.dart                              | 2 +-
 .../google_play_connection.dart                            | 2 +-
 .../in_app_purchase_connection.dart                        | 0
 .../product_details.dart                                   | 0
 .../purchase_details.dart                                  | 0
 .../lib/src/store_kit_wrappers/enum_converters.dart        | 2 +-
 .../sk_payment_transaction_wrappers.dart                   | 2 +-
 .../lib/src/store_kit_wrappers/sk_product_wrapper.dart     | 2 +-
 .../billing_client_wrappers/purchase_wrapper_test.dart     | 2 +-
 .../billing_client_wrappers/sku_details_wrapper_test.dart  | 2 +-
 .../app_store_connection_test.dart                         | 6 +++---
 .../google_play_connection_test.dart                       | 6 +++---
 .../test/store_kit_wrappers/sk_product_test.dart           | 4 ++--
 20 files changed, 26 insertions(+), 26 deletions(-)
 rename packages/in_app_purchase/example/{ => android}/keystore.example.properties (100%)
 create mode 100644 packages/in_app_purchase/lib/in_app_purchase.dart
 delete mode 100644 packages/in_app_purchase/lib/in_app_purchase_connection.dart
 rename packages/in_app_purchase/lib/src/{in_app_purchase_connection => in_app_purchase}/app_store_connection.dart (98%)
 rename packages/in_app_purchase/lib/src/{in_app_purchase_connection => in_app_purchase}/google_play_connection.dart (98%)
 rename packages/in_app_purchase/lib/src/{in_app_purchase_connection => in_app_purchase}/in_app_purchase_connection.dart (100%)
 rename packages/in_app_purchase/lib/src/{in_app_purchase_connection => in_app_purchase}/product_details.dart (100%)
 rename packages/in_app_purchase/lib/src/{in_app_purchase_connection => in_app_purchase}/purchase_details.dart (100%)

diff --git a/packages/in_app_purchase/README.md b/packages/in_app_purchase/README.md
index 78cf5efb50f1..e29ca26860f4 100644
--- a/packages/in_app_purchase/README.md
+++ b/packages/in_app_purchase/README.md
@@ -28,7 +28,7 @@ build_runner watch` will watch the filesystem for changes.
 
 The API surface is stacked into 2 main layers.
 
-1. [in_app_purchase_connection.dart](lib/src/in_app_purchase_connection.dart),
+1. [in_app_purchase.dart](lib/src/in_app_purchase.dart),
    the generic idiommatic Flutter API. This exposes the most basic IAP-related
    functionality. The goal is that Flutter apps should be able to use this API
    surface on its own for the vast majority of cases.
diff --git a/packages/in_app_purchase/example/keystore.example.properties b/packages/in_app_purchase/example/android/keystore.example.properties
similarity index 100%
rename from packages/in_app_purchase/example/keystore.example.properties
rename to packages/in_app_purchase/example/android/keystore.example.properties
diff --git a/packages/in_app_purchase/example/lib/main.dart b/packages/in_app_purchase/example/lib/main.dart
index 2ac2872a5361..fbb1f885bcc5 100644
--- a/packages/in_app_purchase/example/lib/main.dart
+++ b/packages/in_app_purchase/example/lib/main.dart
@@ -5,7 +5,7 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:flutter/material.dart';
-import 'package:in_app_purchase/in_app_purchase_connection.dart';
+import 'package:in_app_purchase/in_app_purchase.dart';
 
 void main() {
   runApp(MyApp());
diff --git a/packages/in_app_purchase/lib/in_app_purchase.dart b/packages/in_app_purchase/lib/in_app_purchase.dart
new file mode 100644
index 000000000000..5a68075db3e5
--- /dev/null
+++ b/packages/in_app_purchase/lib/in_app_purchase.dart
@@ -0,0 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+export 'src/in_app_purchase/in_app_purchase_connection.dart';
+export 'src/in_app_purchase/product_details.dart';
+export 'src/in_app_purchase/purchase_details.dart';
diff --git a/packages/in_app_purchase/lib/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/in_app_purchase_connection.dart
deleted file mode 100644
index 52010e2441d2..000000000000
--- a/packages/in_app_purchase/lib/in_app_purchase_connection.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-export 'src/in_app_purchase_connection/in_app_purchase_connection.dart';
-export 'src/in_app_purchase_connection/product_details.dart';
-export 'src/in_app_purchase_connection/purchase_details.dart';
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
index 767d75d9714b..07b1ca06851e 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.dart
@@ -4,7 +4,7 @@
 
 import 'dart:ui' show hashValues;
 import 'package:flutter/foundation.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/purchase_details.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'enum_converters.dart';
 import 'billing_client_wrapper.dart';
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
index a22992d098dc..9010aa89f05d 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.dart
@@ -7,7 +7,7 @@ import 'package:flutter/foundation.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'billing_client_wrapper.dart';
 import 'enum_converters.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/product_details.dart';
 
 // WARNING: Changes to `@JsonSerializable` classes need to be reflected in the
 // below generated file. Run `flutter packages pub run build_runner watch` to
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase/app_store_connection.dart
similarity index 98%
rename from packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
rename to packages/in_app_purchase/lib/src/in_app_purchase/app_store_connection.dart
index 962ed3d586a6..02a409012fdb 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/app_store_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase/app_store_connection.dart
@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:flutter/foundation.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/purchase_details.dart';
 
 import 'in_app_purchase_connection.dart';
 import 'product_details.dart';
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
similarity index 98%
rename from packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
rename to packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
index 2760647375ed..586c0e32e1e1 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase_connection/google_play_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:flutter/widgets.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/purchase_details.dart';
 import '../../billing_client_wrappers.dart';
 import 'in_app_purchase_connection.dart';
 import 'product_details.dart';
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase/in_app_purchase_connection.dart
similarity index 100%
rename from packages/in_app_purchase/lib/src/in_app_purchase_connection/in_app_purchase_connection.dart
rename to packages/in_app_purchase/lib/src/in_app_purchase/in_app_purchase_connection.dart
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart b/packages/in_app_purchase/lib/src/in_app_purchase/product_details.dart
similarity index 100%
rename from packages/in_app_purchase/lib/src/in_app_purchase_connection/product_details.dart
rename to packages/in_app_purchase/lib/src/in_app_purchase/product_details.dart
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase_connection/purchase_details.dart b/packages/in_app_purchase/lib/src/in_app_purchase/purchase_details.dart
similarity index 100%
rename from packages/in_app_purchase/lib/src/in_app_purchase_connection/purchase_details.dart
rename to packages/in_app_purchase/lib/src/in_app_purchase/purchase_details.dart
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart
index b2cb99d3aaee..c1be198c5d04 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/enum_converters.dart
@@ -1,6 +1,6 @@
 import 'package:in_app_purchase/store_kit_wrappers.dart';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:in_app_purchase/in_app_purchase_connection.dart';
+import 'package:in_app_purchase/in_app_purchase.dart';
 
 part 'enum_converters.g.dart';
 
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
index 08c77247430d..49aae195aaa9 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/purchase_details.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'sk_product_wrapper.dart';
 import 'sk_payment_queue_wrapper.dart';
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
index 90d8486392df..658ce39ac55b 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
@@ -5,7 +5,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:collection/collection.dart';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/product_details.dart';
 
 // WARNING: Changes to `@JsonSerializable` classes need to be reflected in the
 // below generated file. Run `flutter packages pub run build_runner watch` to
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
index ffb04276747a..8d34f8c49d8b 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/purchase_wrapper_test.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/purchase_details.dart';
 import 'package:test/test.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
diff --git a/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
index 54e4dd535f54..93acb9f0eabf 100644
--- a/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
+++ b/packages/in_app_purchase/test/billing_client_wrappers/sku_details_wrapper_test.dart
@@ -5,7 +5,7 @@
 import 'package:test/test.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/product_details.dart';
 
 final SkuDetailsWrapper dummySkuDetails = SkuDetailsWrapper(
   description: 'description',
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
index 4f44712e0a05..2a63ffeff388 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/app_store_connection_test.dart
@@ -6,12 +6,12 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/services.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/purchase_details.dart';
 import 'package:test/test.dart';
 
 import 'package:in_app_purchase/src/channel.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/app_store_connection.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/app_store_connection.dart';
+import 'package:in_app_purchase/src/in_app_purchase/product_details.dart';
 import 'package:in_app_purchase/store_kit_wrappers.dart';
 import '../store_kit_wrappers/sk_test_stub_objects.dart';
 
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index bcadf3beddc1..6dcc3aa35b2e 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -5,16 +5,16 @@
 import 'dart:async';
 
 import 'package:flutter/services.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/purchase_details.dart';
 import 'package:test/test.dart';
 
 import 'package:flutter/widgets.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
 import 'package:in_app_purchase/src/billing_client_wrappers/enum_converters.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/google_play_connection.dart';
+import 'package:in_app_purchase/src/in_app_purchase/google_play_connection.dart';
 import 'package:in_app_purchase/src/channel.dart';
 import '../stub_in_app_purchase_platform.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/product_details.dart';
 import '../billing_client_wrappers/sku_details_wrapper_test.dart';
 import '../billing_client_wrappers/purchase_wrapper_test.dart';
 
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
index 6ed5e84903cd..81e4c62edb74 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:in_app_purchase/src/in_app_purchase_connection/purchase_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/purchase_details.dart';
 import 'package:test/test.dart';
 import 'package:in_app_purchase/src/store_kit_wrappers/sk_product_wrapper.dart';
-import 'package:in_app_purchase/src/in_app_purchase_connection/product_details.dart';
+import 'package:in_app_purchase/src/in_app_purchase/product_details.dart';
 import 'package:in_app_purchase/store_kit_wrappers.dart';
 import 'sk_test_stub_objects.dart';
 

From 691fd1622491c90da20f75b5f369887bf241f34c Mon Sep 17 00:00:00 2001
From: Antti Ahti <antti.ahti@gmail.com>
Date: Mon, 22 Apr 2019 16:21:57 +0200
Subject: [PATCH 352/410] [firebase_performance] Deprecate incrementCounter in
 favor of incrementMetric (#1523)

* [firebase_performance] Deprecate incrementCounter in favor of incrementMetric

incrementCounter is deprecated in the Java SDK and it's been replaced with
incrementMetric. Let's make firebase_performance match that.

See: https://firebase.google.com/docs/reference/android/com/google/firebase/perf/metrics/Trace.html#incrementCounter(java.lang.String,%20long)

Fixes flutter/flutter#29775
---
 packages/firebase_performance/CHANGELOG.md    |  5 ++
 packages/firebase_performance/README.md       |  4 +-
 .../FirebasePerformancePlugin.java            |  6 +--
 .../example/lib/main.dart                     |  2 +-
 .../test_driver/firebase_performance.dart     | 17 ++++++-
 .../ios/Classes/FirebasePerformancePlugin.m   |  4 +-
 .../firebase_performance/lib/src/trace.dart   | 23 +++++++--
 packages/firebase_performance/pubspec.yaml    |  2 +-
 .../test/firebase_performance_test.dart       | 51 ++++++++++++++++++-
 9 files changed, 97 insertions(+), 17 deletions(-)

diff --git a/packages/firebase_performance/CHANGELOG.md b/packages/firebase_performance/CHANGELOG.md
index b676576bd2c0..7b915e7c8c6c 100644
--- a/packages/firebase_performance/CHANGELOG.md
+++ b/packages/firebase_performance/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.1
+
+* Deprecate `Trace.incrementCounter` and add `Trace.incrementMetric`.
+* Additional integration testing.
+
 ## 0.1.0+4
 
 * Remove deprecated methods for iOS.
diff --git a/packages/firebase_performance/README.md b/packages/firebase_performance/README.md
index 961c7f017623..8dc69662364e 100644
--- a/packages/firebase_performance/README.md
+++ b/packages/firebase_performance/README.md
@@ -24,9 +24,9 @@ myTrace.start();
 
 final Item item = cache.fetch("item");
 if (item != null) {
-  myTrace.incrementCounter("item_cache_hit");
+  myTrace.incrementMetric("item_cache_hit", 1);
 } else {
-  myTrace.incrementCounter("item_cache_miss");
+  myTrace.incrementMetric("item_cache_miss", 1);
 }
 
 myTrace.stop();
diff --git a/packages/firebase_performance/android/src/main/java/io/flutter/plugins/firebaseperformance/FirebasePerformancePlugin.java b/packages/firebase_performance/android/src/main/java/io/flutter/plugins/firebaseperformance/FirebasePerformancePlugin.java
index cd8d4960fd16..50dc0ada04aa 100644
--- a/packages/firebase_performance/android/src/main/java/io/flutter/plugins/firebaseperformance/FirebasePerformancePlugin.java
+++ b/packages/firebase_performance/android/src/main/java/io/flutter/plugins/firebaseperformance/FirebasePerformancePlugin.java
@@ -76,9 +76,9 @@ private void handleTraceStop(MethodCall call, Result result) {
     Integer handle = call.argument("handle");
     Trace trace = traces.get(handle);
 
-    Map<String, Integer> counters = call.argument("counters");
-    for (Map.Entry<String, Integer> entry : counters.entrySet()) {
-      trace.incrementCounter(entry.getKey(), entry.getValue());
+    Map<String, Integer> metrics = call.argument("metrics");
+    for (Map.Entry<String, Integer> entry : metrics.entrySet()) {
+      trace.incrementMetric(entry.getKey(), entry.getValue());
     }
 
     Map<String, String> attributes = call.argument("attributes");
diff --git a/packages/firebase_performance/example/lib/main.dart b/packages/firebase_performance/example/lib/main.dart
index b9c46614748b..16ed5b4322ee 100644
--- a/packages/firebase_performance/example/lib/main.dart
+++ b/packages/firebase_performance/example/lib/main.dart
@@ -77,7 +77,7 @@ class _MyAppState extends State<MyApp> {
     });
 
     final Trace trace = _performance.newTrace("test");
-    trace.incrementCounter("counter1", 16);
+    trace.incrementMetric("metric1", 16);
     trace.putAttribute("favorite_color", "blue");
 
     await trace.start();
diff --git a/packages/firebase_performance/example/test_driver/firebase_performance.dart b/packages/firebase_performance/example/test_driver/firebase_performance.dart
index daa0b582df87..fcabfe11f239 100644
--- a/packages/firebase_performance/example/test_driver/firebase_performance.dart
+++ b/packages/firebase_performance/example/test_driver/firebase_performance.dart
@@ -12,9 +12,11 @@ void main() {
   group('firebase_performance test driver', () {
     final FirebasePerformance performance = FirebasePerformance.instance;
 
-    test('setPerformanceCollectionEnabled', () async {
+    setUp(() async {
       await performance.setPerformanceCollectionEnabled(true);
+    });
 
+    test('setPerformanceCollectionEnabled', () async {
       final bool enabled = await performance.isPerformanceCollectionEnabled();
       expect(enabled, isTrue);
 
@@ -22,5 +24,18 @@ void main() {
       final bool disabled = await performance.isPerformanceCollectionEnabled();
       expect(disabled, isFalse);
     });
+
+    test('metric', () async {
+      final Trace trace = performance.newTrace('test');
+      trace.putAttribute('testAttribute', 'foo');
+      trace.attributes['testAttribute2'] = 'bar';
+      await trace.start();
+      trace.incrementMetric('testMetric', 1);
+      await trace.stop();
+      expect(trace.getAttribute('testAttribute'), 'foo');
+      expect(trace.attributes['testAttribute'], 'foo');
+      expect(trace.getAttribute('testAttribute2'), null);
+      expect(trace.getAttribute('testMetric'), null);
+    });
   });
 }
diff --git a/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m b/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
index 94877384ca75..25073643815e 100644
--- a/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
+++ b/packages/firebase_performance/ios/Classes/FirebasePerformancePlugin.m
@@ -70,8 +70,8 @@ - (void)handleTraceStop:(FlutterMethodCall *)call result:(FlutterResult)result {
   NSNumber *handle = call.arguments[@"handle"];
   FIRTrace *trace = [_traces objectForKey:handle];
 
-  NSDictionary *counters = call.arguments[@"counters"];
-  [counters enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSNumber *value, BOOL *stop) {
+  NSDictionary *metrics = call.arguments[@"metrics"];
+  [metrics enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSNumber *value, BOOL *stop) {
     [trace setIntValue:[value longLongValue] forMetric:key];
   }];
 
diff --git a/packages/firebase_performance/lib/src/trace.dart b/packages/firebase_performance/lib/src/trace.dart
index 6ff6ab996ee9..96d173bef4aa 100644
--- a/packages/firebase_performance/lib/src/trace.dart
+++ b/packages/firebase_performance/lib/src/trace.dart
@@ -9,7 +9,7 @@ part of firebase_performance;
 /// A trace is a report of performance data associated with some of the
 /// code in your app. You can have multiple custom traces, and it is
 /// possible to have more than one custom trace running at a time. Each custom
-/// trace can have multiple counters and attributes added to help measure
+/// trace can have multiple metrics and attributes added to help measure
 /// performance related events. A trace also measures the time between calling
 /// start() and stop().
 ///
@@ -35,7 +35,7 @@ class Trace extends PerformanceAttributes {
   bool _hasStarted = false;
   bool _hasStopped = false;
 
-  final HashMap<String, int> _counters = HashMap<String, int>();
+  final HashMap<String, int> _metrics = HashMap<String, int>();
 
   /// Starts this trace.
   ///
@@ -71,7 +71,7 @@ class Trace extends PerformanceAttributes {
     final Map<String, dynamic> data = <String, dynamic>{
       'handle': _handle,
       'name': _name,
-      'counters': _counters,
+      'metrics': _metrics,
       'attributes': _attributes,
     };
 
@@ -92,15 +92,28 @@ class Trace extends PerformanceAttributes {
   /// The name of the counter requires no leading or
   /// trailing whitespace, no leading underscore _ character, and max length of
   /// 32 characters.
+  @Deprecated('Use `incrementMetric` instead.')
   void incrementCounter(String name, [int incrementBy = 1]) {
+    incrementMetric(name, incrementBy);
+  }
+
+  /// Increments the metric with the given [name] by [incrementBy].
+  ///
+  /// If a metric does not already exist, a new one will be created with the
+  /// initial value [incrementBy]. If the trace has not been started or has
+  /// already been stopped, an assertion error is thrown.
+  ///
+  /// The name of the metric requires no leading or trailing whitespace, no
+  /// leading underscore _ character, and max length of 32 characters.
+  void incrementMetric(String name, int incrementBy) {
     assert(!_hasStopped);
     assert(name != null);
     assert(!name.startsWith(RegExp(r'[_\s]')));
     assert(!name.contains(RegExp(r'[_\s]$')));
     assert(name.length <= 32);
 
-    _counters.putIfAbsent(name, () => 0);
-    _counters[name] += incrementBy;
+    _metrics.putIfAbsent(name, () => 0);
+    _metrics[name] += incrementBy;
   }
 
   /// Sets a String [value] for the specified [attribute].
diff --git a/packages/firebase_performance/pubspec.yaml b/packages/firebase_performance/pubspec.yaml
index 2a6c93db57ad..56ed140e2f34 100644
--- a/packages/firebase_performance/pubspec.yaml
+++ b/packages/firebase_performance/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Google Performance Monitoring for Firebase, an a
   iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_performance
-version: 0.1.0+4
+version: 0.1.1
 
 dependencies:
   flutter:
diff --git a/packages/firebase_performance/test/firebase_performance_test.dart b/packages/firebase_performance/test/firebase_performance_test.dart
index 937c695f6e7d..bf2b42e50499 100644
--- a/packages/firebase_performance/test/firebase_performance_test.dart
+++ b/packages/firebase_performance/test/firebase_performance_test.dart
@@ -170,7 +170,7 @@ void main() {
             arguments: <String, dynamic>{
               'handle': currentTraceHandle,
               'name': 'test',
-              'counters': <String, int>{},
+              'metrics': <String, int>{},
               'attributes': <String, String>{},
             },
           ),
@@ -179,14 +179,21 @@ void main() {
 
       test('incrementCounter', () async {
         final Trace trace = performance.newTrace('test');
+
+        // ignore: deprecated_member_use_from_same_package
         trace.incrementCounter('counter1');
 
+        // ignore: deprecated_member_use_from_same_package
         trace.incrementCounter('counter2');
+        // ignore: deprecated_member_use_from_same_package
         trace.incrementCounter('counter2');
 
+        // ignore: deprecated_member_use_from_same_package
         trace.incrementCounter('counter3', 5);
+        // ignore: deprecated_member_use_from_same_package
         trace.incrementCounter('counter3', 5);
 
+        // ignore: deprecated_member_use_from_same_package
         trace.incrementCounter('counter4', -5);
 
         await trace.start();
@@ -205,7 +212,7 @@ void main() {
             arguments: <String, dynamic>{
               'handle': currentTraceHandle,
               'name': 'test',
-              'counters': <String, int>{
+              'metrics': <String, int>{
                 'counter1': 1,
                 'counter2': 2,
                 'counter3': 10,
@@ -216,6 +223,46 @@ void main() {
           ),
         ]);
       });
+
+      test('incrementMetric', () async {
+        final Trace trace = performance.newTrace('test');
+        trace.incrementMetric('metric1', 1);
+
+        trace.incrementMetric('metric2', 1);
+        trace.incrementMetric('metric2', 1);
+
+        trace.incrementMetric('metric3', 5);
+        trace.incrementMetric('metric3', 5);
+
+        trace.incrementMetric('metric4', -5);
+
+        await trace.start();
+        await trace.stop();
+
+        expect(log, <Matcher>[
+          isMethodCall(
+            'Trace#start',
+            arguments: <String, Object>{
+              'handle': currentTraceHandle,
+              'name': 'test',
+            },
+          ),
+          isMethodCall(
+            'Trace#stop',
+            arguments: <String, dynamic>{
+              'handle': currentTraceHandle,
+              'name': 'test',
+              'metrics': <String, int>{
+                'metric1': 1,
+                'metric2': 2,
+                'metric3': 10,
+                'metric4': -5,
+              },
+              'attributes': <String, String>{},
+            },
+          ),
+        ]);
+      });
     });
 
     group('$HttpMetric', () {

From c824ece37f3d70e96274b61cc948c2e61005ccd8 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Mon, 22 Apr 2019 09:57:42 -0700
Subject: [PATCH 353/410] [webview_flutter] controller headers loadurl (#1516)

* Modify loadUrl to allow headers

* Add test for headers

* pubspec and changelog

* fix analyze errors

* Add a test for webview headers

* analyze errors

* Add print to debug tests

* fix test
---
 packages/webview_flutter/CHANGELOG.md         |  4 ++
 .../webviewflutter/FlutterWebView.java        | 11 +++++-
 .../example/test_driver/webview.dart          | 33 +++++++++++++++++
 .../ios/Classes/FlutterWebView.m              | 37 +++++++++++++++----
 .../webview_flutter/lib/webview_flutter.dart  | 10 ++++-
 packages/webview_flutter/pubspec.yaml         |  2 +-
 .../test/webview_flutter_test.dart            | 23 +++++++++++-
 7 files changed, 106 insertions(+), 14 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 8985c7b4fc88..50487816119a 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.6
+
+* Add an optional `headers` field to the controller.
+
 ## 0.3.5+5
 
 * Fixed error in documentation of `javascriptChannels`.
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index 21720cf6b4a2..06cbb398ec4b 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -18,6 +18,7 @@
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
 import io.flutter.plugin.platform.PlatformView;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -100,9 +101,15 @@ public void onMethodCall(MethodCall methodCall, Result result) {
     }
   }
 
+  @SuppressWarnings("unchecked")
   private void loadUrl(MethodCall methodCall, Result result) {
-    String url = (String) methodCall.arguments;
-    webView.loadUrl(url);
+    Map<String, Object> request = (Map<String, Object>) methodCall.arguments;
+    String url = (String) request.get("url");
+    Map<String, String> headers = (Map<String, String>) request.get("headers");
+    if (headers == null) {
+      headers = Collections.emptyMap();
+    }
+    webView.loadUrl(url, headers);
     result.success(null);
   }
 
diff --git a/packages/webview_flutter/example/test_driver/webview.dart b/packages/webview_flutter/example/test_driver/webview.dart
index 03de96703669..8b568788c750 100644
--- a/packages/webview_flutter/example/test_driver/webview.dart
+++ b/packages/webview_flutter/example/test_driver/webview.dart
@@ -54,6 +54,39 @@ void main() {
     final String currentUrl = await controller.currentUrl();
     expect(currentUrl, 'https://www.google.com/');
   });
+
+  test('loadUrl with headers', () async {
+    final Completer<WebViewController> controllerCompleter =
+        Completer<WebViewController>();
+    await pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: WebView(
+          key: GlobalKey(),
+          initialUrl: 'https://flutter.dev/',
+          onWebViewCreated: (WebViewController controller) {
+            controllerCompleter.complete(controller);
+          },
+          javascriptMode: JavascriptMode.unrestricted,
+        ),
+      ),
+    );
+    final WebViewController controller = await controllerCompleter.future;
+    final Map<String, String> headers = <String, String>{
+      'test_header': 'flutter_test_header'
+    };
+    await controller.loadUrl('https://flutter-header-echo.herokuapp.com/',
+        headers: headers);
+    final String currentUrl = await controller.currentUrl();
+    expect(currentUrl, 'https://flutter-header-echo.herokuapp.com/');
+
+    // wait for the web page to load.
+    await Future<dynamic>.delayed(const Duration(seconds: 5));
+
+    final String content = await controller
+        .evaluateJavascript('document.documentElement.innerText');
+    expect(content.contains('flutter_test_header'), isTrue);
+  });
 }
 
 Future<void> pumpWidget(Widget widget) {
diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m
index ea3b192f47ff..afc2f9921d05 100644
--- a/packages/webview_flutter/ios/Classes/FlutterWebView.m
+++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m
@@ -123,11 +123,11 @@ - (void)onUpdateSettings:(FlutterMethodCall*)call result:(FlutterResult)result {
 }
 
 - (void)onLoadUrl:(FlutterMethodCall*)call result:(FlutterResult)result {
-  NSString* url = [call arguments];
-  if (![self loadUrl:url]) {
-    result([FlutterError errorWithCode:@"loadUrl_failed"
-                               message:@"Failed parsing the URL"
-                               details:[NSString stringWithFormat:@"URL was: '%@'", url]]);
+  if (![self loadRequest:[call arguments]]) {
+    result([FlutterError
+        errorWithCode:@"loadUrl_failed"
+              message:@"Failed parsing the URL"
+              details:[NSString stringWithFormat:@"Request was: '%@'", [call arguments]]]);
   } else {
     result(nil);
   }
@@ -256,13 +256,36 @@ - (void)updateJsMode:(NSNumber*)mode {
   }
 }
 
+- (bool)loadRequest:(NSDictionary<NSString*, id>*)request {
+  if (!request) {
+    return false;
+  }
+
+  NSString* url = request[@"url"];
+  if ([url isKindOfClass:[NSString class]]) {
+    id headers = request[@"headers"];
+    if ([headers isKindOfClass:[NSDictionary class]]) {
+      return [self loadUrl:url withHeaders:headers];
+    } else {
+      return [self loadUrl:url];
+    }
+  }
+
+  return false;
+}
+
 - (bool)loadUrl:(NSString*)url {
+  return [self loadUrl:url withHeaders:[NSMutableDictionary dictionary]];
+}
+
+- (bool)loadUrl:(NSString*)url withHeaders:(NSDictionary<NSString*, NSString*>*)headers {
   NSURL* nsUrl = [NSURL URLWithString:url];
   if (!nsUrl) {
     return false;
   }
-  NSURLRequest* req = [NSURLRequest requestWithURL:nsUrl];
-  [_webView loadRequest:req];
+  NSMutableURLRequest* request = [NSMutableURLRequest requestWithURL:nsUrl];
+  [request setAllHTTPHeaderFields:headers];
+  [_webView loadRequest:request];
   return true;
 }
 
diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart
index 49063a27a066..2f5bffc6704e 100644
--- a/packages/webview_flutter/lib/webview_flutter.dart
+++ b/packages/webview_flutter/lib/webview_flutter.dart
@@ -414,13 +414,19 @@ class WebViewController {
   /// `url` must not be null.
   ///
   /// Throws an ArgumentError if `url` is not a valid URL string.
-  Future<void> loadUrl(String url) async {
+  Future<void> loadUrl(
+    String url, {
+    Map<String, String> headers,
+  }) async {
     assert(url != null);
     _validateUrlString(url);
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
     // https://github.com/flutter/flutter/issues/26431
     // ignore: strong_mode_implicit_dynamic_method
-    return _channel.invokeMethod('loadUrl', url);
+    return _channel.invokeMethod('loadUrl', <String, dynamic>{
+      'url': url,
+      'headers': headers,
+    });
   }
 
   /// Accessor to the current URL that the WebView is displaying.
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 943f62470521..183a11dcb7eb 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.5+5
+version: 0.3.6
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 
diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart
index d66f56d212f5..67a5547851c9 100644
--- a/packages/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/test/webview_flutter_test.dart
@@ -106,6 +106,25 @@ void main() {
     expect(await controller.currentUrl(), isNull);
   });
 
+  testWidgets('Headers in loadUrl', (WidgetTester tester) async {
+    WebViewController controller;
+    await tester.pumpWidget(
+      WebView(
+        onWebViewCreated: (WebViewController webViewController) {
+          controller = webViewController;
+        },
+      ),
+    );
+
+    expect(controller, isNotNull);
+
+    final Map<String, String> headers = <String, String>{
+      'CACHE-CONTROL': 'ABC'
+    };
+    await controller.loadUrl('https://flutter.io', headers: headers);
+    expect(await controller.currentUrl(), equals('https://flutter.io'));
+  });
+
   testWidgets("Can't go back before loading a page",
       (WidgetTester tester) async {
     WebViewController controller;
@@ -722,8 +741,8 @@ class FakePlatformWebView {
   Future<dynamic> onMethodCall(MethodCall call) {
     switch (call.method) {
       case 'loadUrl':
-        final String url = call.arguments;
-        _loadUrl(url);
+        final Map<dynamic, dynamic> request = call.arguments;
+        _loadUrl(request['url']);
         return Future<void>.sync(() {});
       case 'updateSettings':
         if (call.arguments['jsMode'] != null) {

From 01dd10832ca5a33acb903d59a5d3da34f6f0cf53 Mon Sep 17 00:00:00 2001
From: Matt Carroll <matthew-carroll@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:04:47 -0400
Subject: [PATCH 354/410] [android_alarm_manager] Added comments and refactored
 android_alarm_manager plugin for clarity. (#1493)

---
 .../AlarmBroadcastReceiver.java               |  15 ++
 .../androidalarmmanager/AlarmService.java     | 249 +++++++++++-------
 .../AndroidAlarmManagerPlugin.java            | 225 ++++++++++++----
 .../RebootBroadcastReceiver.java              |  25 ++
 4 files changed, 366 insertions(+), 148 deletions(-)

diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmBroadcastReceiver.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmBroadcastReceiver.java
index 4916e5340dfc..a8968a2095d9 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmBroadcastReceiver.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmBroadcastReceiver.java
@@ -9,6 +9,21 @@
 import android.content.Intent;
 
 public class AlarmBroadcastReceiver extends BroadcastReceiver {
+  /**
+   * Invoked by the OS when a timer goes off.
+   *
+   * <p>The associated timer was registered in {@link AlarmService}.
+   *
+   * <p>In Android, timer notifications require a {@link BroadcastReceiver} as the artifact that is
+   * notified when the timer goes off. As a result, this method is kept simple, immediately
+   * offloading any work to {@link AlarmService#enqueueAlarmProcessing(Context, Intent)}.
+   *
+   * <p>This method is the beginning of an execution path that will eventually execute a desired
+   * Dart callback function, as registed by the Dart side of the android_alarm_manager plugin.
+   * However, there may be asynchronous gaps between {@code onReceive()} and the eventual invocation
+   * of the Dart callback because {@link AlarmService} may need to spin up a Flutter execution
+   * context before the callback can be invoked.
+   */
   @Override
   public void onReceive(Context context, Intent intent) {
     AlarmService.enqueueAlarmProcessing(context, intent);
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
index 19507c9ddf9e..6c13f79038c9 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
@@ -29,70 +29,65 @@
 import org.json.JSONObject;
 
 public class AlarmService extends JobIntentService {
+  // TODO(mattcarroll): tags should be private. Make private if no public usage.
   public static final String TAG = "AlarmService";
   private static final String CALLBACK_HANDLE_KEY = "callback_handle";
   private static final String PERSISTENT_ALARMS_SET_KEY = "persistent_alarm_ids";
   private static final String SHARED_PREFERENCES_KEY = "io.flutter.android_alarm_manager_plugin";
   private static final int JOB_ID = 1984; // Random job ID.
   private static final Object sPersistentAlarmsLock = new Object();
-  private static AtomicBoolean sStarted = new AtomicBoolean(false);
+
+  // TODO(mattcarroll): make sIsIsolateRunning per-instance, not static.
+  private static AtomicBoolean sIsIsolateRunning = new AtomicBoolean(false);
+
+  // TODO(mattcarroll): make sAlarmQueue per-instance, not static.
   private static List<Intent> sAlarmQueue = Collections.synchronizedList(new LinkedList<Intent>());
+
+  /** Background Dart execution context. */
   private static FlutterNativeView sBackgroundFlutterView;
-  private static MethodChannel sBackgroundChannel;
-  private static PluginRegistrantCallback sPluginRegistrantCallback;
 
-  private String mAppBundlePath;
+  /**
+   * The {@link MethodChannel} that connects the Android side of this plugin with the background
+   * Dart isolate that was created by this plugin.
+   */
+  private static MethodChannel sBackgroundChannel;
 
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    Context context = getApplicationContext();
-    FlutterMain.ensureInitializationComplete(context, null);
-    mAppBundlePath = FlutterMain.findAppBundlePath(context);
-    if (!sStarted.get()) {
-      SharedPreferences p = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
-      long callbackHandle = p.getLong(CALLBACK_HANDLE_KEY, 0);
-      startAlarmService(context, callbackHandle);
-    }
-  }
+  private static PluginRegistrantCallback sPluginRegistrantCallback;
 
   // Schedule the alarm to be handled by the AlarmService.
   public static void enqueueAlarmProcessing(Context context, Intent alarmContext) {
     enqueueWork(context, AlarmService.class, JOB_ID, alarmContext);
   }
 
-  // Called once the Dart isolate (sBackgroundFlutterView) has finished
-  // initializing. Processes all alarm events that came in while the isolate
-  // was starting.
-  public static void onInitialized() {
-    Log.i(TAG, "AlarmService started!");
-    sStarted.set(true);
-    synchronized (sAlarmQueue) {
-      // Handle all the alarm events received before the Dart isolate was fully
-      // initialized and clear the queue.
-      Iterator<Intent> i = sAlarmQueue.iterator();
-      while (i.hasNext()) {
-        invokeCallbackDispatcher(i.next());
-      }
-      sAlarmQueue.clear();
-    }
-  }
-
-  // Here we start the AlarmService. This method does a few things:
-  //   - Retrieves the callback information for the handle associated with the
-  //     callback dispatcher in the Dart portion of the plugin.
-  //   - Builds the arguments object for running in a new FlutterNativeView.
-  //   - Enters the isolate owned by the FlutterNativeView at the callback
-  //     represented by `callbackHandle` and initializes the callback
-  //     dispatcher.
-  //   - Registers the FlutterNativeView's PluginRegistry to receive
-  //     MethodChannel messages.
-  public static void startAlarmService(Context context, long callbackHandle) {
+  /**
+   * Starts running a background Dart isolate within a new {@link FlutterNativeView}.
+   *
+   * <p>The isolate is configured as follows:
+   *
+   * <ul>
+   *   <li>Bundle Path: {@code FlutterMain.findAppBundlePath(context)}.
+   *   <li>Entrypoint: The Dart method represented by {@code callbackHandle}.
+   *   <li>Run args: none.
+   * </ul>
+   *
+   * <p>Preconditions:
+   *
+   * <ul>
+   *   <li>The given {@code callbackHandle} must correspond to a registered Dart callback. If the
+   *       handle does not resolve to a Dart callback then this method does nothing.
+   *   <li>A static {@link #sPluginRegistrantCallback} must exist, otherwise a {@link
+   *       PluginRegistrantException} will be thrown.
+   * </ul>
+   */
+  public static void startBackgroundIsolate(Context context, long callbackHandle) {
+    // TODO(mattcarroll): re-arrange order of operations. The order is strange - there are 3
+    // conditions that must be met for this method to do anything but they're split up for no
+    // apparent reason. Do the qualification checks first, then execute the method's logic.
     FlutterMain.ensureInitializationComplete(context, null);
     String mAppBundlePath = FlutterMain.findAppBundlePath(context);
-    FlutterCallbackInformation cb =
+    FlutterCallbackInformation flutterCallback =
         FlutterCallbackInformation.lookupCallbackInformation(callbackHandle);
-    if (cb == null) {
+    if (flutterCallback == null) {
       Log.e(TAG, "Fatal: failed to find callback");
       return;
     }
@@ -101,27 +96,57 @@ public static void startAlarmService(Context context, long callbackHandle) {
     // FlutterNativeView constructor. This specifies the FlutterNativeView
     // as a background view and does not create a drawing surface.
     sBackgroundFlutterView = new FlutterNativeView(context, true);
-    if (mAppBundlePath != null && !sStarted.get()) {
+    if (mAppBundlePath != null && !sIsIsolateRunning.get()) {
       if (sPluginRegistrantCallback == null) {
         throw new PluginRegistrantException();
       }
       Log.i(TAG, "Starting AlarmService...");
       FlutterRunArguments args = new FlutterRunArguments();
       args.bundlePath = mAppBundlePath;
-      args.entrypoint = cb.callbackName;
-      args.libraryPath = cb.callbackLibraryPath;
+      args.entrypoint = flutterCallback.callbackName;
+      args.libraryPath = flutterCallback.callbackLibraryPath;
       sBackgroundFlutterView.runFromBundle(args);
       sPluginRegistrantCallback.registerWith(sBackgroundFlutterView.getPluginRegistry());
     }
   }
 
+  /**
+   * Called once the Dart isolate ({@code sBackgroundFlutterView}) has finished initializing.
+   *
+   * <p>Invoked by {@link AndroidAlarmManagerPlugin} when it receives the {@code
+   * AlarmService.initialized} message. Processes all alarm events that came in while the isolate
+   * was starting.
+   */
+  // TODO(mattcarroll): consider making this method package private
+  public static void onInitialized() {
+    Log.i(TAG, "AlarmService started!");
+    sIsIsolateRunning.set(true);
+    synchronized (sAlarmQueue) {
+      // Handle all the alarm events received before the Dart isolate was
+      // initialized, then clear the queue.
+      Iterator<Intent> i = sAlarmQueue.iterator();
+      while (i.hasNext()) {
+        executeDartCallbackInBackgroundIsolate(i.next());
+      }
+      sAlarmQueue.clear();
+    }
+  }
+
+  /**
+   * Sets the {@link MethodChannel} that is used to communicate with Dart callbacks that are invoked
+   * in the background by the android_alarm_manager plugin.
+   */
   public static void setBackgroundChannel(MethodChannel channel) {
     sBackgroundChannel = channel;
   }
 
+  /**
+   * Sets the Dart callback handle for the Dart method that is responsible for initializing the
+   * background Dart isolate, preparing it to receive Dart callback tasks requests.
+   */
   public static void setCallbackDispatcher(Context context, long callbackHandle) {
-    SharedPreferences p = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
-    p.edit().putLong(CALLBACK_HANDLE_KEY, callbackHandle).apply();
+    SharedPreferences prefs = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
+    prefs.edit().putLong(CALLBACK_HANDLE_KEY, callbackHandle).apply();
   }
 
   public static boolean setBackgroundFlutterView(FlutterNativeView view) {
@@ -137,23 +162,13 @@ public static void setPluginRegistrant(PluginRegistrantCallback callback) {
     sPluginRegistrantCallback = callback;
   }
 
-  @Override
-  protected void onHandleWork(Intent intent) {
-    // If we're in the middle of processing queued alarms, block until they're
-    // done before processing new alarms.
-    synchronized (sAlarmQueue) {
-      if (!sStarted.get()) {
-        Log.i(TAG, "AlarmService has not yet started.");
-        sAlarmQueue.add(intent);
-        return;
-      }
-    }
-    invokeCallbackDispatcher(intent);
-  }
-
-  // This is where we handle alarm events before sending them to our callback
-  // dispatcher in Dart.
-  private static void invokeCallbackDispatcher(Intent intent) {
+  /**
+   * Executes the desired Dart callback in a background Dart isolate.
+   *
+   * <p>The given {@code intent} should contain a {@code long} extra called "callbackHandle", which
+   * corresponds to a callback registered with the Dart VM.
+   */
+  private static void executeDartCallbackInBackgroundIsolate(Intent intent) {
     // Grab the handle for the callback associated with this alarm. Pay close
     // attention to the type of the callback handle as storing this value in a
     // variable of the wrong size will cause the callback lookup to fail.
@@ -167,6 +182,8 @@ private static void invokeCallbackDispatcher(Intent intent) {
     // Handle the alarm event in Dart. Note that for this plugin, we don't
     // care about the method name as we simply lookup and invoke the callback
     // provided.
+    // TODO(mattcarroll): consider giving a method name anyway for the purpose of developer discoverability
+    //                    when reading the source code. Especially on the Dart side.
     sBackgroundChannel.invokeMethod("", new Object[] {callbackHandle});
   }
 
@@ -221,47 +238,33 @@ private static void scheduleAlarm(
     }
   }
 
-  public static void setOneShot(
-      Context context,
-      int requestCode,
-      boolean exact,
-      boolean wakeup,
-      long startMillis,
-      boolean rescheduleOnReboot,
-      long callbackHandle) {
+  public static void setOneShot(Context context, AndroidAlarmManagerPlugin.OneShotRequest request) {
     final boolean repeating = false;
     scheduleAlarm(
         context,
-        requestCode,
+        request.requestCode,
         repeating,
-        exact,
-        wakeup,
-        startMillis,
+        request.exact,
+        request.wakeup,
+        request.startMillis,
         0,
-        rescheduleOnReboot,
-        callbackHandle);
+        request.rescheduleOnReboot,
+        request.callbackHandle);
   }
 
   public static void setPeriodic(
-      Context context,
-      int requestCode,
-      boolean exact,
-      boolean wakeup,
-      long startMillis,
-      long intervalMillis,
-      boolean rescheduleOnReboot,
-      long callbackHandle) {
+      Context context, AndroidAlarmManagerPlugin.PeriodicRequest request) {
     final boolean repeating = true;
     scheduleAlarm(
         context,
-        requestCode,
+        request.requestCode,
         repeating,
-        exact,
-        wakeup,
-        startMillis,
-        intervalMillis,
-        rescheduleOnReboot,
-        callbackHandle);
+        request.exact,
+        request.wakeup,
+        request.startMillis,
+        request.intervalMillis,
+        request.rescheduleOnReboot,
+        request.callbackHandle);
   }
 
   public static void cancel(Context context, int requestCode) {
@@ -302,10 +305,10 @@ private static void addPersistentAlarm(
     alarmSettings.put("callbackHandle", callbackHandle);
     JSONObject obj = new JSONObject(alarmSettings);
     String key = getPersistentAlarmKey(requestCode);
-    SharedPreferences p = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
+    SharedPreferences prefs = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
 
     synchronized (sPersistentAlarmsLock) {
-      Set<String> persistentAlarms = p.getStringSet(PERSISTENT_ALARMS_SET_KEY, null);
+      Set<String> persistentAlarms = prefs.getStringSet(PERSISTENT_ALARMS_SET_KEY, null);
       if (persistentAlarms == null) {
         persistentAlarms = new HashSet<>();
       }
@@ -313,7 +316,8 @@ private static void addPersistentAlarm(
         RebootBroadcastReceiver.enableRescheduleOnReboot(context);
       }
       persistentAlarms.add(Integer.toString(requestCode));
-      p.edit()
+      prefs
+          .edit()
           .putString(key, obj.toString())
           .putStringSet(PERSISTENT_ALARMS_SET_KEY, persistentAlarms)
           .commit();
@@ -385,4 +389,51 @@ public static void reschedulePersistentAlarms(Context context) {
       }
     }
   }
+
+  private String mAppBundlePath;
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+
+    Context context = getApplicationContext();
+    FlutterMain.ensureInitializationComplete(context, null);
+    mAppBundlePath = FlutterMain.findAppBundlePath(context);
+
+    if (!sIsIsolateRunning.get()) {
+      SharedPreferences p = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
+      long callbackHandle = p.getLong(CALLBACK_HANDLE_KEY, 0);
+      startBackgroundIsolate(context, callbackHandle);
+    }
+  }
+
+  /**
+   * Executes a Dart callback, as specified within the incoming {@code intent}.
+   *
+   * <p>Invoked by our {@link JobIntentService} superclass after a call to {@link
+   * JobIntentService#enqueueWork(Context, Class, int, Intent);}.
+   *
+   * <p>If there are no pre-existing callback execution requests, other than the incoming {@code
+   * intent}, then the desired Dart callback is invoked immediately.
+   *
+   * <p>If there are any pre-existing callback requests that have yet to be executed, the incoming
+   * {@code intent} is added to the {@link #sAlarmQueue} to invoked later, after all pre-existing
+   * callbacks have been executed.
+   */
+  @Override
+  protected void onHandleWork(Intent intent) {
+    // If we're in the middle of processing queued alarms, add the incoming
+    // intent to the queue and return.
+    synchronized (sAlarmQueue) {
+      if (!sIsIsolateRunning.get()) {
+        Log.i(TAG, "AlarmService has not yet started.");
+        sAlarmQueue.add(intent);
+        return;
+      }
+    }
+
+    // There were no pre-existing callback requests. Execute the callback
+    // specified by the incoming intent.
+    executeDartCallbackInBackgroundIsolate(intent);
+  }
 }
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
index 07825faab197..b81df8c050a9 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
@@ -16,25 +16,77 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 
-/** AndroidAlarmManagerPlugin */
+/**
+ * Flutter plugin for running one-shot and periodic tasks sometime in the future on Android.
+ *
+ * <p>Plugin initialization goes through these steps:
+ *
+ * <ol>
+ *   <li>Flutter app instructs this plugin to initialize() on the Dart side.
+ *   <li>The Dart side of this plugin sends the Android side a "AlarmService.start" message, along
+ *       with a Dart callback handle for a Dart callback that should be immediately invoked by a
+ *       background Dart isolate.
+ *   <li>The Android side of this plugin spins up a background {@link FlutterNativeView}, which
+ *       includes a background Dart isolate.
+ *   <li>The Android side of this plugin instructs the new background Dart isolate to execute the
+ *       callback that was received in the "AlarmService.start" message.
+ *   <li>The Dart side of this plugin, running within the new background isolate, executes the
+ *       designated callback. This callback prepares the background isolate to then execute any
+ *       given Dart callback from that point forward. Thus, at this moment the plugin is fully
+ *       initialized and ready to execute arbitrary Dart tasks in the background. The Dart side of
+ *       this plugin sends the Android side a "AlarmService.initialized" message to signify that the
+ *       Dart is ready to execute tasks.
+ * </ol>
+ */
 public class AndroidAlarmManagerPlugin implements MethodCallHandler, ViewDestroyListener {
-  /** Plugin registration. */
+  /**
+   * Registers this plugin with an associated Flutter execution context, represented by the given
+   * {@link Registrar}.
+   *
+   * <p>Once this method is executed, an instance of {@code AndroidAlarmManagerPlugin} will be
+   * connected to, and running against, the associated Flutter execution context.
+   */
   public static void registerWith(Registrar registrar) {
-    final MethodChannel channel =
+    // alarmManagerPluginChannel is the channel responsible for receiving the following messages
+    // from the main Flutter app:
+    // - "AlarmService.start"
+    // - "Alarm.oneShot"
+    // - "Alarm.periodic"
+    // - "Alarm.cancel"
+    final MethodChannel alarmManagerPluginChannel =
         new MethodChannel(
             registrar.messenger(),
             "plugins.flutter.io/android_alarm_manager",
             JSONMethodCodec.INSTANCE);
-    final MethodChannel backgroundChannel =
+
+    // backgroundCallbackChannel is the channel responsible for receiving the following messages
+    // from the background isolate that was setup by this plugin:
+    // - "AlarmService.initialized"
+    //
+    // This channel is also responsible for sending requests from Android to Dart to execute Dart
+    // callbacks in the background isolate. Those messages are sent with an empty method name because
+    // they are the only messages that this channel sends to Dart.
+    final MethodChannel backgroundCallbackChannel =
         new MethodChannel(
             registrar.messenger(),
             "plugins.flutter.io/android_alarm_manager_background",
             JSONMethodCodec.INSTANCE);
+
+    // Instantiate a new AndroidAlarmManagerPlugin, connect the primary and background
+    // method channels for Android/Flutter communication, and listen for FlutterView
+    // destruction so that this plugin can move itself to background mode.
     AndroidAlarmManagerPlugin plugin = new AndroidAlarmManagerPlugin(registrar.context());
-    channel.setMethodCallHandler(plugin);
-    backgroundChannel.setMethodCallHandler(plugin);
+    alarmManagerPluginChannel.setMethodCallHandler(plugin);
+    backgroundCallbackChannel.setMethodCallHandler(plugin);
     registrar.addViewDestroyListener(plugin);
-    AlarmService.setBackgroundChannel(backgroundChannel);
+
+    // The AlarmService expects to hold a static reference to the plugin's background
+    // method channel.
+    // TODO(mattcarroll): this static reference implies that only one instance of this plugin
+    //                    can exist at a time. Moreover, calling registerWith() a 2nd time would
+    //                    seem to overwrite the previously registered background channel without
+    //                    notice.
+    AlarmService.setBackgroundChannel(backgroundCallbackChannel);
   }
 
   private Context mContext;
@@ -43,25 +95,47 @@ private AndroidAlarmManagerPlugin(Context context) {
     this.mContext = context;
   }
 
+  /** Invoked when the Flutter side of this plugin sends a message to the Android side. */
   @Override
   public void onMethodCall(MethodCall call, Result result) {
     String method = call.method;
     Object arguments = call.arguments;
     try {
       if (method.equals("AlarmService.start")) {
-        startService((JSONArray) arguments);
+        // This message is sent when the Dart side of this plugin is told to initialize.
+        long callbackHandle = ((JSONArray) arguments).getLong(0);
+        // In response, this (native) side of the plugin needs to spin up a background
+        // Dart isolate by using the given callbackHandle, and then setup a background
+        // method channel to communicate with the new background isolate. Once completed,
+        // this onMethodCall() method will receive messages from both the primary and background
+        // method channels.
+        AlarmService.setCallbackDispatcher(mContext, callbackHandle);
+        AlarmService.startBackgroundIsolate(mContext, callbackHandle);
         result.success(true);
       } else if (method.equals("AlarmService.initialized")) {
+        // This message is sent by the background method channel as soon as the background isolate
+        // is running. From this point forward, the Android side of this plugin can send
+        // callback handles through the background method channel, and the Dart side will execute
+        // the Dart methods corresponding to those callback handles.
         AlarmService.onInitialized();
         result.success(true);
       } else if (method.equals("Alarm.periodic")) {
-        periodic((JSONArray) arguments);
+        // This message indicates that the Flutter app would like to schedule a periodic
+        // task.
+        PeriodicRequest periodicRequest = PeriodicRequest.fromJson((JSONArray) arguments);
+        AlarmService.setPeriodic(mContext, periodicRequest);
         result.success(true);
       } else if (method.equals("Alarm.oneShot")) {
-        oneShot((JSONArray) arguments);
+        // This message indicates that the Flutter app would like to schedule a one-time
+        // task.
+        OneShotRequest oneShotRequest = OneShotRequest.fromJson((JSONArray) arguments);
+        AlarmService.setOneShot(mContext, oneShotRequest);
         result.success(true);
       } else if (method.equals("Alarm.cancel")) {
-        cancel((JSONArray) arguments);
+        // This message indicates that the Flutter app would like to cancel a previously
+        // scheduled task.
+        int requestCode = ((JSONArray) arguments).getInt(0);
+        AlarmService.cancel(mContext, requestCode);
         result.success(true);
       } else {
         result.notImplemented();
@@ -73,49 +147,102 @@ public void onMethodCall(MethodCall call, Result result) {
     }
   }
 
-  private void startService(JSONArray arguments) throws JSONException {
-    long callbackHandle = arguments.getLong(0);
-    AlarmService.setCallbackDispatcher(mContext, callbackHandle);
-    AlarmService.startAlarmService(mContext, callbackHandle);
+  /**
+   * Transitions the Flutter execution context that owns this plugin from foreground execution to
+   * background execution.
+   *
+   * <p>Invoked when the {@link FlutterView} connected to the given {@link FlutterNativeView} is
+   * destroyed.
+   *
+   * <p>Returns true if the given {@code nativeView} was successfully stored by this plugin, or
+   * false if a different {@link FlutterNativeView} was already registered with this plugin.
+   */
+  @Override
+  public boolean onViewDestroy(FlutterNativeView nativeView) {
+    return AlarmService.setBackgroundFlutterView(nativeView);
   }
 
-  private void oneShot(JSONArray arguments) throws JSONException {
-    int requestCode = arguments.getInt(0);
-    boolean exact = arguments.getBoolean(1);
-    boolean wakeup = arguments.getBoolean(2);
-    long startMillis = arguments.getLong(3);
-    boolean rescheduleOnReboot = arguments.getBoolean(4);
-    long callbackHandle = arguments.getLong(5);
-    AlarmService.setOneShot(
-        mContext, requestCode, exact, wakeup, startMillis, rescheduleOnReboot, callbackHandle);
-  }
+  /** A request to schedule a one-shot Dart task. */
+  static final class OneShotRequest {
+    static OneShotRequest fromJson(JSONArray json) throws JSONException {
+      int requestCode = json.getInt(0);
+      boolean exact = json.getBoolean(1);
+      boolean wakeup = json.getBoolean(2);
+      long startMillis = json.getLong(3);
+      boolean rescheduleOnReboot = json.getBoolean(4);
+      long callbackHandle = json.getLong(5);
 
-  private void periodic(JSONArray arguments) throws JSONException {
-    int requestCode = arguments.getInt(0);
-    boolean exact = arguments.getBoolean(1);
-    boolean wakeup = arguments.getBoolean(2);
-    long startMillis = arguments.getLong(3);
-    long intervalMillis = arguments.getLong(4);
-    boolean rescheduleOnReboot = arguments.getBoolean(5);
-    long callbackHandle = arguments.getLong(6);
-    AlarmService.setPeriodic(
-        mContext,
-        requestCode,
-        exact,
-        wakeup,
-        startMillis,
-        intervalMillis,
-        rescheduleOnReboot,
-        callbackHandle);
-  }
+      return new OneShotRequest(
+          requestCode, exact, wakeup, startMillis, rescheduleOnReboot, callbackHandle);
+    }
+
+    final int requestCode;
+    final boolean exact;
+    final boolean wakeup;
+    final long startMillis;
+    final boolean rescheduleOnReboot;
+    final long callbackHandle;
 
-  private void cancel(JSONArray arguments) throws JSONException {
-    int requestCode = arguments.getInt(0);
-    AlarmService.cancel(mContext, requestCode);
+    OneShotRequest(
+        int requestCode,
+        boolean exact,
+        boolean wakeup,
+        long startMillis,
+        boolean rescheduleOnReboot,
+        long callbackHandle) {
+      this.requestCode = requestCode;
+      this.exact = exact;
+      this.wakeup = wakeup;
+      this.startMillis = startMillis;
+      this.rescheduleOnReboot = rescheduleOnReboot;
+      this.callbackHandle = callbackHandle;
+    }
   }
 
-  @Override
-  public boolean onViewDestroy(FlutterNativeView nativeView) {
-    return AlarmService.setBackgroundFlutterView(nativeView);
+  /** A request to schedule a periodic Dart task. */
+  static final class PeriodicRequest {
+    static PeriodicRequest fromJson(JSONArray json) throws JSONException {
+      int requestCode = json.getInt(0);
+      boolean exact = json.getBoolean(1);
+      boolean wakeup = json.getBoolean(2);
+      long startMillis = json.getLong(3);
+      long intervalMillis = json.getLong(4);
+      boolean rescheduleOnReboot = json.getBoolean(5);
+      long callbackHandle = json.getLong(6);
+
+      return new PeriodicRequest(
+          requestCode,
+          exact,
+          wakeup,
+          startMillis,
+          intervalMillis,
+          rescheduleOnReboot,
+          callbackHandle);
+    }
+
+    final int requestCode;
+    final boolean exact;
+    final boolean wakeup;
+    final long startMillis;
+    final long intervalMillis;
+    final boolean rescheduleOnReboot;
+    final long callbackHandle;
+
+    PeriodicRequest(
+        int requestCode,
+        boolean exact,
+        boolean wakeup,
+        long startMillis,
+        long intervalMillis,
+        boolean rescheduleOnReboot,
+        long callbackHandle) {
+      this.requestCode = requestCode;
+      this.exact = exact;
+      this.wakeup = wakeup;
+      this.startMillis = startMillis;
+      this.intervalMillis = intervalMillis;
+      this.rescheduleOnReboot = rescheduleOnReboot;
+      this.callbackHandle = callbackHandle;
+    }
   }
 }
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/RebootBroadcastReceiver.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/RebootBroadcastReceiver.java
index 91836ccbdaad..3dd7eae42e77 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/RebootBroadcastReceiver.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/RebootBroadcastReceiver.java
@@ -11,7 +11,25 @@
 import android.content.pm.PackageManager;
 import android.util.Log;
 
+/**
+ * Reschedules background work after the Android device reboots.
+ *
+ * <p>When an Android device reboots, all previously scheduled {@link AlarmManager} timers are
+ * cleared.
+ *
+ * <p>Timer callbacks registered with the android_alarm_manager plugin can be designated
+ * "persistent" and therefore, upon device reboot, should be rescheduled for execution. To
+ * accomplish this rescheduling, {@code RebootBroadcastReceiver} is scheduled by {@link
+ * AlarmService} to run on {@code BOOT_COMPLETED} and do the rescheduling.
+ */
 public class RebootBroadcastReceiver extends BroadcastReceiver {
+  /**
+   * Invoked by the OS whenever a broadcast is received by this app.
+   *
+   * <p>If the broadcast's action is {@code BOOT_COMPLETED} then this {@code
+   * RebootBroadcastReceiver} reschedules all persistent timer callbacks. That rescheduling work is
+   * handled by {@link AlarmService#reschedulePersistentAlarms(Context)}.
+   */
   @Override
   public void onReceive(Context context, Intent intent) {
     if (intent.getAction().equals("android.intent.action.BOOT_COMPLETED")) {
@@ -20,10 +38,17 @@ public void onReceive(Context context, Intent intent) {
     }
   }
 
+  /**
+   * Schedules this {@code RebootBroadcastReceiver} to be run whenever the Android device reboots.
+   */
   public static void enableRescheduleOnReboot(Context context) {
     scheduleOnReboot(context, PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
   }
 
+  /**
+   * Unschedules this {@code RebootBroadcastReceiver} to be run whenever the Android device reboots.
+   * This {@code RebootBroadcastReceiver} will no longer be run upon reboot.
+   */
   public static void disableRescheduleOnReboot(Context context) {
     scheduleOnReboot(context, PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
   }

From 210a5697125ddf010c404c11ded9c0a77e792c7c Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Mon, 22 Apr 2019 11:45:39 -0700
Subject: [PATCH 355/410] [webview_flutter] Remove un-used method params
 (#1528)

---
 packages/webview_flutter/CHANGELOG.md         |  4 ++++
 .../webviewflutter/FlutterWebView.java        | 24 +++++++++----------
 packages/webview_flutter/pubspec.yaml         |  2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 50487816119a..efa6c241891e 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.6+1
+
+* Remove un-used method params in webview\_flutter
+
 ## 0.3.6
 
 * Add an optional `headers` field to the controller.
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
index 06cbb398ec4b..a9f60ff1e6fa 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
@@ -67,22 +67,22 @@ public void onMethodCall(MethodCall methodCall, Result result) {
         updateSettings(methodCall, result);
         break;
       case "canGoBack":
-        canGoBack(methodCall, result);
+        canGoBack(result);
         break;
       case "canGoForward":
-        canGoForward(methodCall, result);
+        canGoForward(result);
         break;
       case "goBack":
-        goBack(methodCall, result);
+        goBack(result);
         break;
       case "goForward":
-        goForward(methodCall, result);
+        goForward(result);
         break;
       case "reload":
-        reload(methodCall, result);
+        reload(result);
         break;
       case "currentUrl":
-        currentUrl(methodCall, result);
+        currentUrl(result);
         break;
       case "evaluateJavascript":
         evaluateJavaScript(methodCall, result);
@@ -113,34 +113,34 @@ private void loadUrl(MethodCall methodCall, Result result) {
     result.success(null);
   }
 
-  private void canGoBack(MethodCall methodCall, Result result) {
+  private void canGoBack(Result result) {
     result.success(webView.canGoBack());
   }
 
-  private void canGoForward(MethodCall methodCall, Result result) {
+  private void canGoForward(Result result) {
     result.success(webView.canGoForward());
   }
 
-  private void goBack(MethodCall methodCall, Result result) {
+  private void goBack(Result result) {
     if (webView.canGoBack()) {
       webView.goBack();
     }
     result.success(null);
   }
 
-  private void goForward(MethodCall methodCall, Result result) {
+  private void goForward(Result result) {
     if (webView.canGoForward()) {
       webView.goForward();
     }
     result.success(null);
   }
 
-  private void reload(MethodCall methodCall, Result result) {
+  private void reload(Result result) {
     webView.reload();
     result.success(null);
   }
 
-  private void currentUrl(MethodCall methodCall, Result result) {
+  private void currentUrl(Result result) {
     result.success(webView.getUrl());
   }
 
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 183a11dcb7eb..944fd3bcc714 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.6
+version: 0.3.6+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From 43045155051a6f9a4fe2a0084aba047c4e3ab3cf Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 22 Apr 2019 14:35:46 -0700
Subject: [PATCH 356/410] Some additions to CODEOWNERS (#1527)

---
 CODEOWNERS | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 789ddbdb4ed4..30ca400adaf8 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -7,20 +7,25 @@
 packages/android_alarm_manager/* @bkonyi
 packages/camera/* @bparrishMines @mklim
 packages/cloud_firestore/* @collinjackson @kroikie
+packages/cloud_functions/* @collinjackson @kroikie
 packages/connectivity/* @cyanglaz
-packages/firebase_admob/* @amirh
+packages/firebase_admob/* @amirh @bparrishMines
 packages/firebase_analytics/* @collinjackson @kroikie
 packages/firebase_auth/* @collinjackson @kroikie
+packages/firebase_core/* @collinjackson @kroikie
+packages/firebase_crashlytics/* @kroikie @collinjackson
 packages/firebase_database/* @collinjackson @kroikie
 packages/firebase_dynamic_links/* @bparrishMines
 packages/firebase_messaging/* @collinjackson @kroikie
 packages/firebase_ml_vision/* @bparrishMines
-packages/firebase_performance/* @bparrishMines
+packages/firebase_performance/* @bparrishMines @collinjackson
+packages/firebase_remote_config/* @collinjackson @kroikie
 packages/firebase_storage/* @collinjackson @kroikie
 packages/google_maps_flutter/* @amirh @iskakaushik
 packages/google_sign_in/* @cyanglaz @mehmetf
 packages/image_picker/* @cyanglaz
 packages/in_app_purchase/* @mklim @cyanglaz
 packages/package_info/* @cyanglaz
+packages/shared_preferences/* @collinjackson
 packages/video_player/* @iskakaushik
-packages/webview_flutter/* @amirh
+packages/webview_flutter/* @amirh @iskakaushik

From d6bbf43294aeacc0d13ef696c5e1f4c0ca3d44ed Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Mon, 22 Apr 2019 20:49:28 -0700
Subject: [PATCH 357/410] [image_picker] fix "Cancel button not visible in
 gallery, if camera was accessed first" (#1372)

This is a workaround fix for flutter/flutter#21922
Not sure what the root cause is, possible a bug from the iOS API.
---
 packages/image_picker/CHANGELOG.md                    | 4 ++++
 packages/image_picker/ios/Classes/ImagePickerPlugin.m | 3 ++-
 packages/image_picker/pubspec.yaml                    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index de401b2c4179..9e910146590d 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.4+1
+
+* Bugfix iOS: Cancel button not visible in gallery, if camera was accessed first.
+
 ## 0.5.4
 
 * Add `retrieveLostData` to retrieve lost data after MainActivity is killed.
diff --git a/packages/image_picker/ios/Classes/ImagePickerPlugin.m b/packages/image_picker/ios/Classes/ImagePickerPlugin.m
index 946cb1be3b56..0ac64ceb54e9 100644
--- a/packages/image_picker/ios/Classes/ImagePickerPlugin.m
+++ b/packages/image_picker/ios/Classes/ImagePickerPlugin.m
@@ -37,7 +37,6 @@ - (instancetype)initWithViewController:(UIViewController *)viewController {
   self = [super init];
   if (self) {
     _viewController = viewController;
-    _imagePickerController = [[UIImagePickerController alloc] init];
   }
   return self;
 }
@@ -51,6 +50,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
   }
 
   if ([@"pickImage" isEqualToString:call.method]) {
+    _imagePickerController = [[UIImagePickerController alloc] init];
     _imagePickerController.modalPresentationStyle = UIModalPresentationCurrentContext;
     _imagePickerController.delegate = self;
     _imagePickerController.mediaTypes = @[ (NSString *)kUTTypeImage ];
@@ -74,6 +74,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
         break;
     }
   } else if ([@"pickVideo" isEqualToString:call.method]) {
+    _imagePickerController = [[UIImagePickerController alloc] init];
     _imagePickerController.modalPresentationStyle = UIModalPresentationCurrentContext;
     _imagePickerController.delegate = self;
     _imagePickerController.mediaTypes = @[
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index d011baf3f88f..659e49266b9c 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.4
+version: 0.5.4+1
 
 flutter:
   plugin:

From c722bfc365a3caf82b12d2dab66e2e6dfdeaf6b9 Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Tue, 23 Apr 2019 11:27:43 -0700
Subject: [PATCH 358/410] [image_picker] Android: request camera permission if
 need (#1519)

Android Camera permission need to be requested if it present in manifest with Android M or greater. Even the camera permission is not used.
Camera permission may be used  and specified in the manifest.xml in another package, for example flutter_barcode_reader.
flutter/flutter#29837
flutter/flutter#29662
flutter/flutter#29422
flutter/flutter#29003
---
 packages/image_picker/CHANGELOG.md            |  4 +
 .../imagepicker/ImagePickerDelegate.java      | 40 ++++++++
 .../plugins/imagepicker/ImagePickerUtils.java | 43 ++++++++
 .../imagepicker/ImagePickerDelegateTest.java  | 99 +++++++++++++++++++
 4 files changed, 186 insertions(+)
 create mode 100644 packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 9e910146590d..ff6bffdef335 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.4+2
+
+* Request Camera permission if it present in Manifest on Android >= M.
+
 ## 0.5.4+1
 
 * Bugfix iOS: Cancel button not visible in gallery, if camera was accessed first.
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
index 6ddee11897ed..35c303fd5b99 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
@@ -69,9 +69,11 @@ public class ImagePickerDelegate
   @VisibleForTesting static final int REQUEST_CODE_CHOOSE_IMAGE_FROM_GALLERY = 2342;
   @VisibleForTesting static final int REQUEST_CODE_TAKE_IMAGE_WITH_CAMERA = 2343;
   @VisibleForTesting static final int REQUEST_EXTERNAL_IMAGE_STORAGE_PERMISSION = 2344;
+  @VisibleForTesting static final int REQUEST_CAMERA_IMAGE_PERMISSION = 2345;
   @VisibleForTesting static final int REQUEST_CODE_CHOOSE_VIDEO_FROM_GALLERY = 2352;
   @VisibleForTesting static final int REQUEST_CODE_TAKE_VIDEO_WITH_CAMERA = 2353;
   @VisibleForTesting static final int REQUEST_EXTERNAL_VIDEO_STORAGE_PERMISSION = 2354;
+  @VisibleForTesting static final int REQUEST_CAMERA_VIDEO_PERMISSION = 2355;
 
   @VisibleForTesting final String fileProviderName;
 
@@ -87,6 +89,8 @@ interface PermissionManager {
     boolean isPermissionGranted(String permissionName);
 
     void askForPermission(String permissionName, int requestCode);
+
+    boolean needRequestCameraPermission();
   }
 
   interface IntentResolver {
@@ -126,6 +130,11 @@ public boolean isPermissionGranted(String permissionName) {
           public void askForPermission(String permissionName, int requestCode) {
             ActivityCompat.requestPermissions(activity, new String[] {permissionName}, requestCode);
           }
+
+          @Override
+          public boolean needRequestCameraPermission() {
+            return ImagePickerUtils.needRequestCameraPermission(activity);
+          }
         },
         new IntentResolver() {
           @Override
@@ -240,6 +249,13 @@ public void takeVideoWithCamera(MethodCall methodCall, MethodChannel.Result resu
       return;
     }
 
+    if (needRequestCameraPermission()
+        && !permissionManager.isPermissionGranted(Manifest.permission.CAMERA)) {
+      permissionManager.askForPermission(
+          Manifest.permission.CAMERA, REQUEST_CAMERA_VIDEO_PERMISSION);
+      return;
+    }
+
     launchTakeVideoWithCameraIntent();
   }
 
@@ -290,9 +306,23 @@ public void takeImageWithCamera(MethodCall methodCall, MethodChannel.Result resu
       return;
     }
 
+    if (needRequestCameraPermission()
+        && !permissionManager.isPermissionGranted(Manifest.permission.CAMERA)) {
+      permissionManager.askForPermission(
+          Manifest.permission.CAMERA, REQUEST_CAMERA_IMAGE_PERMISSION);
+      return;
+    }
+
     launchTakeImageWithCameraIntent();
   }
 
+  private boolean needRequestCameraPermission() {
+    if (permissionManager == null) {
+      return false;
+    }
+    return permissionManager.needRequestCameraPermission();
+  }
+
   private void launchTakeImageWithCameraIntent() {
     Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
     boolean canTakePhotos = intentResolver.resolveActivity(intent);
@@ -363,6 +393,16 @@ public boolean onRequestPermissionsResult(
           launchPickVideoFromGalleryIntent();
         }
         break;
+      case REQUEST_CAMERA_IMAGE_PERMISSION:
+        if (permissionGranted) {
+          launchTakeImageWithCameraIntent();
+        }
+        break;
+      case REQUEST_CAMERA_VIDEO_PERMISSION:
+        if (permissionGranted) {
+          launchTakeVideoWithCameraIntent();
+        }
+        break;
       default:
         return false;
     }
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java
new file mode 100644
index 000000000000..da23615dc660
--- /dev/null
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java
@@ -0,0 +1,43 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.imagepicker;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import java.util.Arrays;
+
+final class ImagePickerUtils {
+  /** returns true, if permission present in manifest, otherwise false */
+  private static boolean isPermissionPresentInManifest(Context context, String permissionName) {
+    try {
+      PackageManager packageManager = context.getPackageManager();
+      PackageInfo packageInfo =
+          packageManager.getPackageInfo(context.getPackageName(), PackageManager.GET_PERMISSIONS);
+
+      String[] requestedPermissions = packageInfo.requestedPermissions;
+      return Arrays.asList(requestedPermissions).contains(permissionName);
+    } catch (PackageManager.NameNotFoundException e) {
+      e.printStackTrace();
+      return false;
+    }
+  }
+
+  /**
+   * Camera permission need request if it present in manifest, because for M or great for take Photo
+   * ar Video by intent need it permission, even if the camera permission is not used.
+   *
+   * <p>Camera permission may be used in another package, as example flutter_barcode_reader.
+   * https://github.com/flutter/flutter/issues/29837
+   *
+   * @return returns true, if need request camera permission, otherwise false
+   */
+  static boolean needRequestCameraPermission(Context context) {
+    boolean greatOrEqualM = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
+    return greatOrEqualM && isPermissionPresentInManifest(context, Manifest.permission.CAMERA);
+  }
+}
diff --git a/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java b/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
index 6a80841e5b78..3ca2a3765ece 100644
--- a/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
+++ b/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
@@ -128,6 +128,60 @@ public void takeImageWithCamera_WhenPendingResultExists_FinishesWithAlreadyActiv
     verifyNoMoreInteractions(mockResult);
   }
 
+  @Test
+  public void takeImageWithCamera_WhenHasNoCameraPermission_RequestsForPermission() {
+    when(mockPermissionManager.isPermissionGranted(Manifest.permission.CAMERA)).thenReturn(false);
+    when(mockPermissionManager.needRequestCameraPermission()).thenReturn(true);
+
+    ImagePickerDelegate delegate = createDelegate();
+    delegate.takeImageWithCamera(mockMethodCall, mockResult);
+
+    verify(mockPermissionManager)
+        .askForPermission(
+            Manifest.permission.CAMERA, ImagePickerDelegate.REQUEST_CAMERA_IMAGE_PERMISSION);
+  }
+
+  @Test
+  public void takeImageWithCamera_WhenCameraPermissionNotPresent_RequestsForPermission() {
+    when(mockPermissionManager.needRequestCameraPermission()).thenReturn(false);
+    when(mockIntentResolver.resolveActivity(any(Intent.class))).thenReturn(true);
+
+    ImagePickerDelegate delegate = createDelegate();
+    delegate.takeImageWithCamera(mockMethodCall, mockResult);
+
+    verify(mockActivity)
+        .startActivityForResult(
+            any(Intent.class), eq(ImagePickerDelegate.REQUEST_CODE_TAKE_IMAGE_WITH_CAMERA));
+  }
+
+  @Test
+  public void
+      takeImageWithCamera_WhenHasCameraPermission_AndAnActivityCanHandleCameraIntent_LaunchesTakeWithCameraIntent() {
+    when(mockPermissionManager.isPermissionGranted(Manifest.permission.CAMERA)).thenReturn(true);
+    when(mockIntentResolver.resolveActivity(any(Intent.class))).thenReturn(true);
+
+    ImagePickerDelegate delegate = createDelegate();
+    delegate.takeImageWithCamera(mockMethodCall, mockResult);
+
+    verify(mockActivity)
+        .startActivityForResult(
+            any(Intent.class), eq(ImagePickerDelegate.REQUEST_CODE_TAKE_IMAGE_WITH_CAMERA));
+  }
+
+  @Test
+  public void
+      takeImageWithCamera_WhenHasCameraPermission_AndNoActivityToHandleCameraIntent_FinishesWithNoCamerasAvailableError() {
+    when(mockPermissionManager.isPermissionGranted(Manifest.permission.CAMERA)).thenReturn(true);
+    when(mockIntentResolver.resolveActivity(any(Intent.class))).thenReturn(false);
+
+    ImagePickerDelegate delegate = createDelegate();
+    delegate.takeImageWithCamera(mockMethodCall, mockResult);
+
+    verify(mockResult)
+        .error("no_available_camera", "No cameras available for taking pictures.", null);
+    verifyNoMoreInteractions(mockResult);
+  }
+
   @Test
   public void
       onRequestPermissionsResult_WhenReadExternalStoragePermissionDenied_FinishesWithNull() {
@@ -172,6 +226,51 @@ public void takeImageWithCamera_WhenPendingResultExists_FinishesWithAlreadyActiv
             any(Intent.class), eq(ImagePickerDelegate.REQUEST_CODE_CHOOSE_VIDEO_FROM_GALLERY));
   }
 
+  @Test
+  public void onRequestPermissionsResult_WhenCameraPermissionDenied_FinishesWithNull() {
+    ImagePickerDelegate delegate = createDelegateWithPendingResultAndMethodCall();
+
+    delegate.onRequestPermissionsResult(
+        ImagePickerDelegate.REQUEST_CAMERA_IMAGE_PERMISSION,
+        new String[] {Manifest.permission.CAMERA},
+        new int[] {PackageManager.PERMISSION_DENIED});
+
+    verify(mockResult).success(null);
+    verifyNoMoreInteractions(mockResult);
+  }
+
+  @Test
+  public void
+      onRequestTakeVideoPermissionsResult_WhenCameraPermissionGranted_LaunchesTakeVideoWithCameraIntent() {
+    when(mockIntentResolver.resolveActivity(any(Intent.class))).thenReturn(true);
+
+    ImagePickerDelegate delegate = createDelegateWithPendingResultAndMethodCall();
+    delegate.onRequestPermissionsResult(
+        ImagePickerDelegate.REQUEST_CAMERA_VIDEO_PERMISSION,
+        new String[] {Manifest.permission.CAMERA},
+        new int[] {PackageManager.PERMISSION_GRANTED});
+
+    verify(mockActivity)
+        .startActivityForResult(
+            any(Intent.class), eq(ImagePickerDelegate.REQUEST_CODE_TAKE_VIDEO_WITH_CAMERA));
+  }
+
+  @Test
+  public void
+      onRequestTakeImagePermissionsResult_WhenCameraPermissionGranted_LaunchesTakeWithCameraIntent() {
+    when(mockIntentResolver.resolveActivity(any(Intent.class))).thenReturn(true);
+
+    ImagePickerDelegate delegate = createDelegateWithPendingResultAndMethodCall();
+    delegate.onRequestPermissionsResult(
+        ImagePickerDelegate.REQUEST_CAMERA_IMAGE_PERMISSION,
+        new String[] {Manifest.permission.CAMERA},
+        new int[] {PackageManager.PERMISSION_GRANTED});
+
+    verify(mockActivity)
+        .startActivityForResult(
+            any(Intent.class), eq(ImagePickerDelegate.REQUEST_CODE_TAKE_IMAGE_WITH_CAMERA));
+  }
+
   @Test
   public void onActivityResult_WhenPickFromGalleryCanceled_FinishesWithNull() {
     ImagePickerDelegate delegate = createDelegateWithPendingResultAndMethodCall();

From f9beb17f70d142e1772225b6c0b7e9d9d73474f8 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Tue, 23 Apr 2019 11:44:17 -0700
Subject: [PATCH 359/410] [image_picker]version fix to 0.5.4+2 (#1533)

---
 packages/image_picker/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 659e49266b9c..f9d8c73e259e 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.4+1
+version: 0.5.4+2
 
 flutter:
   plugin:

From f0334696491acbe5beec0a4bfedec6cf0728c560 Mon Sep 17 00:00:00 2001
From: Iqbal <iqbalmineraltown@gmail.com>
Date: Wed, 24 Apr 2019 01:44:51 +0700
Subject: [PATCH 360/410] [firebase_messaging] remove obsolete docs instruction
 (#1532)

---
 packages/firebase_messaging/CHANGELOG.md | 4 ++++
 packages/firebase_messaging/README.md    | 2 --
 packages/firebase_messaging/pubspec.yaml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index ed659dffb2b3..2a113827a2c9 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.0+4
+
+* Remove obsolete `use_frameworks!` instruction.
+
 ## 4.0.0+3
 
 * Update iOS configuration documentation.
diff --git a/packages/firebase_messaging/README.md b/packages/firebase_messaging/README.md
index 379e2d4f7b37..e692ef3346ba 100644
--- a/packages/firebase_messaging/README.md
+++ b/packages/firebase_messaging/README.md
@@ -41,8 +41,6 @@ To integrate your plugin into the iOS part of your app, follow these steps:
 
 1. In Xcode, select `Runner` in the Project Navigator. In the Capabilities Tab turn on `Push Notifications` and `Background Modes`, and enable `Background fetch` and `Remote notifications` under `Background Modes`.
 
-1. Remove the `use_frameworks!` line from `ios/Podfile` (workaround for [flutter/flutter#9694](https://github.com/flutter/flutter/issues/9694)).
-
 1. Follow the steps in the "[Upload your APNs certificate](https://firebase.google.com/docs/cloud-messaging/ios/client#upload_your_apns_certificate)" section of the Firebase docs.
 
 ### Dart/Flutter Integration
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
index ebc12e22d736..fc2d538dfdbd 100644
--- a/packages/firebase_messaging/pubspec.yaml
+++ b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 4.0.0+3
+version: 4.0.0+4
 
 flutter:
   plugin:

From 8b1ad231fe32955bcd7d40c81334b84e1a541684 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Tue, 23 Apr 2019 12:54:27 -0700
Subject: [PATCH 361/410] [webview_flutter] Disable flaky test (#1534)

---
 packages/webview_flutter/example/test_driver/webview.dart | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/webview_flutter/example/test_driver/webview.dart b/packages/webview_flutter/example/test_driver/webview.dart
index 8b568788c750..1741158d1c15 100644
--- a/packages/webview_flutter/example/test_driver/webview.dart
+++ b/packages/webview_flutter/example/test_driver/webview.dart
@@ -55,6 +55,8 @@ void main() {
     expect(currentUrl, 'https://www.google.com/');
   });
 
+  // enable this once https://github.com/flutter/flutter/issues/31510
+  // is resolved.
   test('loadUrl with headers', () async {
     final Completer<WebViewController> controllerCompleter =
         Completer<WebViewController>();
@@ -86,7 +88,7 @@ void main() {
     final String content = await controller
         .evaluateJavascript('document.documentElement.innerText');
     expect(content.contains('flutter_test_header'), isTrue);
-  });
+  }, skip: true);
 }
 
 Future<void> pumpWidget(Widget widget) {

From a87d2b884b9f7d6e76908694bb3965d172cb4f3b Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Tue, 23 Apr 2019 13:47:55 -0700
Subject: [PATCH 362/410] [webview_flutter] Test: wait for page to load before
 checking the content (#1535)

* [webview_flutter] Disable flaky test

* listen to a callback for pageload

* Use streams

* remove skip and increment version
---
 packages/webview_flutter/CHANGELOG.md                  |  4 ++++
 .../webview_flutter/example/test_driver/webview.dart   | 10 ++++++----
 packages/webview_flutter/pubspec.yaml                  |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index efa6c241891e..973073a03a55 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.7
+
+* Fix loadUrlWithHeaders flaky test.
+
 ## 0.3.6+1
 
 * Remove un-used method params in webview\_flutter
diff --git a/packages/webview_flutter/example/test_driver/webview.dart b/packages/webview_flutter/example/test_driver/webview.dart
index 1741158d1c15..09b4f397058d 100644
--- a/packages/webview_flutter/example/test_driver/webview.dart
+++ b/packages/webview_flutter/example/test_driver/webview.dart
@@ -60,6 +60,7 @@ void main() {
   test('loadUrl with headers', () async {
     final Completer<WebViewController> controllerCompleter =
         Completer<WebViewController>();
+    final StreamController<String> pageLoads = StreamController<String>();
     await pumpWidget(
       Directionality(
         textDirection: TextDirection.ltr,
@@ -70,6 +71,9 @@ void main() {
             controllerCompleter.complete(controller);
           },
           javascriptMode: JavascriptMode.unrestricted,
+          onPageFinished: (String url) {
+            pageLoads.add(url);
+          },
         ),
       ),
     );
@@ -82,13 +86,11 @@ void main() {
     final String currentUrl = await controller.currentUrl();
     expect(currentUrl, 'https://flutter-header-echo.herokuapp.com/');
 
-    // wait for the web page to load.
-    await Future<dynamic>.delayed(const Duration(seconds: 5));
-
+    await pageLoads.stream.firstWhere((String url) => url == currentUrl);
     final String content = await controller
         .evaluateJavascript('document.documentElement.innerText');
     expect(content.contains('flutter_test_header'), isTrue);
-  }, skip: true);
+  });
 }
 
 Future<void> pumpWidget(Widget widget) {
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 944fd3bcc714..7ea66ca725bd 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.6+1
+version: 0.3.7
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 

From 0f3e0466ef566283a3fc6d32e15e7d46782768a7 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Tue, 23 Apr 2019 14:17:51 -0700
Subject: [PATCH 363/410] [image_picker] example app video load error fix.
 (#1531)

---
 packages/image_picker/CHANGELOG.md          |  4 +++
 packages/image_picker/example/lib/main.dart | 34 +++++++++++----------
 packages/image_picker/pubspec.yaml          |  2 +-
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index ff6bffdef335..41f721e9d6e0 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.4+3
+
+* Fix the example app failing to load picked video.
+
 ## 0.5.4+2
 
 * Request Camera permission if it present in Manifest on Android >= M.
diff --git a/packages/image_picker/example/lib/main.dart b/packages/image_picker/example/lib/main.dart
index 4dbd34201709..50c094c27c17 100755
--- a/packages/image_picker/example/lib/main.dart
+++ b/packages/image_picker/example/lib/main.dart
@@ -37,20 +37,19 @@ class _MyHomePageState extends State<MyHomePage> {
   dynamic _pickImageError;
   bool isVideo = false;
   VideoPlayerController _controller;
-  VoidCallback listener = () {};
   String _retrieveDataError;
 
   void _onImageButtonPressed(ImageSource source) async {
     if (_controller != null) {
       _controller.setVolume(0.0);
-      _controller.removeListener(listener);
+      _controller.removeListener(_onVideoControllerUpdate);
     }
     if (isVideo) {
       ImagePicker.pickVideo(source: source).then((File file) {
         if (file != null && mounted) {
           setState(() {
             _controller = VideoPlayerController.file(file)
-              ..addListener(listener)
+              ..addListener(_onVideoControllerUpdate)
               ..setVolume(1.0)
               ..initialize()
               ..setLooping(true)
@@ -68,11 +67,15 @@ class _MyHomePageState extends State<MyHomePage> {
     }
   }
 
+  void _onVideoControllerUpdate() {
+    setState(() {});
+  }
+
   @override
   void deactivate() {
     if (_controller != null) {
       _controller.setVolume(0.0);
-      _controller.removeListener(listener);
+      _controller.removeListener(_onVideoControllerUpdate);
     }
     super.deactivate();
   }
@@ -138,7 +141,7 @@ class _MyHomePageState extends State<MyHomePage> {
         if (response.type == RetrieveType.video) {
           isVideo = true;
           _controller = VideoPlayerController.file(response.file)
-            ..addListener(listener)
+            ..addListener(_onVideoControllerUpdate)
             ..setVolume(1.0)
             ..initialize()
             ..setLooping(true)
@@ -270,21 +273,20 @@ class AspectRatioVideoState extends State<AspectRatioVideo> {
   VideoPlayerController get controller => widget.controller;
   bool initialized = false;
 
-  VoidCallback listener;
+  void _onVideoControllerUpdate() {
+    if (!mounted) {
+      return;
+    }
+    if (initialized != controller.value.initialized) {
+      initialized = controller.value.initialized;
+      setState(() {});
+    }
+  }
 
   @override
   void initState() {
     super.initState();
-    listener = () {
-      if (!mounted) {
-        return;
-      }
-      if (initialized != controller.value.initialized) {
-        initialized = controller.value.initialized;
-        setState(() {});
-      }
-    };
-    controller.addListener(listener);
+    controller.addListener(_onVideoControllerUpdate);
   }
 
   @override
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index f9d8c73e259e..0a160765c68d 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.4+2
+version: 0.5.4+3
 
 flutter:
   plugin:

From 27dd7a278eab99f72426c2edb203fc907d435fb7 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Tue, 23 Apr 2019 14:58:53 -0700
Subject: [PATCH 364/410] [cloud_firestore] Support for atomic
 FieldValue.increment (#1491)

Support for incrementing by atomic FieldValue
---
 packages/cloud_firestore/CHANGELOG.md         |  6 +++++
 .../cloudfirestore/CloudFirestorePlugin.java  |  8 ++++++
 .../example/test_driver/cloud_firestore.dart  | 21 +++++++++++++++
 .../test_driver/cloud_firestore_test.dart     | 11 +++-----
 .../ios/Classes/CloudFirestorePlugin.m        | 10 +++++++
 .../cloud_firestore/lib/src/field_value.dart  | 27 ++++++++++++++++++-
 .../lib/src/firestore_message_codec.dart      | 10 +++++++
 packages/cloud_firestore/pubspec.yaml         |  2 +-
 .../test/cloud_firestore_test.dart            |  6 ++++-
 9 files changed, 91 insertions(+), 10 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 359ce17ea96c..d9f4f1583924 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.10.0
+
+* Support for `FieldValue.increment`.
+* Remove `FieldValue.type` and `FieldValue.value` from public API.
+* Additional integration testing.
+
 ## 0.9.13+1
 
 * Added an integration test for transactions.
diff --git a/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
index 0a85894dbcb2..5f564b1c4753 100644
--- a/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
+++ b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
@@ -654,6 +654,8 @@ final class FirestoreMessageCodec extends StandardMessageCodec {
   private static final byte DELETE = (byte) 134;
   private static final byte SERVER_TIMESTAMP = (byte) 135;
   private static final byte TIMESTAMP = (byte) 136;
+  private static final byte INCREMENT_INTEGER = (byte) 137;
+  private static final byte INCREMENT_DOUBLE = (byte) 138;
 
   @Override
   protected void writeValue(ByteArrayOutputStream stream, Object value) {
@@ -711,6 +713,12 @@ protected Object readValueOfType(byte type, ByteBuffer buffer) {
         return FieldValue.delete();
       case SERVER_TIMESTAMP:
         return FieldValue.serverTimestamp();
+      case INCREMENT_INTEGER:
+        final Number integerIncrementValue = (Number) readValue(buffer);
+        return FieldValue.increment(integerIncrementValue.intValue());
+      case INCREMENT_DOUBLE:
+        final Number doubleIncrementValue = (Number) readValue(buffer);
+        return FieldValue.increment(doubleIncrementValue.doubleValue());
       default:
         return super.readValueOfType(type, buffer);
     }
diff --git a/packages/cloud_firestore/example/test_driver/cloud_firestore.dart b/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
index c040f6befc87..322c979c88f3 100644
--- a/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
+++ b/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
@@ -40,6 +40,27 @@ void main() {
       expect(snapshot.data['message'], 'Hello world!');
     });
 
+    test('increment', () async {
+      final DocumentReference ref = firestore.collection('messages').document();
+      await ref.setData(<String, dynamic>{
+        'message': 1,
+        'created_at': FieldValue.serverTimestamp(),
+      });
+      DocumentSnapshot snapshot = await ref.get();
+      expect(snapshot.data['message'], 1);
+      await ref.updateData(<String, dynamic>{
+        'message': FieldValue.increment(1),
+      });
+      snapshot = await ref.get();
+      expect(snapshot.data['message'], 2);
+      await ref.updateData(<String, dynamic>{
+        'message': FieldValue.increment(40.0),
+      });
+      snapshot = await ref.get();
+      expect(snapshot.data['message'], 42.0);
+      await ref.delete();
+    });
+
     test('runTransaction', () async {
       final DocumentReference ref = firestore.collection('messages').document();
       await ref.setData(<String, dynamic>{
diff --git a/packages/cloud_firestore/example/test_driver/cloud_firestore_test.dart b/packages/cloud_firestore/example/test_driver/cloud_firestore_test.dart
index 314b54af921d..cc11eae240e3 100644
--- a/packages/cloud_firestore/example/test_driver/cloud_firestore_test.dart
+++ b/packages/cloud_firestore/example/test_driver/cloud_firestore_test.dart
@@ -1,10 +1,7 @@
 import 'package:flutter_driver/flutter_driver.dart';
-import 'package:test/test.dart';
 
-void main() {
-  test('CloudFirestore driver test', () async {
-    final FlutterDriver driver = await FlutterDriver.connect();
-    await driver.requestData(null, timeout: const Duration(minutes: 1));
-    driver.close();
-  });
+void main() async {
+  final FlutterDriver driver = await FlutterDriver.connect();
+  await driver.requestData(null, timeout: const Duration(minutes: 1));
+  driver.close();
 }
diff --git a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
index a272904274bb..da821e182e60 100644
--- a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
@@ -140,6 +140,8 @@
 const UInt8 DELETE = 134;
 const UInt8 SERVER_TIMESTAMP = 135;
 const UInt8 TIMESTAMP = 136;
+const UInt8 INCREMENT_DOUBLE = 137;
+const UInt8 INCREMENT_INTEGER = 138;
 
 @interface FirestoreWriter : FlutterStandardWriter
 - (void)writeValue:(id)value;
@@ -234,6 +236,14 @@ - (id)readValueOfType:(UInt8)type {
     case SERVER_TIMESTAMP: {
       return [FIRFieldValue fieldValueForServerTimestamp];
     }
+    case INCREMENT_DOUBLE: {
+      NSNumber *value = [self readValue];
+      return [FIRFieldValue fieldValueForDoubleIncrement:value.doubleValue];
+    }
+    case INCREMENT_INTEGER: {
+      NSNumber *value = [self readValue];
+      return [FIRFieldValue fieldValueForIntegerIncrement:value.intValue];
+    }
     default:
       return [super readValueOfType:type];
   }
diff --git a/packages/cloud_firestore/lib/src/field_value.dart b/packages/cloud_firestore/lib/src/field_value.dart
index 9795ed69edc3..4ab12b0411f3 100644
--- a/packages/cloud_firestore/lib/src/field_value.dart
+++ b/packages/cloud_firestore/lib/src/field_value.dart
@@ -4,14 +4,25 @@
 
 part of cloud_firestore;
 
-enum FieldValueType { arrayUnion, arrayRemove, delete, serverTimestamp }
+@visibleForTesting
+enum FieldValueType {
+  arrayUnion,
+  arrayRemove,
+  delete,
+  serverTimestamp,
+  incrementDouble,
+  incrementInteger,
+}
 
 /// Sentinel values that can be used when writing document fields with set() or
 /// update().
 class FieldValue {
   FieldValue._(this.type, this.value);
 
+  @visibleForTesting
   final FieldValueType type;
+
+  @visibleForTesting
   final dynamic value;
 
   /// Returns a special value that tells the server to union the given elements
@@ -40,4 +51,18 @@ class FieldValue {
   /// server-generated timestamp in the written data.
   static FieldValue serverTimestamp() =>
       FieldValue._(FieldValueType.serverTimestamp, null);
+
+  /// Returns a special value for use with set() or update() that tells the
+  /// server to increment the field’s current value by the given value.
+  static FieldValue increment(num value) {
+    // It is a compile-time error for any type other than int or double to
+    // attempt to extend or implement num.
+    assert(value is int || value is double);
+    if (value is double) {
+      return FieldValue._(FieldValueType.incrementDouble, value);
+    } else if (value is int) {
+      return FieldValue._(FieldValueType.incrementInteger, value);
+    }
+    return null;
+  }
 }
diff --git a/packages/cloud_firestore/lib/src/firestore_message_codec.dart b/packages/cloud_firestore/lib/src/firestore_message_codec.dart
index 0708fa5c5f32..14f6e020675c 100644
--- a/packages/cloud_firestore/lib/src/firestore_message_codec.dart
+++ b/packages/cloud_firestore/lib/src/firestore_message_codec.dart
@@ -17,6 +17,8 @@ class FirestoreMessageCodec extends StandardMessageCodec {
   static const int _kDelete = 134;
   static const int _kServerTimestamp = 135;
   static const int _kTimestamp = 136;
+  static const int _kIncrementDouble = 137;
+  static const int _kIncrementInteger = 138;
 
   static const Map<FieldValueType, int> _kFieldValueCodes =
       <FieldValueType, int>{
@@ -24,6 +26,8 @@ class FirestoreMessageCodec extends StandardMessageCodec {
     FieldValueType.arrayRemove: _kArrayRemove,
     FieldValueType.delete: _kDelete,
     FieldValueType.serverTimestamp: _kServerTimestamp,
+    FieldValueType.incrementDouble: _kIncrementDouble,
+    FieldValueType.incrementInteger: _kIncrementInteger,
   };
 
   @override
@@ -94,6 +98,12 @@ class FirestoreMessageCodec extends StandardMessageCodec {
         return FieldValue.delete();
       case _kServerTimestamp:
         return FieldValue.serverTimestamp();
+      case _kIncrementDouble:
+        final double value = readValue(buffer);
+        return FieldValue.increment(value);
+      case _kIncrementInteger:
+        final int value = readValue(buffer);
+        return FieldValue.increment(value);
       default:
         return super.readValueOfType(type, buffer);
     }
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index afb5a13e1fce..658f5a1606f6 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.9.13+1
+version: 0.10.0
 
 flutter:
   plugin:
diff --git a/packages/cloud_firestore/test/cloud_firestore_test.dart b/packages/cloud_firestore/test/cloud_firestore_test.dart
index c925d5f0c062..6bb5bd5ad8c6 100755
--- a/packages/cloud_firestore/test/cloud_firestore_test.dart
+++ b/packages/cloud_firestore/test/cloud_firestore_test.dart
@@ -609,6 +609,8 @@ void main() {
         _checkEncodeDecode<dynamic>(codec, FieldValue.arrayRemove(<int>[123]));
         _checkEncodeDecode<dynamic>(codec, FieldValue.delete());
         _checkEncodeDecode<dynamic>(codec, FieldValue.serverTimestamp());
+        _checkEncodeDecode<dynamic>(codec, FieldValue.increment(1.0));
+        _checkEncodeDecode<dynamic>(codec, FieldValue.increment(1));
       });
     });
 
@@ -881,5 +883,7 @@ bool _deepEqualsMap(
 bool _deepEqualsFieldValue(FieldValue valueA, FieldValue valueB) {
   if (valueA.type != valueB.type) return false;
   if (valueA.value == null) return valueB.value == null;
-  return _deepEqualsList(valueA.value, valueB.value);
+  if (valueA.value is List) return _deepEqualsList(valueA.value, valueB.value);
+  if (valueA.value is Map) return _deepEqualsMap(valueA.value, valueB.value);
+  return valueA.value == valueB.value;
 }

From 959da97fb34644c9c6e4797690ac65797702b086 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Wed, 24 Apr 2019 15:22:41 -0700
Subject: [PATCH 365/410] [in_app_purchase] Minor doc updates (#1536)

---
 .../lib/src/billing_client_wrappers/README.md |   6 +
 .../lib/src/in_app_purchase/README.md         |  23 +++
 .../in_app_purchase_connection.dart           | 172 ++++++++++++------
 .../src/in_app_purchase/purchase_details.dart |   9 +-
 .../lib/src/store_kit_wrappers/README.md      |   5 +
 5 files changed, 157 insertions(+), 58 deletions(-)
 create mode 100644 packages/in_app_purchase/lib/src/billing_client_wrappers/README.md
 create mode 100644 packages/in_app_purchase/lib/src/in_app_purchase/README.md
 create mode 100644 packages/in_app_purchase/lib/src/store_kit_wrappers/README.md

diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/README.md b/packages/in_app_purchase/lib/src/billing_client_wrappers/README.md
new file mode 100644
index 000000000000..54e76b528b48
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/README.md
@@ -0,0 +1,6 @@
+# billing_client_wrappers
+
+This exposes a way Dart endpoints through to [Google Play Billing
+Library](https://developer.android.com/google/play/billing/billing_library_overview).
+Can be used as an alternative to
+[in_app_purchase](../in_app_purchase/README.md).
\ No newline at end of file
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase/README.md b/packages/in_app_purchase/lib/src/in_app_purchase/README.md
new file mode 100644
index 000000000000..8e064c67ef56
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/in_app_purchase/README.md
@@ -0,0 +1,23 @@
+# in_app_purchase
+
+A simplified, generic API for handling in app purchases with a single code base.
+
+You can use this to:
+
+* Display a list of products for sale from App Store (on iOS) or Google Play (on
+  Android)
+* Purchase a product. From the App Store this supports consumables,
+  non-consumables, and subscriptions. From Google Play this supports both in app
+  purchases and subscriptions.
+* Load previously purchased products, to the extent that this is supported in
+  both underlying platforms.
+
+This can be used in addition to or as an alternative to
+[billing_client_wrappers](../billing_client_wrappers/README.md) and
+[store_kit_wrappers](../store_kit_wrappers/README.md).
+
+`InAppPurchaseConnection` tries to be as platform agnostic as possible, but in
+some cases differentiating between the underlying platforms is unavoidable.
+
+You can see a sample usage of this in the [example
+app](../../../example/README.md).
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase/in_app_purchase_connection.dart
index 3adcd7699f01..c9a29bc01986 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase/in_app_purchase_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase/in_app_purchase_connection.dart
@@ -11,19 +11,31 @@ import 'package:flutter/foundation.dart';
 import 'package:in_app_purchase/billing_client_wrappers.dart';
 import './purchase_details.dart';
 
-/// Basic generic API for making in app purchases across multiple platforms.
+/// Basic API for making in app purchases across multiple platforms.
+///
+/// This is a generic abstraction built from `billing_client_wrapers` and
+/// `store_kit_wrappers`. Either library can be used for their respective
+/// platform instead of this.
 abstract class InAppPurchaseConnection {
   /// Listen to this broadcast stream to get real time update for purchases.
   ///
-  /// This stream would never close when the APP is active.
+  /// This stream will never close as long as the app is active.
   ///
   /// Purchase updates can happen in several situations:
-  /// * When a purchase is triggered by user in the APP.
+  /// * When a purchase is triggered by user in the app.
   /// * When a purchase is triggered by user from App Store or Google Play.
-  /// * If a purchase is not completed([completePurchase] is not called on the purchase object) from the last APP session. Purchase updates will happen when a new APP session starts.
-  ///
-  /// IMPORTANT! To Avoid losing information on purchase updates, You should listen to this stream as soon as your APP launches, preferably before returning your main App Widget in main().
-  /// We recommend to have a single subscription listening to the stream at a given time. If you choose to have multiple subscription at the same time, you should be careful at the fact that each subscription will receive all the events after they start to listen.
+  /// * If a purchase is not completed ([completePurchase] is not called on the
+  ///   purchase object) from the last app session. Purchase updates will happen
+  ///   when a new app session starts instead.
+  ///
+  /// IMPORTANT! You must subscribe to this stream as soon as your app launches,
+  /// preferably before returning your main App Widget in main(). Otherwise you
+  /// will miss purchase updated made before this stream is subscribed to.
+  ///
+  /// We also recommend listening to the stream with one subscription at a given
+  /// time. If you choose to have multiple subscription at the same time, you
+  /// should be careful at the fact that each subscription will receive all the
+  /// events after they start to listen.
   Stream<List<PurchaseDetails>> get purchaseUpdatedStream => _getStream();
 
   Stream<List<PurchaseDetails>> _purchaseUpdatedStream;
@@ -49,26 +61,47 @@ abstract class InAppPurchaseConnection {
   /// Returns true if the payment platform is ready and available.
   Future<bool> isAvailable();
 
-  /// Query product details list that match the given set of identifiers.
+  /// Query product details for the given set of IDs.
+  ///
+  /// The [identifiers] need to exactly match existing configured product
+  /// identifiers in the underlying payment platform, whether that's [App Store
+  /// Connect](https://appstoreconnect.apple.com/) or [Google Play
+  /// Console](https://play.google.com/).
+  ///
+  /// See the [example readme](../../../../example/README.md) for steps on how
+  /// to initialize products on both payment platforms.
   Future<ProductDetailsResponse> queryProductDetails(Set<String> identifiers);
 
   /// Buy a non consumable product or subscription.
   ///
-  /// Non consumable items are the items that user can only buy once, for example, a purchase that unlocks a special content in your APP.
-  /// Subscriptions are also non consumable products.
-  ///
-  /// You need to restore all the non consumable products for user when they switch their phones.
+  /// Non consumable items can only be bought once. For example, a purchase that
+  /// unlocks a special content in your app. Subscriptions are also non
+  /// consumable products.
   ///
-  /// On iOS, you can define your product as a non consumable items in the [App Store Connect](https://appstoreconnect.apple.com/login).
-  /// Unfortunately, [Google Play Console](https://play.google.com/) defaults all the products as non consumable. You have to consume the consumable items manually calling [consumePurchase].
+  /// You always need to restore all the non consumable products for user when
+  /// they switch their phones.
   ///
-  /// This method does not return anything. Instead, after triggering this method, purchase updates will be sent to [purchaseUpdatedStream].
-  /// You should [Stream.listen] to [purchaseUpdatedStream] to get [PurchaseDetails] objects in different [PurchaseDetails.status] and
-  /// update your UI accordingly. When the [PurchaseDetails.status] is [PurchaseStatus.purchased] or [PurchaseStatus.error], you should deliver the content or handle the error, then call
+  /// This method does not return anything. Instead, after triggering this
+  /// method, purchase updates will be sent to [purchaseUpdatedStream]. You
+  /// should [Stream.listen] to [purchaseUpdatedStream] to get [PurchaseDetails]
+  /// objects in different [PurchaseDetails.status] and update your UI
+  /// accordingly. When the [PurchaseDetails.status] is
+  /// [PurchaseStatus.purchased] or [PurchaseStatus.error], you should deliver
+  /// the content or handle the error. On iOS, you also need to call
   /// [completePurchase] to finish the purchasing process.
   ///
-  /// You can find more details on testing payments on iOS [here](https://developer.apple.com/library/archive/documentation/NetworkingInternet/Conceptual/StoreKitGuide/Chapters/ShowUI.html#//apple_ref/doc/uid/TP40008267-CH3-SW11).
-  /// You can find more details on testing payments on Android [here](https://developer.android.com/google/play/billing/billing_testing).
+  /// Consumable items are defined differently by the different underlying
+  /// payment platforms, and there's no way to query for whether or not the
+  /// [ProductDetail] is a consumable at runtime. On iOS, products are defined
+  /// as non consumable items in the [App Store
+  /// Connect](https://appstoreconnect.apple.com/). [Google Play
+  /// Console](https://play.google.com/) products are considered consumable if
+  /// and when they are actively consumed manually.
+  ///
+  /// You can find more details on testing payments on iOS
+  /// [here](https://developer.apple.com/library/archive/documentation/NetworkingInternet/Conceptual/StoreKitGuide/Chapters/ShowUI.html#//apple_ref/doc/uid/TP40008267-CH3-SW11).
+  /// You can find more details on testing payments on Android
+  /// [here](https://developer.android.com/google/play/billing/billing_testing).
   ///
   /// See also:
   ///
@@ -80,64 +113,91 @@ abstract class InAppPurchaseConnection {
 
   /// Buy a consumable product.
   ///
-  /// Non consumable items are the items that user can buy multiple times, for example, a health potion.
-  ///
-  /// It is not mandatory to restore non consumable products for user when they switch their phones. If you'd like to restore non consumable purchases, you should keep track of those purchase on your own server
-  /// and restore the purchase for your users.
-  ///
-  /// On iOS, you can define your product as a consumable items in the [App Store Connect](https://appstoreconnect.apple.com/login).
-  /// Unfortunately, [Google Play Console](https://play.google.com/) defaults all the products as non consumable. You have to consume the consumable items manually calling [consumePurchase].
-  ///
-  /// The `autoConsume` is for Android only since iOS will automatically consume your purchase if the product is categorized as `consumable` on `App Store Connect`.
-  /// The `autoConsume` if `true` by default, and we will call [consumePurchase] after a successful purchase for you. If you'd like to have an advance purchase flow management. You should set it to `false` and
-  /// consume the purchase when you see fit. Fail to consume a purchase will cause user never be able to buy the same item again. Setting this to `false` on iOS will throw an `Exception`.
-  ///
-  /// This method does not return anything. Instead, after triggering this method, purchase updates will be sent to [purchaseUpdatedStream].
-  /// You should [Stream.listen] to [purchaseUpdatedStream] to get [PurchaseDetails] objects in different [PurchaseDetails.status] and
-  /// update your UI accordingly. When the [PurchaseDetails.status] is [PurchaseStatus.purchased] or [PurchaseStatus.error], you should deliver the content or handle the error, then call
-  /// [completePurchase] to finish the purchasing process.
-  ///
-  /// You can find more details on testing payments on iOS [here](https://developer.apple.com/library/archive/documentation/NetworkingInternet/Conceptual/StoreKitGuide/Chapters/ShowUI.html#//apple_ref/doc/uid/TP40008267-CH3-SW11).
-  /// You can find more details on testing payments on Android [here](https://developer.android.com/google/play/billing/billing_testing).
+  /// Consumable items can be "consumed" to mark that they've been used and then
+  /// bought additional times. For example, a health potion.
+  ///
+  /// To restore consumable purchases across devices, you should keep track of
+  /// those purchase on your own server and restore the purchase for your users.
+  /// Consumed products are no longer considered to be "owned" by payment
+  /// platforms and will not be delivered by calling [queryPastPurchases].
+  ///
+  /// Consumable items are defined differently by the different underlying
+  /// payment platforms, and there's no way to query for whether or not the
+  /// [ProductDetail] is a consumable at runtime. On iOS, products are defined
+  /// as consumable items in the [App Store
+  /// Connect](https://appstoreconnect.apple.com/). [Google Play
+  /// Console](https://play.google.com/) products are considered consumable if
+  /// and when they are actively consumed manually.
+  ///
+  /// `autoConsume` is provided as a utility for Android only. It's meaningless
+  /// on iOS because the App Store automatically considers all potentially
+  /// consumable purchases "consumed" once the initial transaction is complete.
+  /// `autoConsume` is `true` by default, and we will call [consumePurchase]
+  /// after a successful purchase for you so that Google Play considers a
+  /// purchase consumed after the initial transaction, like iOS. If you'd like
+  /// to manually consume purchases in Play, you should set it to `false` and
+  /// manually call [consumePurchase] instead. Failing to consume a purchase
+  /// will cause user never be able to buy the same item again. Manually setting
+  /// this to `false` on iOS will throw an `Exception`.
+  ///
+  /// This method does not return anything. Instead, after triggering this
+  /// method, purchase updates will be sent to [purchaseUpdatedStream]. You
+  /// should [Stream.listen] to [purchaseUpdatedStream] to get [PurchaseDetails]
+  /// objects in different [PurchaseDetails.status] and update your UI
+  /// accordingly. When the [PurchaseDetails.status] is
+  /// [PurchaseStatus.purchased] or [PurchaseStatus.error], you should deliver
+  /// the content or handle the error, then call [completePurchase] to finish
+  /// the purchasing process.
   ///
   /// See also:
   ///
-  ///  * [buyNonConsumable], for buying a non consumable product or subscription.
+  ///  * [buyNonConsumable], for buying a non consumable product or
+  ///    subscription.
   ///  * [queryPastPurchases], for restoring non consumable products.
-  ///  * [consumePurchase], for consume consumable products on Android.
+  ///  * [consumePurchase], for manually consuming products on Android.
   ///
-  /// Calling this method for non consumable items will cause unwanted behaviors!
+  /// Calling this method for non consumable items will cause unwanted
+  /// behaviors!
   void buyConsumable(
       {@required PurchaseParam purchaseParam, bool autoConsume = true});
 
-  /// Completes a purchase either after delivering the content or the purchase is failed. (iOS only).
+  /// (App Store only) Mark that purchased content has been delivered to the
+  /// user.
   ///
-  /// You are responsible to complete every [PurchaseDetails] whose [PurchaseDetails.status] is [PurchaseStatus.purchased] or [[PurchaseStatus.error].
-  /// Completing a [PurchaseStatus.pending] purchase will cause exception.
+  /// You are responsible for completing every [PurchaseDetails] whose
+  /// [PurchaseDetails.status] is [PurchaseStatus.purchased] or
+  /// [[PurchaseStatus.error]. Completing a [PurchaseStatus.pending] purchase
+  /// will cause an exception.
   ///
-  /// It throws an [UnsupportedError] on Android.
+  /// This throws an [UnsupportedError] on Android.
   Future<void> completePurchase(PurchaseDetails purchase);
 
-  /// Consume a product that is purchased with `purchase` so user can buy it again. (Android only).
+  /// (Play only) Mark that the user has consumed a product.
   ///
-  /// You are responsible to consume purchases for consumable product after delivery the product.
-  /// The user cannot buy the same product again until the purchase of the product is consumed.
+  /// You are responsible for consuming all consumable purchases once they are
+  /// delivered. The user won't be able to buy the same product again until the
+  /// purchase of the product is consumed.
   ///
-  /// It throws an [UnsupportedError] on iOS.
+  /// This throws an [UnsupportedError] on iOS.
   Future<BillingResponse> consumePurchase(PurchaseDetails purchase);
 
-  /// Query all the past purchases.
+  /// Query all previous purchases.
   ///
-  /// The `applicationUserName` is required if you also passed this in when making a purchase.
-  /// If you did not use a `applicationUserName` when creating payments, you can ignore this parameter.
+  /// The `applicationUserName` should match whatever was sent in the initial
+  /// `PurchaseParam`, if anything.
+  ///
+  /// This does not return consumed products. If you want to restore unused
+  /// consumable products, you need to persist consumable product information
+  /// for your user on your own server.
+  ///
+  /// See also:
   ///
-  /// For example, when a user installs your APP on a different phone, you want to restore the past purchases and deliver the products that they previously purchased.
-  /// It is mandatory to restore non-consumable and subscription for them; however, for consumable product, it is up to you to decide if you should restore those.
-  /// If you want to restore the consumable product as well, you need to persist consumable product information for your user on your own server and deliver it to them.
+  ///  * [refreshPurchaseVerificationData], for reloading failed
+  ///    [PurchaseDetails.verificationData].
   Future<QueryPurchaseDetailsResponse> queryPastPurchases(
       {String applicationUserName});
 
-  /// A utility method in case there is an issue with getting the verification data originally on iOS.
+  /// (App Store only) retry loading purchase data after an initial failure.
   ///
   /// Throws an [UnsupportedError] on Android.
   Future<PurchaseVerificationData> refreshPurchaseVerificationData();
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase/purchase_details.dart b/packages/in_app_purchase/lib/src/in_app_purchase/purchase_details.dart
index f88c32754a26..c3243a997420 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase/purchase_details.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase/purchase_details.dart
@@ -126,8 +126,13 @@ class PurchaseDetails {
 
   /// The verification data of the purchase.
   ///
-  /// Use this to verify the purchase. See [PurchaseVerificationData] for details on how to verify purchase use this data.
-  /// You should never use any purchase data until verified.
+  /// Use this to verify the purchase. See [PurchaseVerificationData] for
+  /// details on how to verify purchase use this data. You should never use any
+  /// purchase data until verified.
+  ///
+  /// On iOS, this may be null. Call
+  /// [InAppPurchaseConnection.refreshPurchaseVerificationData] to get a new
+  /// [PurchaseVerificationData] object for further validation.
   final PurchaseVerificationData verificationData;
 
   /// The timestamp of the transaction.
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/README.md b/packages/in_app_purchase/lib/src/store_kit_wrappers/README.md
new file mode 100644
index 000000000000..bd8e5b540ba0
--- /dev/null
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/README.md
@@ -0,0 +1,5 @@
+# store_kit_wrappers
+
+This exposes Dart endpoints through to the
+[StoreKit](https://developer.apple.com/documentation/storekit) APIs. Can be used
+as an alternative to [in_app_purchase](../in_app_purchase/README.md).
\ No newline at end of file

From d63c51cf06ff88939d552f4c66065dc36791ed53 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Wed, 24 Apr 2019 15:23:26 -0700
Subject: [PATCH 366/410] [in_app_purchase] Add auto-consume errors to
 PurchaseDetails (#1537)

Previously this was consuming the purchases in the background and
ignoring the output.

Also some minor code cleanup.
---
 .../google_play_connection.dart               | 91 ++++++++++---------
 .../src/in_app_purchase/purchase_details.dart |  1 +
 .../google_play_connection_test.dart          | 66 ++++++++++++++
 3 files changed, 117 insertions(+), 41 deletions(-)

diff --git a/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
index 586c0e32e1e1..81afd63bfff4 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
@@ -18,9 +18,10 @@ class GooglePlayConnection
     with WidgetsBindingObserver
     implements InAppPurchaseConnection {
   GooglePlayConnection._()
-      : billingClient = BillingClient((PurchasesResultWrapper resultWrapper) {
+      : billingClient =
+            BillingClient((PurchasesResultWrapper resultWrapper) async {
           _purchaseUpdatedController
-              .add(_getPurchaseDetailsFromResult(resultWrapper));
+              .add(await _getPurchaseDetailsFromResult(resultWrapper));
         }) {
     _readyFuture = _connect();
     WidgetsBinding.instance.addObserver(this);
@@ -38,7 +39,7 @@ class GooglePlayConnection
   final BillingClient billingClient;
 
   Future<void> _readyFuture;
-  static Set<String> _productIDsToConsume;
+  static Set<String> _productIdsToConsume = Set<String>();
 
   @override
   Future<bool> isAvailable() async {
@@ -56,11 +57,8 @@ class GooglePlayConnection
   @override
   void buyConsumable(
       {@required PurchaseParam purchaseParam, bool autoConsume = true}) {
-    if (autoConsume == true) {
-      if (_productIDsToConsume == null) {
-        _productIDsToConsume = Set<String>();
-        _productIDsToConsume.add(purchaseParam.productDetails.id);
-      }
+    if (autoConsume) {
+      _productIdsToConsume.add(purchaseParam.productDetails.id);
     }
     buyNonConsumable(purchaseParam: purchaseParam);
   }
@@ -143,10 +141,6 @@ class GooglePlayConnection
     return _instance;
   }
 
-  static _consume(PurchaseDetails purchase) {
-    instance.consumePurchase(purchase);
-  }
-
   Future<void> _connect() =>
       billingClient.startConnection(onBillingServiceDisconnected: () {});
 
@@ -179,34 +173,49 @@ class GooglePlayConnection
         productDetails: productDetails, notFoundIDs: notFoundIDS);
   }
 
-  static List<PurchaseDetails> _getPurchaseDetailsFromResult(
-      PurchasesResultWrapper resultWrapper) {
-    return resultWrapper.purchasesList.map(
-      (PurchaseWrapper purchase) {
-        PurchaseError error = null;
-        if (resultWrapper.responseCode != BillingResponse.ok) {
-          error = PurchaseError(
-            source: PurchaseSource.GooglePlay,
-            code: kRestoredPurchaseErrorCode,
-            message: {'message': resultWrapper.responseCode.toString()},
-          );
-        }
-        PurchaseDetails purchaseDetails = purchase.toPurchaseDetails()
-          ..status = resultWrapper.responseCode == BillingResponse.ok
-              ? PurchaseStatus.purchased
-              : PurchaseStatus.error
-          ..error = error;
-        // auto consume logic for buyConsumable.
-        if (_productIDsToConsume != null &&
-            _productIDsToConsume.contains(purchaseDetails.productID)) {
-          _consume(purchaseDetails);
-          _productIDsToConsume.remove(purchaseDetails.productID);
-          if (_productIDsToConsume.isEmpty) {
-            _productIDsToConsume = null;
-          }
-        }
-        return purchaseDetails;
-      },
-    ).toList();
+  static Future<List<PurchaseDetails>> _getPurchaseDetailsFromResult(
+      PurchasesResultWrapper resultWrapper) async {
+    PurchaseError error;
+    PurchaseStatus status;
+    if (resultWrapper.responseCode == BillingResponse.ok) {
+      error = null;
+      status = PurchaseStatus.purchased;
+    } else {
+      error = PurchaseError(
+        source: PurchaseSource.GooglePlay,
+        code: kRestoredPurchaseErrorCode,
+        message: {'message': resultWrapper.responseCode.toString()},
+      );
+      status = PurchaseStatus.error;
+    }
+    final List<Future<PurchaseDetails>> purchases =
+        resultWrapper.purchasesList.map((PurchaseWrapper purchase) {
+      return _maybeAutoConsumePurchase(purchase.toPurchaseDetails()
+        ..status = status
+        ..error = error);
+    }).toList();
+    return Future.wait(purchases);
+  }
+
+  static Future<PurchaseDetails> _maybeAutoConsumePurchase(
+      PurchaseDetails purchaseDetails) async {
+    if (!(purchaseDetails.status == PurchaseStatus.purchased &&
+        _productIdsToConsume.contains(purchaseDetails.productID))) {
+      return purchaseDetails;
+    }
+
+    final BillingResponse consumedResponse =
+        await instance.consumePurchase(purchaseDetails);
+    if (consumedResponse != BillingResponse.ok) {
+      purchaseDetails.status = PurchaseStatus.error;
+      purchaseDetails.error = PurchaseError(
+        source: PurchaseSource.GooglePlay,
+        code: kConsumptionFailedErrorCode,
+        message: {'message': consumedResponse.toString()},
+      );
+    }
+    _productIdsToConsume.remove(purchaseDetails.productID);
+
+    return purchaseDetails;
   }
 }
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase/purchase_details.dart b/packages/in_app_purchase/lib/src/in_app_purchase/purchase_details.dart
index c3243a997420..e6ea78ea99d3 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase/purchase_details.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase/purchase_details.dart
@@ -9,6 +9,7 @@ import './product_details.dart';
 
 final String kPurchaseErrorCode = 'purchase_error';
 final String kRestoredPurchaseErrorCode = 'restore_transactions_failed';
+final String kConsumptionFailedErrorCode = 'consume_purchase_failed';
 
 /// Represents the data that is used to verify purchases.
 ///
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index 6dcc3aa35b2e..c0de97018d24 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -266,9 +266,75 @@ void main() {
           applicationUserName: accountId);
       await GooglePlayConnection.instance
           .buyConsumable(purchaseParam: purchaseParam);
+
+      // Verify that the result has succeeded
+      PurchaseDetails result = await completer.future;
+      expect(result.billingClientPurchase.purchaseToken,
+          await consumeCompleter.future);
+      expect(result.status, PurchaseStatus.purchased);
+      expect(result.error, isNull);
+    });
+
+    test('adds consumption failures to PurchaseDetails objects', () async {
+      final SkuDetailsWrapper skuDetails = dummySkuDetails;
+      final String accountId = "hashedAccountId";
+      final BillingResponse sentCode = BillingResponse.ok;
+      stubPlatform.addResponse(
+          name: launchMethodName,
+          value: BillingResponseConverter().toJson(sentCode),
+          additionalStepBeforeReturn: (_) {
+            // Mock java update purchase callback.
+            MethodCall call = MethodCall(kOnPurchasesUpdated, {
+              'responseCode': BillingResponseConverter().toJson(sentCode),
+              'purchasesList': [
+                {
+                  'orderId': 'orderID1',
+                  'sku': skuDetails.sku,
+                  'isAutoRenewing': false,
+                  'packageName': "package",
+                  'purchaseTime': 1231231231,
+                  'purchaseToken': "token",
+                  'signature': 'sign',
+                  'originalJson': 'json'
+                }
+              ]
+            });
+            connection.billingClient.callHandler(call);
+          });
+      Completer consumeCompleter = Completer();
+      // adding call back for consume purchase
+      final BillingResponse expectedCode = BillingResponse.error;
+      stubPlatform.addResponse(
+          name: consumeMethodName,
+          value: BillingResponseConverter().toJson(expectedCode),
+          additionalStepBeforeReturn: (dynamic args) {
+            String purchaseToken = args['purchaseToken'];
+            consumeCompleter.complete((purchaseToken));
+          });
+
+      Completer completer = Completer();
+      PurchaseDetails purchaseDetails;
+      Stream purchaseStream =
+          GooglePlayConnection.instance.purchaseUpdatedStream;
+      StreamSubscription subscription;
+      subscription = purchaseStream.listen((_) {
+        purchaseDetails = _.first;
+        completer.complete(purchaseDetails);
+        subscription.cancel();
+      }, onDone: () {});
+      final PurchaseParam purchaseParam = PurchaseParam(
+          productDetails: skuDetails.toProductDetails(),
+          applicationUserName: accountId);
+      await GooglePlayConnection.instance
+          .buyConsumable(purchaseParam: purchaseParam);
+
+      // Verify that the result has an error for the failed consumption
       PurchaseDetails result = await completer.future;
       expect(result.billingClientPurchase.purchaseToken,
           await consumeCompleter.future);
+      expect(result.status, PurchaseStatus.error);
+      expect(result.error, isNotNull);
+      expect(result.error.code, kConsumptionFailedErrorCode);
     });
 
     test(

From 055c2ee62dff9a1f8275bf517aef0edd61ba1152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= <linus@folkdatorn.se>
Date: Thu, 25 Apr 2019 18:53:39 +0200
Subject: [PATCH 367/410] [image_picker] Fix path of returned File objects when
 picking videos (#1505)

Returning .description on a NSURL gave back a url that starts with file:///, when passing this url to the File object it constructed a path like /file:///foo/bar/baz.ext.

This fixes this logic to use .path instead, which returns the path to the file.
---
 packages/image_picker/CHANGELOG.md                    | 6 +++++-
 packages/image_picker/ios/Classes/ImagePickerPlugin.m | 2 +-
 packages/image_picker/pubspec.yaml                    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 41f721e9d6e0..24ef496b6468 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.0
+
+* Breaking change iOS: Returned `File` objects when picking videos now always holds the correct path. Before this change, the path returned could have `file://` prepended to it.
+
 ## 0.5.4+3
 
 * Fix the example app failing to load picked video.
@@ -16,7 +20,7 @@
 
 ## 0.5.3+2
 
-* Android: fix a crash when the MainActivity is destroyed after selecting the image/video. 
+* Android: fix a crash when the MainActivity is destroyed after selecting the image/video.
 
 ## 0.5.3+1
 
diff --git a/packages/image_picker/ios/Classes/ImagePickerPlugin.m b/packages/image_picker/ios/Classes/ImagePickerPlugin.m
index 0ac64ceb54e9..0fce505ead93 100644
--- a/packages/image_picker/ios/Classes/ImagePickerPlugin.m
+++ b/packages/image_picker/ios/Classes/ImagePickerPlugin.m
@@ -191,7 +191,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker
     return;
   }
   if (videoURL != nil) {
-    _result(videoURL.description);
+    _result(videoURL.path);
   } else {
     if (image == nil) {
       image = [info objectForKey:UIImagePickerControllerOriginalImage];
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 0a160765c68d..415fbc675666 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.5.4+3
+version: 0.6.0
 
 flutter:
   plugin:

From 863e68feea000678ee4c2abebe1322648ff06674 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Thu, 25 Apr 2019 14:50:10 -0700
Subject: [PATCH 368/410] [image_picker] correct suffix on android. (#1541)

Using correct temp file suffix on android when getting images from remote url.
---
 AUTHORS                                                       | 1 +
 packages/image_picker/CHANGELOG.md                            | 4 ++++
 .../main/java/io/flutter/plugins/imagepicker/FileUtils.java   | 2 +-
 packages/image_picker/pubspec.yaml                            | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5ab83295ae9e..6289a2f76ff6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,3 +33,4 @@ EUI Limited <ian.evans3@admiralgroup.co.uk>
 Katarina Sheremet <katarina@sheremet.ch>
 Thomas Stockx <thomas@stockxit.com>
 Sarbagya Dhaubanjar <sarbagyastha@gmail.com>
+Ozkan Eksi <ozeksi@gmail.com>
\ No newline at end of file
diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 24ef496b6468..f1e6bc5b513f 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.0+1
+
+* Android: Using correct suffix syntax when picking image from remote url.
+
 ## 0.6.0
 
 * Breaking change iOS: Returned `File` objects when picking videos now always holds the correct path. Before this change, the path returned could have `file://` prepended to it.
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
index c155a10634db..a58dc9f92632 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
@@ -141,7 +141,7 @@ private static String getPathFromRemoteUri(final Context context, final Uri uri)
     boolean success = false;
     try {
       inputStream = context.getContentResolver().openInputStream(uri);
-      file = File.createTempFile("image_picker", "jpg", context.getCacheDir());
+      file = File.createTempFile("image_picker", ".jpg", context.getCacheDir());
       outputStream = new FileOutputStream(file);
       if (inputStream != null) {
         copy(inputStream, outputStream);
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 415fbc675666..728435e44ac6 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.6.0
+version: 0.6.0+1
 
 flutter:
   plugin:

From c9399f72cbbceedd4728c20696f52e0722f91631 Mon Sep 17 00:00:00 2001
From: Ben Hagen <ben@ottomatic.io>
Date: Fri, 26 Apr 2019 01:28:07 +0200
Subject: [PATCH 369/410] [video_player] Correctly report buffering status on
 Android (#1123)

* Update buffering status when getting position

* Report buffer status in milliseconds

* Update changelog and pubspec
---
 packages/video_player/CHANGELOG.md              |  6 ++++++
 .../plugins/videoplayer/VideoPlayerPlugin.java  | 17 +++++++++++------
 packages/video_player/pubspec.yaml              |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md
index 362b6b02ea90..1793d286e271 100644
--- a/packages/video_player/CHANGELOG.md
+++ b/packages/video_player/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.10.0+7
+
+* Android: Fix issue where buffering status in percentage instead of milliseconds
+
+* Android: Update buffering status everytime we notify for position change
+
 ## 0.10.0+6
 
 * Android: Fix missing call to `event.put("event", "completed");` which makes it possible to detect when the video is over.
diff --git a/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java b/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
index 0fdaa2572c92..1386e831ec46 100644
--- a/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
+++ b/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
@@ -157,12 +157,7 @@ public void onCancel(Object o) {
             public void onPlayerStateChanged(final boolean playWhenReady, final int playbackState) {
               super.onPlayerStateChanged(playWhenReady, playbackState);
               if (playbackState == Player.STATE_BUFFERING) {
-                Map<String, Object> event = new HashMap<>();
-                event.put("event", "bufferingUpdate");
-                List<Integer> range = Arrays.asList(0, exoPlayer.getBufferedPercentage());
-                // iOS supports a list of buffered ranges, so here is a list with a single range.
-                event.put("values", Collections.singletonList(range));
-                eventSink.success(event);
+                sendBufferingUpdate();
               } else if (playbackState == Player.STATE_READY) {
                 if (!isInitialized) {
                   isInitialized = true;
@@ -189,6 +184,15 @@ public void onPlayerError(final ExoPlaybackException error) {
       result.success(reply);
     }
 
+    private void sendBufferingUpdate() {
+      Map<String, Object> event = new HashMap<>();
+      event.put("event", "bufferingUpdate");
+      List<? extends Number> range = Arrays.asList(0, exoPlayer.getBufferedPosition());
+      // iOS supports a list of buffered ranges, so here is a list with a single range.
+      event.put("values", Collections.singletonList(range));
+      eventSink.success(event);
+    }
+
     @SuppressWarnings("deprecation")
     private static void setAudioAttributes(SimpleExoPlayer exoPlayer) {
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -390,6 +394,7 @@ private void onMethodCall(MethodCall call, Result result, long textureId, VideoP
         break;
       case "position":
         result.success(player.getPosition());
+        player.sendBufferingUpdate();
         break;
       case "dispose":
         player.dispose();
diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml
index 01b6a041c115..168a55448c9d 100644
--- a/packages/video_player/pubspec.yaml
+++ b/packages/video_player/pubspec.yaml
@@ -2,7 +2,7 @@ name: video_player
 description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
-version: 0.10.0+6
+version: 0.10.0+7
 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player
 
 flutter:

From 76165dd45053756126e4db63347412912ffed926 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 25 Apr 2019 17:12:29 -0700
Subject: [PATCH 370/410] [firebase_ml_vision] Update Firebase ML Vision
 documentation (#1539)

---
 packages/firebase_ml_vision/CHANGELOG.md |  4 ++++
 packages/firebase_ml_vision/README.md    | 27 +++++++++++++-----------
 packages/firebase_ml_vision/pubspec.yaml |  2 +-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 66bd7d3525dd..8b0ecf2dd12d 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.7.0+1
+
+* Update README to match latest version.
+
 ## 0.7.0
 
 * **Breaking Change** Unified and enhanced on-device and cloud image-labeling API.
diff --git a/packages/firebase_ml_vision/README.md b/packages/firebase_ml_vision/README.md
index 56c55f21a587..466b24e06062 100644
--- a/packages/firebase_ml_vision/README.md
+++ b/packages/firebase_ml_vision/README.md
@@ -13,7 +13,7 @@ For Flutter plugins for other Firebase products, see [FlutterFire.md](https://gi
 To use this plugin, add `firebase_ml_vision` as a [dependency in your pubspec.yaml file](https://flutter.io/platform-plugins/). You must also configure Firebase for each platform project: Android and iOS (see the example folder or https://codelabs.developers.google.com/codelabs/flutter-firebase/#4 for step by step details).
 
 ### Android
-If you're using the on-device `LabelDetector`, include the latest matching [ML Kit: Image Labeling](https://firebase.google.com/support/release-notes/android) dependency in your app-level build.gradle file.
+If you're using the on-device `ImageLabeler`, include the latest matching [ML Kit: Image Labeling](https://firebase.google.com/support/release-notes/android) dependency in your app-level build.gradle file.
 
 ```
 android {
@@ -40,6 +40,9 @@ Optional but recommended: If you use the on-device API, configure your app to au
 ```
 
 ### iOS
+Versions `0.7.0+` use the latest ML Kit for Firebase version which requires a minimum deployment
+target of 9.0. You can add the line `platform :ios, '9.0'` in your iOS project `Podfile`.
+
 If you're using one of the on-device APIs, include the corresponding ML Kit library model in your
 `Podfile`. Then run `pod update` in a terminal within the same directory as your `Podfile`.
 
@@ -67,17 +70,17 @@ Get an instance of a `FirebaseVisionDetector`.
 
 ```dart
 final BarcodeDetector barcodeDetector = FirebaseVision.instance.barcodeDetector();
-final CloudLabelDetector cloudLabelDetector = FirebaseVision.instance.cloudLabelDetector();
+final ImageLabeler cloudLabeler = FirebaseVision.instance.cloudImageLabeler();
 final FaceDetector faceDetector = FirebaseVision.instance.faceDetector();
-final LabelDetector labelDetector = FirebaseVision.instance.labelDetector();
+final ImageLabeler labeler = FirebaseVision.instance.imageLabeler();
 final TextRecognizer textRecognizer = FirebaseVision.instance.textRecognizer();
 ```
 
-You can also configure all detectors except `TextRecognizer` with desired options.
+You can also configure all detectors, except `TextRecognizer`, with desired options.
 
 ```dart
-final LabelDetector detector = FirebaseVision.instance.labelDetector(
-  LabelDetectorOptions(confidenceThreshold: 0.75),
+final ImageLabeler labeler = FirebaseVision.instance.imageLabler(
+  ImageLabelerOptions(confidenceThreshold: 0.75),
 );
 ```
 
@@ -85,9 +88,9 @@ final LabelDetector detector = FirebaseVision.instance.labelDetector(
 
 ```dart
 final List<Barcode> barcodes = await barcodeDetector.detectInImage(visionImage);
-final List<Label> labels = await cloudLabelDetector.detectInImage(visionImage);
+final List<ImageLabel> cloudLabels = await cloudLabeler.processImage(visionImage);
 final List<Face> faces = await faceDetector.processImage(visionImage);
-final List<Label> labels = await labelDetector.detectInImage(visionImage);
+final List<ImageLabel> labels = await labeler.processImage(visionImage);
 final VisionText visionText = await textRecognizer.processImage(visionImage);
 ```
 
@@ -150,8 +153,8 @@ for (Face face in faces) {
 c. Extract labels.
 
 ```dart
-for (Label label in labels) {
-  final String text = label.label;
+for (ImageLabel label in labels) {
+  final String text = label.text;
   final String entityId = label.entityId;
   final double confidence = label.confidence;
 }
@@ -162,8 +165,8 @@ d. Extract text.
 ```dart
 String text = visionText.text;
 for (TextBlock block in visionText.blocks) {
-  final Rectangle<int> boundingBox = block.boundingBox;
-  final List<Point<int>> cornerPoints = block.cornerPoints;
+  final Rect boundingBox = block.boundingBox;
+  final List<Offset> cornerPoints = block.cornerPoints;
   final String text = block.text;
   final List<RecognizedLanguage> languages = block.recognizedLanguages;
 
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index 89b2b26702d3..5f14a18ae478 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_ml_vision
 description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.7.0
+version: 0.7.0+1
 
 dependencies:
   flutter:

From f54590ffac5b98fe2f046cec1c47306d15358f27 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Thu, 25 Apr 2019 21:09:33 -0700
Subject: [PATCH 371/410] [video_player] Android: Fix ide warnings in
 video_player (#1542)

* [video_player] Android: Fix ide warnings in video_player

* fix format
---
 .../videoplayer/VideoPlayerPlugin.java        | 61 ++++++++++---------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java b/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
index 1386e831ec46..0be5e770101c 100644
--- a/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
+++ b/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
@@ -8,16 +8,16 @@
 import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF;
 
 import android.content.Context;
-import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Build;
+import android.util.LongSparseArray;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.Player.DefaultEventListener;
+import com.google.android.exoplayer2.Player.EventListener;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
@@ -52,8 +52,6 @@
 
 public class VideoPlayerPlugin implements MethodCallHandler {
 
-  private static final String TAG = "VideoPlayerPlugin";
-
   private static class VideoPlayer {
 
     private SimpleExoPlayer exoPlayer;
@@ -83,7 +81,7 @@ private static class VideoPlayer {
       Uri uri = Uri.parse(dataSource);
 
       DataSource.Factory dataSourceFactory;
-      if (uri.getScheme().equals("asset") || uri.getScheme().equals("file")) {
+      if (isFileOrAsset(uri)) {
         dataSourceFactory = new DefaultDataSourceFactory(context, "ExoPlayer");
       } else {
         dataSourceFactory =
@@ -101,6 +99,14 @@ private static class VideoPlayer {
       setupVideoPlayer(eventChannel, textureEntry, result);
     }
 
+    private static boolean isFileOrAsset(Uri uri) {
+      if (uri == null || uri.getScheme() == null) {
+        return false;
+      }
+      String scheme = uri.getScheme();
+      return scheme.equals("file") || scheme.equals("asset");
+    }
+
     private MediaSource buildMediaSource(
         Uri uri, DataSource.Factory mediaDataSourceFactory, Context context) {
       int type = Util.inferContentType(uri.getLastPathSegment());
@@ -151,11 +157,10 @@ public void onCancel(Object o) {
       setAudioAttributes(exoPlayer);
 
       exoPlayer.addListener(
-          new DefaultEventListener() {
+          new EventListener() {
 
             @Override
             public void onPlayerStateChanged(final boolean playWhenReady, final int playbackState) {
-              super.onPlayerStateChanged(playWhenReady, playbackState);
               if (playbackState == Player.STATE_BUFFERING) {
                 sendBufferingUpdate();
               } else if (playbackState == Player.STATE_READY) {
@@ -172,7 +177,6 @@ public void onPlayerStateChanged(final boolean playWhenReady, final int playback
 
             @Override
             public void onPlayerError(final ExoPlaybackException error) {
-              super.onPlayerError(error);
               if (eventSink != null) {
                 eventSink.error("VideoError", "Video player had error " + error, null);
               }
@@ -199,7 +203,7 @@ private static void setAudioAttributes(SimpleExoPlayer exoPlayer) {
         exoPlayer.setAudioAttributes(
             new AudioAttributes.Builder().setContentType(C.CONTENT_TYPE_MOVIE).build());
       } else {
-        exoPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+        exoPlayer.setAudioStreamType(C.STREAM_TYPE_MUSIC);
       }
     }
 
@@ -228,6 +232,7 @@ long getPosition() {
       return exoPlayer.getCurrentPosition();
     }
 
+    @SuppressWarnings("SuspiciousNameCombination")
     private void sendInitialized() {
       if (isInitialized) {
         Map<String, Object> event = new HashMap<>();
@@ -283,22 +288,26 @@ public boolean onViewDestroy(FlutterNativeView view) {
 
   private VideoPlayerPlugin(Registrar registrar) {
     this.registrar = registrar;
-    this.videoPlayers = new HashMap<>();
+    this.videoPlayers = new LongSparseArray<>();
   }
 
-  private final Map<Long, VideoPlayer> videoPlayers;
+  private final LongSparseArray<VideoPlayer> videoPlayers;
 
   private final Registrar registrar;
 
-  void onDestroy() {
+  private void disposeAllPlayers() {
+    for (int i = 0; i < videoPlayers.size(); i++) {
+      videoPlayers.valueAt(i).dispose();
+    }
+    videoPlayers.clear();
+  }
+
+  private void onDestroy() {
     // The whole FlutterView is being destroyed. Here we release resources acquired for all instances
     // of VideoPlayer. Once https://github.com/flutter/flutter/issues/19358 is resolved this may
     // be replaced with just asserting that videoPlayers.isEmpty().
     // https://github.com/flutter/flutter/issues/20989 tracks this.
-    for (VideoPlayer player : videoPlayers.values()) {
-      player.dispose();
-    }
-    videoPlayers.clear();
+    disposeAllPlayers();
   }
 
   @Override
@@ -310,10 +319,7 @@ public void onMethodCall(MethodCall call, Result result) {
     }
     switch (call.method) {
       case "init":
-        for (VideoPlayer player : videoPlayers.values()) {
-          player.dispose();
-        }
-        videoPlayers.clear();
+        disposeAllPlayers();
         break;
       case "create":
         {
@@ -327,10 +333,9 @@ public void onMethodCall(MethodCall call, Result result) {
             String assetLookupKey;
             if (call.argument("package") != null) {
               assetLookupKey =
-                  registrar.lookupKeyForAsset(
-                      (String) call.argument("asset"), (String) call.argument("package"));
+                  registrar.lookupKeyForAsset(call.argument("asset"), call.argument("package"));
             } else {
-              assetLookupKey = registrar.lookupKeyForAsset((String) call.argument("asset"));
+              assetLookupKey = registrar.lookupKeyForAsset(call.argument("asset"));
             }
             player =
                 new VideoPlayer(
@@ -343,11 +348,7 @@ public void onMethodCall(MethodCall call, Result result) {
           } else {
             player =
                 new VideoPlayer(
-                    registrar.context(),
-                    eventChannel,
-                    handle,
-                    (String) call.argument("uri"),
-                    result);
+                    registrar.context(), eventChannel, handle, call.argument("uri"), result);
             videoPlayers.put(handle.id(), player);
           }
           break;
@@ -372,11 +373,11 @@ public void onMethodCall(MethodCall call, Result result) {
   private void onMethodCall(MethodCall call, Result result, long textureId, VideoPlayer player) {
     switch (call.method) {
       case "setLooping":
-        player.setLooping((Boolean) call.argument("looping"));
+        player.setLooping(call.argument("looping"));
         result.success(null);
         break;
       case "setVolume":
-        player.setVolume((Double) call.argument("volume"));
+        player.setVolume(call.argument("volume"));
         result.success(null);
         break;
       case "play":

From a5cf69bb1d33458f484e8d76a04d3e221dcd361e Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 26 Apr 2019 13:55:15 -0700
Subject: [PATCH 372/410] [image_picker]fix license format. (#1544)

Fixing the LICENSE file format so our build tool is able to get the package names for each license in the image_picker.
When there are more licenses inside one package, we don't automatically assign the name for the license, and the names have to be explicitly set in the LICENSE file.
The format rule for LICENSE file is mentioned here.
---
 packages/image_picker/LICENSE | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/image_picker/LICENSE b/packages/image_picker/LICENSE
index a12803666d6d..63b955309caf 100755
--- a/packages/image_picker/LICENSE
+++ b/packages/image_picker/LICENSE
@@ -1,3 +1,5 @@
+image_picker
+
 Copyright 2017, the Flutter project authors. All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -25,6 +27,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+aFileChooser
 
                                  Apache License
                            Version 2.0, January 2004

From 8877eae82cb3e2e313fc6a689fb8aae15c7b0e00 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 29 Apr 2019 00:53:07 -0700
Subject: [PATCH 373/410] [firebase_ml_vision] [share] Fix analyzer warnings
 from const Rect constructor. (#1545)

* Fix analyzer complaining about const constructor for Rect
---
 packages/firebase_ml_vision/CHANGELOG.md         |  4 ++++
 packages/firebase_ml_vision/pubspec.yaml         |  2 +-
 .../test/firebase_ml_vision_test.dart            | 16 ++++++++++++++++
 packages/share/CHANGELOG.md                      |  4 ++++
 packages/share/pubspec.yaml                      |  2 +-
 packages/share/test/share_test.dart              |  2 ++
 6 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 8b0ecf2dd12d..1a6f41115e74 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.7.0+2
+
+* Fix analyzer warnings about `const Rect` in tests.
+
 ## 0.7.0+1
 
 * Update README to match latest version.
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index 5f14a18ae478..e743eacc9494 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_ml_vision
 description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.7.0+1
+version: 0.7.0+2
 
 dependencies:
   flutter:
diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index e3d06220c9e5..8eb34dab42c4 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -136,6 +136,8 @@ void main() {
 
         final Barcode barcode = barcodes[0];
         expect(barcode.valueType, BarcodeValueType.unknown);
+        // TODO(jackson): Use const Rect when available in minimum Flutter SDK
+        // ignore: prefer_const_constructors
         expect(barcode.boundingBox, Rect.fromLTWH(1.0, 2.0, 3.0, 4.0));
         expect(barcode.rawValue, 'hello:raw');
         expect(barcode.displayValue, 'hello:display');
@@ -562,6 +564,8 @@ void main() {
         ]);
 
         final Face face = faces[0];
+        // TODO(jackson): Use const Rect when available in minimum Flutter SDK
+        // ignore: prefer_const_constructors
         expect(face.boundingBox, Rect.fromLTWH(0.0, 1.0, 2.0, 3.0));
         expect(face.headEulerAngleY, 4.0);
         expect(face.headEulerAngleZ, 5.0);
@@ -756,6 +760,8 @@ void main() {
           expect(text.blocks, hasLength(2));
 
           TextBlock block = text.blocks[0];
+          // TODO(jackson): Use const Rect when available in minimum Flutter SDK
+          // ignore: prefer_const_constructors
           expect(block.boundingBox, Rect.fromLTWH(13.0, 14.0, 15.0, 16.0));
           expect(block.text, 'friend');
           expect(block.cornerPoints, const <Offset>[
@@ -768,6 +774,9 @@ void main() {
           expect(block.confidence, 0.5);
 
           block = text.blocks[1];
+          // ignore: prefer_const_constructors
+          // TODO(jackson): Use const Rect when available in minimum Flutter SDK
+          // ignore: prefer_const_constructors
           expect(block.boundingBox, Rect.fromLTWH(14.0, 13.0, 16.0, 15.0));
           expect(block.text, 'hello');
           expect(block.cornerPoints, const <Offset>[
@@ -783,6 +792,8 @@ void main() {
           final VisionText text = await recognizer.processImage(image);
 
           TextLine line = text.blocks[0].lines[0];
+          // TODO(jackson): Use const Rect when available in minimum Flutter SDK
+          // ignore: prefer_const_constructors
           expect(line.boundingBox, Rect.fromLTWH(5, 6, 7, 8));
           expect(line.text, 'friend');
           expect(line.cornerPoints, const <Offset>[
@@ -795,6 +806,8 @@ void main() {
           expect(line.confidence, 0.3);
 
           line = text.blocks[0].lines[1];
+          // TODO(jackson): Use const Rect when available in minimum Flutter SDK
+          // ignore: prefer_const_constructors
           expect(line.boundingBox, Rect.fromLTWH(8.0, 7.0, 4.0, 5.0));
           expect(line.text, 'how');
           expect(line.cornerPoints, const <Offset>[
@@ -810,6 +823,7 @@ void main() {
           final VisionText text = await recognizer.processImage(image);
 
           TextElement element = text.blocks[0].lines[0].elements[0];
+          // ignore: prefer_const_constructors
           expect(element.boundingBox, Rect.fromLTWH(1.0, 2.0, 3.0, 4.0));
           expect(element.text, 'hello');
           expect(element.cornerPoints, const <Offset>[
@@ -822,6 +836,8 @@ void main() {
           expect(element.confidence, 0.1);
 
           element = text.blocks[0].lines[0].elements[1];
+          // TODO(jackson): Use const Rect when available in minimum Flutter SDK
+          // ignore: prefer_const_constructors
           expect(element.boundingBox, Rect.fromLTWH(4.0, 3.0, 2.0, 1.0));
           expect(element.text, 'my');
           expect(element.cornerPoints, const <Offset>[
diff --git a/packages/share/CHANGELOG.md b/packages/share/CHANGELOG.md
index e66adfe2255e..03c25024cf34 100644
--- a/packages/share/CHANGELOG.md
+++ b/packages/share/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.1+1
+
+* Fix analyzer warnings about `const Rect` in tests.
+
 ## 0.6.1
 
 * Updated Android compileSdkVersion to 28 to match other plugins.
diff --git a/packages/share/pubspec.yaml b/packages/share/pubspec.yaml
index 0e74ad152ecf..dc5fdc70c2d7 100644
--- a/packages/share/pubspec.yaml
+++ b/packages/share/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for sharing content via the platform share UI, using
   the ACTION_SEND intent on Android and UIActivityViewController on iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/share
-version: 0.6.1
+version: 0.6.1+1
 
 flutter:
   plugin:
diff --git a/packages/share/test/share_test.dart b/packages/share/test/share_test.dart
index 5ea12626d353..66f7af7b5ad9 100644
--- a/packages/share/test/share_test.dart
+++ b/packages/share/test/share_test.dart
@@ -43,6 +43,8 @@ void main() {
   test('sharing origin sets the right params', () async {
     await Share.share(
       'some text to share',
+      // TODO(jackson): Use const Rect when available in minimum Flutter SDK
+      // ignore: prefer_const_constructors
       sharePositionOrigin: Rect.fromLTWH(1.0, 2.0, 3.0, 4.0),
     );
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.

From f20b12f099fd4c46816eb768439756bcaa59d818 Mon Sep 17 00:00:00 2001
From: creativecreatorormaybenot
 <19204050+creativecreatorormaybenot@users.noreply.github.com>
Date: Mon, 29 Apr 2019 10:27:15 +0000
Subject: [PATCH 374/410] [cloud_firestore] Fix wrong FieldValue (#1543)

* [cloud_firestore] Fix wrong FieldValue

* Update integration test to catch increment
---
 .../plugins/firebase/cloudfirestore/CloudFirestorePlugin.java | 4 ++--
 .../cloud_firestore/example/test_driver/cloud_firestore.dart  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
index 5f564b1c4753..1ad7d7856f0a 100644
--- a/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
+++ b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
@@ -654,8 +654,8 @@ final class FirestoreMessageCodec extends StandardMessageCodec {
   private static final byte DELETE = (byte) 134;
   private static final byte SERVER_TIMESTAMP = (byte) 135;
   private static final byte TIMESTAMP = (byte) 136;
-  private static final byte INCREMENT_INTEGER = (byte) 137;
-  private static final byte INCREMENT_DOUBLE = (byte) 138;
+  private static final byte INCREMENT_DOUBLE = (byte) 137;
+  private static final byte INCREMENT_INTEGER = (byte) 138;
 
   @Override
   protected void writeValue(ByteArrayOutputStream stream, Object value) {
diff --git a/packages/cloud_firestore/example/test_driver/cloud_firestore.dart b/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
index 322c979c88f3..4ff0a009ac6d 100644
--- a/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
+++ b/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
@@ -54,10 +54,10 @@ void main() {
       snapshot = await ref.get();
       expect(snapshot.data['message'], 2);
       await ref.updateData(<String, dynamic>{
-        'message': FieldValue.increment(40.0),
+        'message': FieldValue.increment(40.1),
       });
       snapshot = await ref.get();
-      expect(snapshot.data['message'], 42.0);
+      expect(snapshot.data['message'], 42.1);
       await ref.delete();
     });
 

From 1009cd7fdea01c6dbc70c7b599364c5665c9feb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= <linus@folkdatorn.se>
Date: Mon, 29 Apr 2019 12:53:54 +0200
Subject: [PATCH 375/410] [firebase_storage] Return error when failing to read
 file (#1504)

[firebase_storage] Return error when failing to read file and assert that file exists when calling putFile
---
 packages/firebase_storage/CHANGELOG.md                      | 4 ++++
 .../firebase_storage/ios/Classes/FirebaseStoragePlugin.m    | 6 ++++++
 packages/firebase_storage/lib/src/storage_reference.dart    | 1 +
 packages/firebase_storage/pubspec.yaml                      | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_storage/CHANGELOG.md b/packages/firebase_storage/CHANGELOG.md
index d4d4561182ad..8c08aed58be7 100644
--- a/packages/firebase_storage/CHANGELOG.md
+++ b/packages/firebase_storage/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.1+1
+
+* On iOS, gracefully handle the case of uploading a nonexistent file without crashing.
+
 ## 2.1.1
 
 * Added integration tests.
diff --git a/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m b/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
index ced82f7fce94..cab57c57b982 100644
--- a/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
+++ b/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
@@ -181,6 +181,12 @@ - (void)getReferenceFromUrl:(FlutterMethodCall *)call result:(FlutterResult)resu
 
 - (void)putFile:(FlutterMethodCall *)call result:(FlutterResult)result {
   NSData *data = [NSData dataWithContentsOfFile:call.arguments[@"filename"]];
+  if (data == nil) {
+    result([FlutterError errorWithCode:@"storage_error"
+                               message:@"Failed to read file"
+                               details:nil]);
+    return;
+  }
   [self put:data call:call result:result];
 }
 
diff --git a/packages/firebase_storage/lib/src/storage_reference.dart b/packages/firebase_storage/lib/src/storage_reference.dart
index 0325c9e33a85..f907c6e7e1b1 100644
--- a/packages/firebase_storage/lib/src/storage_reference.dart
+++ b/packages/firebase_storage/lib/src/storage_reference.dart
@@ -59,6 +59,7 @@ class StorageReference {
   /// Asynchronously uploads a file to the currently specified
   /// [StorageReference], with an optional [metadata].
   StorageUploadTask putFile(File file, [StorageMetadata metadata]) {
+    assert(file.existsSync());
     final _StorageFileUploadTask task =
         _StorageFileUploadTask._(file, _firebaseStorage, this, metadata);
     task._start();
diff --git a/packages/firebase_storage/pubspec.yaml b/packages/firebase_storage/pubspec.yaml
index ff2e6ef9af1d..8c9a1ba06c2e 100755
--- a/packages/firebase_storage/pubspec.yaml
+++ b/packages/firebase_storage/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Storage, a powerful, simple, and
   cost-effective object storage service for Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_storage
-version: 2.1.1
+version: 2.1.1+1
 
 flutter:
   plugin:

From 1a4d493f07066e899834fe24256b3ac852c0754d Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Mon, 29 Apr 2019 09:27:45 -0700
Subject: [PATCH 376/410] [in_app_purchase] Only fetch owned purchases (#1540)

Previously `GooglePlayConnection#queryPastPurchases` was calling through
to `BillingClientWrapper#queryPastPurchaseHistory`, which includes
purchases that are no longer owned. Switch that out for
`BillingClientWrapper#queryPurchases` instead since that's a better fit
for the unified API.

Also update the BillingClientWrapper docs to try and make this
distinction more clear.
---
 .../billing_client_wrapper.dart                     | 13 +++++++------
 .../src/in_app_purchase/google_play_connection.dart |  4 ++--
 .../google_play_connection_test.dart                |  3 +--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
index 501a34f504c1..2dac83003f57 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/billing_client_wrapper.dart
@@ -160,11 +160,11 @@ class BillingClient {
 
   /// Fetches recent purchases for the given [SkuType].
   ///
-  /// This only fetches whatever purchase history Play happens to have cached
-  /// in memory.
+  /// Unlike [queryPurchaseHistory], This does not make a network request and
+  /// does not return items that are no longer owned.
   ///
-  /// All purchase information should also be verified manually, with your server
-  /// if at all possible. See ["Verify a
+  /// All purchase information should also be verified manually, with your
+  /// server if at all possible. See ["Verify a
   /// purchase"](https://developer.android.com/google/play/billing/billing_library_overview#Verify).
   ///
   /// This wraps [`BillingClient#queryPurchases(String
@@ -178,8 +178,9 @@ class BillingClient {
 
   /// Fetches purchase history for the given [SkuType].
   ///
-  /// This makes a network request via Play and returns the most recent purchase
-  /// for each [SkuDetailsWrapper] of the given [SkuType].
+  /// Unlike [queryPurchases], this makes a network request via Play and returns
+  /// the most recent purchase for each [SkuDetailsWrapper] of the given
+  /// [SkuType] even if the item is no longer owned.
   ///
   /// All purchase information should also be verified manually, with your
   /// server if at all possible. See ["Verify a
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
index 81afd63bfff4..5f39dedcef22 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
@@ -78,8 +78,8 @@ class GooglePlayConnection
   Future<QueryPurchaseDetailsResponse> queryPastPurchases(
       {String applicationUserName}) async {
     final List<PurchasesResultWrapper> responses = await Future.wait([
-      billingClient.queryPurchaseHistory(SkuType.inapp),
-      billingClient.queryPurchaseHistory(SkuType.subs)
+      billingClient.queryPurchases(SkuType.inapp),
+      billingClient.queryPurchases(SkuType.subs)
     ]);
 
     Set errorCodeSet = responses
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index c0de97018d24..9d1313287903 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -120,8 +120,7 @@ void main() {
   });
 
   group('queryPurchaseDetails', () {
-    final String queryMethodName =
-        'BillingClient#queryPurchaseHistoryAsync(String, PurchaseHistoryResponseListener)';
+    const String queryMethodName = 'BillingClient#queryPurchases(String)';
     test('handles error', () async {
       final BillingResponse responseCode = BillingResponse.developerError;
       stubPlatform.addResponse(name: queryMethodName, value: <dynamic, dynamic>{

From 31038b93e05780091a03288abeb643a0bf342258 Mon Sep 17 00:00:00 2001
From: ml <github@matthewlloyd.net>
Date: Mon, 29 Apr 2019 16:37:58 -0400
Subject: [PATCH 377/410] [googlemaps_flutter] Support Color's alpha channel
 when converting to UIColor on iOS (#1549)

---
 packages/google_maps_flutter/CHANGELOG.md                  | 4 ++++
 packages/google_maps_flutter/ios/Classes/JsonConversions.m | 4 ++--
 packages/google_maps_flutter/pubspec.yaml                  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index e737f0deea7f..0262869131e8 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.10
+
+* Support Color's alpha channel when converting to UIColor on iOS.
+
 ## 0.5.9
 
 * BitmapDescriptor#fromBytes accounts for screen scale on ios.
diff --git a/packages/google_maps_flutter/ios/Classes/JsonConversions.m b/packages/google_maps_flutter/ios/Classes/JsonConversions.m
index ddec920211df..6381beaee8d2 100644
--- a/packages/google_maps_flutter/ios/Classes/JsonConversions.m
+++ b/packages/google_maps_flutter/ios/Classes/JsonConversions.m
@@ -37,11 +37,11 @@ + (NSArray*)positionToJson:(CLLocationCoordinate2D)position {
 }
 
 + (UIColor*)toColor:(NSNumber*)numberColor {
-  long value = [numberColor longValue];
+  unsigned long value = [numberColor unsignedLongValue];
   return [UIColor colorWithRed:((float)((value & 0xFF0000) >> 16)) / 255.0
                          green:((float)((value & 0xFF00) >> 8)) / 255.0
                           blue:((float)(value & 0xFF)) / 255.0
-                         alpha:1.0];
+                         alpha:((float)((value & 0xFF000000) >> 24)) / 255.0];
 }
 
 + (NSArray<CLLocation*>*)toPoints:(NSArray*)data {
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 22ac204a0bba..795270662043 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.9
+version: 0.5.10
 
 dependencies:
   flutter:

From 29d3a5b966ec00801e73f3a5ef5f79b90c01a341 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Mon, 29 Apr 2019 15:13:01 -0700
Subject: [PATCH 378/410] [video_player] Fix player initialization and other
 warnings (#1552)

* [video_player] Fix player initialization and other warnings

1. When a player has not initialized it's presentationSize is
   returned as CGSizeZero.

2. The enum type must be AVPlayerItemStatusFailed not AVPlayerStatusFailed

3. Fix a few other IDE warnings.

* update pubspec and changelog
---
 packages/video_player/CHANGELOG.md            |  7 +++
 .../ios/Classes/VideoPlayerPlugin.m           | 51 ++++++++++---------
 packages/video_player/pubspec.yaml            |  2 +-
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md
index 1793d286e271..e3e9d9d01691 100644
--- a/packages/video_player/CHANGELOG.md
+++ b/packages/video_player/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.10.0+8
+
+* iOS: Fix an issue where the player sends initialization message incorrectly.
+
+* Fix a few other IDE warnings.
+
+
 ## 0.10.0+7
 
 * Android: Fix issue where buffering status in percentage instead of milliseconds
diff --git a/packages/video_player/ios/Classes/VideoPlayerPlugin.m b/packages/video_player/ios/Classes/VideoPlayerPlugin.m
index 5554b21006a4..ded94ab499ea 100644
--- a/packages/video_player/ios/Classes/VideoPlayerPlugin.m
+++ b/packages/video_player/ios/Classes/VideoPlayerPlugin.m
@@ -39,7 +39,7 @@ @interface FLTVideoPlayer : NSObject <FlutterTexture, FlutterStreamHandler>
 @property(nonatomic) CGAffineTransform preferredTransform;
 @property(nonatomic, readonly) bool disposed;
 @property(nonatomic, readonly) bool isPlaying;
-@property(nonatomic, readonly) bool isLooping;
+@property(nonatomic) bool isLooping;
 @property(nonatomic, readonly) bool isInitialized;
 - (instancetype)initWithURL:(NSURL*)url frameUpdater:(FLTFrameUpdater*)frameUpdater;
 - (void)play;
@@ -97,6 +97,17 @@ - (void)addObservers:(AVPlayerItem*)item {
                                                 }];
 }
 
+static inline CGFloat radiansToDegrees(CGFloat radians) {
+  // Input range [-pi, pi] or [-180, 180]
+  CGFloat degrees = GLKMathRadiansToDegrees((float)radians);
+  if (degrees < 0) {
+    // Convert -90 to 270 and -180 to 180
+    return degrees + 360;
+  }
+  // Output degrees in between [0, 360[
+  return degrees;
+};
+
 - (AVMutableVideoComposition*)getVideoCompositionWithTransform:(CGAffineTransform)transform
                                                      withAsset:(AVAsset*)asset
                                                 withVideoTrack:(AVAssetTrack*)videoTrack {
@@ -113,8 +124,8 @@ - (AVMutableVideoComposition*)getVideoCompositionWithTransform:(CGAffineTransfor
   videoComposition.instructions = @[ instruction ];
 
   // If in portrait mode, switch the width and height of the video
-  float width = videoTrack.naturalSize.width;
-  float height = videoTrack.naturalSize.height;
+  CGFloat width = videoTrack.naturalSize.width;
+  CGFloat height = videoTrack.naturalSize.height;
   NSInteger rotationDegrees =
       (NSInteger)round(radiansToDegrees(atan2(_preferredTransform.b, _preferredTransform.a)));
   if (rotationDegrees == 90 || rotationDegrees == 270) {
@@ -183,7 +194,7 @@ - (instancetype)initWithPlayerItem:(AVPlayerItem*)item frameUpdater:(FLTFrameUpd
     if ([asset statusOfValueForKey:@"tracks" error:nil] == AVKeyValueStatusLoaded) {
       NSArray* tracks = [asset tracksWithMediaType:AVMediaTypeVideo];
       if ([tracks count] > 0) {
-        AVAssetTrack* videoTrack = [tracks objectAtIndex:0];
+        AVAssetTrack* videoTrack = tracks[0];
         void (^trackCompletionHandler)(void) = ^{
           if (self->_disposed) return;
           if ([videoTrack statusOfValueForKey:@"preferredTransform"
@@ -236,7 +247,7 @@ - (void)observeValueForKeyPath:(NSString*)path
   } else if (context == statusContext) {
     AVPlayerItem* item = (AVPlayerItem*)object;
     switch (item.status) {
-      case AVPlayerStatusFailed:
+      case AVPlayerItemStatusFailed:
         if (_eventSink != nil) {
           _eventSink([FlutterError
               errorWithCode:@"VideoError"
@@ -248,7 +259,6 @@ - (void)observeValueForKeyPath:(NSString*)path
       case AVPlayerItemStatusUnknown:
         break;
       case AVPlayerItemStatusReadyToPlay:
-        _isInitialized = true;
         [item addOutput:_videoOutput];
         [self sendInitialized];
         [self updatePlayingState];
@@ -284,23 +294,18 @@ - (void)updatePlayingState {
   _displayLink.paused = !_isPlaying;
 }
 
-static inline CGFloat radiansToDegrees(CGFloat radians) {
-  // Input range [-pi, pi] or [-180, 180]
-  CGFloat degrees = GLKMathRadiansToDegrees(radians);
-  if (degrees < 0) {
-    // Convert -90 to 270 and -180 to 180
-    return degrees + 360;
-  }
-  // Output degrees in between [0, 360[
-  return degrees;
-};
-
 - (void)sendInitialized {
-  if (_eventSink && _isInitialized) {
+  if (_eventSink && !_isInitialized) {
     CGSize size = [self.player currentItem].presentationSize;
     CGFloat width = size.width;
     CGFloat height = size.height;
 
+    // The player has not yet initialized.
+    if (height == CGSizeZero.height && width == CGSizeZero.width) {
+      return;
+    }
+
+    _isInitialized = true;
     _eventSink(@{
       @"event" : @"initialized",
       @"duration" : @([self duration]),
@@ -339,7 +344,7 @@ - (void)setIsLooping:(bool)isLooping {
 }
 
 - (void)setVolume:(double)volume {
-  _player.volume = (volume < 0.0) ? 0.0 : ((volume > 1.0) ? 1.0 : volume);
+  _player.volume = (float)((volume < 0.0) ? 0.0 : ((volume > 1.0) ? 1.0 : volume));
 }
 
 - (CVPixelBufferRef)copyPixelBuffer {
@@ -440,7 +445,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
 
     for (NSNumber* textureId in _players) {
       [_registry unregisterTexture:[textureId unsignedIntegerValue]];
-      [[_players objectForKey:textureId] dispose];
+      [_players[textureId] dispose];
     }
     [_players removeAllObjects];
     result(nil);
@@ -478,10 +483,10 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
       [player dispose];
       result(nil);
     } else if ([@"setLooping" isEqualToString:call.method]) {
-      [player setIsLooping:[[argsMap objectForKey:@"looping"] boolValue]];
+      [player setIsLooping:[argsMap[@"looping"] boolValue]];
       result(nil);
     } else if ([@"setVolume" isEqualToString:call.method]) {
-      [player setVolume:[[argsMap objectForKey:@"volume"] doubleValue]];
+      [player setVolume:[argsMap[@"volume"] doubleValue]];
       result(nil);
     } else if ([@"play" isEqualToString:call.method]) {
       [player play];
@@ -489,7 +494,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     } else if ([@"position" isEqualToString:call.method]) {
       result(@([player position]));
     } else if ([@"seekTo" isEqualToString:call.method]) {
-      [player seekTo:[[argsMap objectForKey:@"location"] intValue]];
+      [player seekTo:[argsMap[@"location"] intValue]];
       result(nil);
     } else if ([@"pause" isEqualToString:call.method]) {
       [player pause];
diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml
index 168a55448c9d..e469a120afa1 100644
--- a/packages/video_player/pubspec.yaml
+++ b/packages/video_player/pubspec.yaml
@@ -2,7 +2,7 @@ name: video_player
 description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
-version: 0.10.0+7
+version: 0.10.0+8
 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player
 
 flutter:

From 3830b028aaf3104b01921dc216573e5c000c8e75 Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Tue, 30 Apr 2019 12:46:11 -0700
Subject: [PATCH 379/410] [image_picker] set real extension instead always jpg
 (#1269)

---
 packages/image_picker/CHANGELOG.md            |  4 +++
 .../plugins/imagepicker/FileUtils.java        | 33 ++++++++++++++++++-
 packages/image_picker/pubspec.yaml            |  2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index f1e6bc5b513f..540898de1e1a 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.0+2
+
+* Android: images are saved with their real extension instead of always using `.jpg`.
+
 ## 0.6.0+1
 
 * Android: Using correct suffix syntax when picking image from remote url.
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
index a58dc9f92632..85995d890848 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
@@ -29,6 +29,7 @@
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.text.TextUtils;
+import android.webkit.MimeTypeMap;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -140,8 +141,9 @@ private static String getPathFromRemoteUri(final Context context, final Uri uri)
     OutputStream outputStream = null;
     boolean success = false;
     try {
+      String extension = getImageExtension(context, uri);
       inputStream = context.getContentResolver().openInputStream(uri);
-      file = File.createTempFile("image_picker", ".jpg", context.getCacheDir());
+      file = File.createTempFile("image_picker", extension, context.getCacheDir());
       outputStream = new FileOutputStream(file);
       if (inputStream != null) {
         copy(inputStream, outputStream);
@@ -165,6 +167,35 @@ private static String getPathFromRemoteUri(final Context context, final Uri uri)
     return success ? file.getPath() : null;
   }
 
+  /** @return extension of image with dot, or default .jpg if it none. */
+  private static String getImageExtension(Context context, Uri uriImage) {
+    String extension = null;
+    Cursor cursor = null;
+
+    try {
+      cursor =
+          context
+              .getContentResolver()
+              .query(uriImage, new String[] {MediaStore.MediaColumns.MIME_TYPE}, null, null, null);
+
+      if (cursor != null && cursor.moveToNext()) {
+        String mimeType = cursor.getString(0);
+
+        extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType);
+      }
+    } finally {
+      if (cursor != null) {
+        cursor.close();
+      }
+    }
+
+    if (extension == null) {
+      //default extension for matches the previous behavior of the plugin
+      extension = "jpg";
+    }
+    return "." + extension;
+  }
+
   private static void copy(InputStream in, OutputStream out) throws IOException {
     final byte[] buffer = new byte[4 * 1024];
     int bytesRead;
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 728435e44ac6..586d8ae3a45a 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.6.0+1
+version: 0.6.0+2
 
 flutter:
   plugin:

From 952270a510fd5832440f62091c1e8f2e141d60f9 Mon Sep 17 00:00:00 2001
From: Ivan <boytheprodigy@gmail.com>
Date: Tue, 30 Apr 2019 17:44:24 -0700
Subject: [PATCH 380/410] [google_maps_flutter] add My location button enabled
 option (#1350)

* add myLocationButtonEnabled option

* version

* add android test driver

* iOS test driver

* Add a couple more tests for initial value of myLocationButton

* Improve documentation
---
 packages/google_maps_flutter/CHANGELOG.md     |  4 +
 .../flutter/plugins/googlemaps/Convert.java   |  4 +
 .../plugins/googlemaps/GoogleMapBuilder.java  |  7 ++
 .../googlemaps/GoogleMapController.java       | 17 ++++
 .../googlemaps/GoogleMapOptionsSink.java      |  2 +
 .../example/lib/map_ui.dart                   | 15 +++
 .../test_driver/google_map_inspector.dart     |  4 +
 .../example/test_driver/google_maps.dart      | 96 +++++++++++++++++++
 .../ios/Classes/GoogleMapController.h         |  1 +
 .../ios/Classes/GoogleMapController.m         | 11 +++
 .../lib/src/google_map.dart                   | 19 ++++
 packages/google_maps_flutter/pubspec.yaml     |  2 +-
 .../test/fake_maps_controllers.dart           |  5 +
 .../test/google_map_test.dart                 | 30 ++++++
 14 files changed, 216 insertions(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 0262869131e8..aaadeacfc81a 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.11
+
+* Add myLocationButtonEnabled option.
+
 ## 0.5.10
 
 * Support Color's alpha channel when converting to UIColor on iOS.
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
index fa037ceda5a6..d26dcf81f5aa 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
@@ -277,6 +277,10 @@ static void interpretGoogleMapOptions(Object o, GoogleMapOptionsSink sink) {
     if (myLocationEnabled != null) {
       sink.setMyLocationEnabled(toBoolean(myLocationEnabled));
     }
+    final Object myLocationButtonEnabled = data.get("myLocationButtonEnabled");
+    if (myLocationButtonEnabled != null) {
+      sink.setMyLocationButtonEnabled(toBoolean(myLocationButtonEnabled));
+    }
   }
 
   /** Returns the dartMarkerId of the interpreted marker. */
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
index e8929740347b..cd1dce1012e7 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
@@ -15,6 +15,7 @@ class GoogleMapBuilder implements GoogleMapOptionsSink {
   private final GoogleMapOptions options = new GoogleMapOptions();
   private boolean trackCameraPosition = false;
   private boolean myLocationEnabled = false;
+  private boolean myLocationButtonEnabled = false;
   private Object initialMarkers;
   private Object initialPolylines;
 
@@ -24,6 +25,7 @@ GoogleMapController build(
         new GoogleMapController(id, context, state, registrar, options);
     controller.init();
     controller.setMyLocationEnabled(myLocationEnabled);
+    controller.setMyLocationButtonEnabled(myLocationButtonEnabled);
     controller.setTrackCameraPosition(trackCameraPosition);
     controller.setInitialMarkers(initialMarkers);
     controller.setInitialPolylines(initialPolylines);
@@ -89,6 +91,11 @@ public void setMyLocationEnabled(boolean myLocationEnabled) {
     this.myLocationEnabled = myLocationEnabled;
   }
 
+  @Override
+  public void setMyLocationButtonEnabled(boolean myLocationButtonEnabled) {
+    this.myLocationButtonEnabled = myLocationButtonEnabled;
+  }
+
   @Override
   public void setInitialMarkers(Object initialMarkers) {
     this.initialMarkers = initialMarkers;
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index fc921d08bdf8..71eeedd7f5e6 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -65,6 +65,7 @@ final class GoogleMapController
   private GoogleMap googleMap;
   private boolean trackCameraPosition = false;
   private boolean myLocationEnabled = false;
+  private boolean myLocationButtonEnabled = false;
   private boolean disposed = false;
   private final float density;
   private MethodChannel.Result mapReadyResult;
@@ -271,6 +272,11 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
           result.success(googleMap.getUiSettings().isRotateGesturesEnabled());
           break;
         }
+      case "map#isMyLocationButtonEnabled":
+        {
+          result.success(googleMap.getUiSettings().isMyLocationButtonEnabled());
+          break;
+        }
       default:
         result.notImplemented();
     }
@@ -452,6 +458,17 @@ public void setMyLocationEnabled(boolean myLocationEnabled) {
     }
   }
 
+  @Override
+  public void setMyLocationButtonEnabled(boolean myLocationButtonEnabled) {
+    if (this.myLocationButtonEnabled == myLocationButtonEnabled) {
+      return;
+    }
+    this.myLocationButtonEnabled = myLocationButtonEnabled;
+    if (googleMap != null) {
+      googleMap.getUiSettings().setMyLocationButtonEnabled(myLocationButtonEnabled);
+    }
+  }
+
   @Override
   public void setInitialMarkers(Object initialMarkers) {
     this.initialMarkers = (List<Object>) initialMarkers;
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
index 6fec3bc71b15..5c969987e48d 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
@@ -28,6 +28,8 @@ interface GoogleMapOptionsSink {
 
   void setMyLocationEnabled(boolean myLocationEnabled);
 
+  void setMyLocationButtonEnabled(boolean myLocationButtonEnabled);
+
   void setInitialMarkers(Object initialMarkers);
 
   void setInitialPolylines(Object initialPolylines);
diff --git a/packages/google_maps_flutter/example/lib/map_ui.dart b/packages/google_maps_flutter/example/lib/map_ui.dart
index d3661218578e..9da58c2b9535 100644
--- a/packages/google_maps_flutter/example/lib/map_ui.dart
+++ b/packages/google_maps_flutter/example/lib/map_ui.dart
@@ -48,6 +48,7 @@ class MapUiBodyState extends State<MapUiBody> {
   bool _tiltGesturesEnabled = true;
   bool _zoomGesturesEnabled = true;
   bool _myLocationEnabled = true;
+  bool _myLocationButtonEnabled = true;
 
   @override
   void initState() {
@@ -170,6 +171,18 @@ class MapUiBodyState extends State<MapUiBody> {
     );
   }
 
+  Widget _myLocationButtonToggler() {
+    return FlatButton(
+      child: Text(
+          '${_myLocationButtonEnabled ? 'disable' : 'enable'} my location button'),
+      onPressed: () {
+        setState(() {
+          _myLocationButtonEnabled = !_myLocationButtonEnabled;
+        });
+      },
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     final GoogleMap googleMap = GoogleMap(
@@ -184,6 +197,7 @@ class MapUiBodyState extends State<MapUiBody> {
       tiltGesturesEnabled: _tiltGesturesEnabled,
       zoomGesturesEnabled: _zoomGesturesEnabled,
       myLocationEnabled: _myLocationEnabled,
+      myLocationButtonEnabled: _myLocationButtonEnabled,
       onCameraMove: _updateCameraPosition,
     );
 
@@ -221,6 +235,7 @@ class MapUiBodyState extends State<MapUiBody> {
               _tiltToggler(),
               _zoomToggler(),
               _myLocationToggler(),
+              _myLocationButtonToggler(),
             ],
           ),
         ),
diff --git a/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart b/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
index 2edf67f3e6ba..e426772c723a 100644
--- a/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
+++ b/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
@@ -41,4 +41,8 @@ class GoogleMapInspector {
   Future<bool> isScrollGesturesEnabled() async {
     return await _channel.invokeMethod<bool>('map#isScrollGesturesEnabled');
   }
+
+  Future<bool> isMyLocationButtonEnabled() async {
+    return await _channel.invokeMethod<bool>('map#isMyLocationButtonEnabled');
+  }
 }
diff --git a/packages/google_maps_flutter/example/test_driver/google_maps.dart b/packages/google_maps_flutter/example/test_driver/google_maps.dart
index be13dbce90d6..a08eb89694c8 100644
--- a/packages/google_maps_flutter/example/test_driver/google_maps.dart
+++ b/packages/google_maps_flutter/example/test_driver/google_maps.dart
@@ -333,4 +333,100 @@ void main() {
     expect(firstVisibleRegion, isNot(secondVisibleRegion));
     expect(secondVisibleRegion.contains(newCenter), isTrue);
   });
+
+  test('testMyLocationButtonToggle', () async {
+    final Key key = GlobalKey();
+    final Completer<GoogleMapInspector> inspectorCompleter =
+        Completer<GoogleMapInspector>();
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        myLocationButtonEnabled: true,
+        myLocationEnabled: false,
+        onMapCreated: (GoogleMapController controller) {
+          final GoogleMapInspector inspector =
+              // ignore: invalid_use_of_visible_for_testing_member
+              GoogleMapInspector(controller.channel);
+          inspectorCompleter.complete(inspector);
+        },
+      ),
+    ));
+
+    final GoogleMapInspector inspector = await inspectorCompleter.future;
+    bool myLocationButtonEnabled = await inspector.isMyLocationButtonEnabled();
+    expect(myLocationButtonEnabled, true);
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        myLocationButtonEnabled: false,
+        myLocationEnabled: false,
+        onMapCreated: (GoogleMapController controller) {
+          fail("OnMapCreated should get called only once.");
+        },
+      ),
+    ));
+
+    myLocationButtonEnabled = await inspector.isMyLocationButtonEnabled();
+    expect(myLocationButtonEnabled, false);
+  });
+
+  test('testMyLocationButton initial value false', () async {
+    final Key key = GlobalKey();
+    final Completer<GoogleMapInspector> inspectorCompleter =
+        Completer<GoogleMapInspector>();
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        myLocationButtonEnabled: false,
+        myLocationEnabled: false,
+        onMapCreated: (GoogleMapController controller) {
+          final GoogleMapInspector inspector =
+              // ignore: invalid_use_of_visible_for_testing_member
+              GoogleMapInspector(controller.channel);
+          inspectorCompleter.complete(inspector);
+        },
+      ),
+    ));
+
+    final GoogleMapInspector inspector = await inspectorCompleter.future;
+    final bool myLocationButtonEnabled =
+        await inspector.isMyLocationButtonEnabled();
+    expect(myLocationButtonEnabled, false);
+  });
+
+  test('testMyLocationButton initial value true', () async {
+    final Key key = GlobalKey();
+    final Completer<GoogleMapInspector> inspectorCompleter =
+        Completer<GoogleMapInspector>();
+
+    await pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        myLocationButtonEnabled: true,
+        myLocationEnabled: false,
+        onMapCreated: (GoogleMapController controller) {
+          final GoogleMapInspector inspector =
+              // ignore: invalid_use_of_visible_for_testing_member
+              GoogleMapInspector(controller.channel);
+          inspectorCompleter.complete(inspector);
+        },
+      ),
+    ));
+
+    final GoogleMapInspector inspector = await inspectorCompleter.future;
+    final bool myLocationButtonEnabled =
+        await inspector.isMyLocationButtonEnabled();
+    expect(myLocationButtonEnabled, true);
+  });
 }
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
index 01063f6a2e80..f0c6cc4becdd 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
@@ -19,6 +19,7 @@
 - (void)setTrackCameraPosition:(BOOL)enabled;
 - (void)setZoomGesturesEnabled:(BOOL)enabled;
 - (void)setMyLocationEnabled:(BOOL)enabled;
+- (void)setMyLocationButtonEnabled:(BOOL)enabled;
 @end
 
 // Defines map overlay controllable from Flutter.
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index b15ab70331f3..47900ef8ac93 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -179,6 +179,9 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   } else if ([call.method isEqualToString:@"map#isScrollGesturesEnabled"]) {
     NSNumber* isScrollGesturesEnabled = @(_mapView.settings.scrollGestures);
     result(isScrollGesturesEnabled);
+  } else if ([call.method isEqualToString:@"map#isMyLocationButtonEnabled"]) {
+    NSNumber* isMyLocationButtonEnabled = @(_mapView.settings.myLocationButton);
+    result(isMyLocationButtonEnabled);
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -257,6 +260,10 @@ - (void)setMyLocationEnabled:(BOOL)enabled {
   _mapView.settings.myLocationButton = enabled;
 }
 
+- (void)setMyLocationButtonEnabled:(BOOL)enabled {
+  _mapView.settings.myLocationButton = enabled;
+}
+
 #pragma mark - GMSMapViewDelegate methods
 
 - (void)mapView:(GMSMapView*)mapView willMove:(BOOL)gesture {
@@ -439,4 +446,8 @@ static void InterpretMapOptions(NSDictionary* data, id<FLTGoogleMapOptionsSink>
   if (myLocationEnabled) {
     [sink setMyLocationEnabled:ToBool(myLocationEnabled)];
   }
+  NSNumber* myLocationButtonEnabled = data[@"myLocationButtonEnabled"];
+  if (myLocationButtonEnabled) {
+    [sink setMyLocationButtonEnabled:ToBool(myLocationButtonEnabled)];
+  }
 }
diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/lib/src/google_map.dart
index a3b394613e46..d115bce4a3c6 100644
--- a/packages/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/lib/src/google_map.dart
@@ -29,6 +29,7 @@ class GoogleMap extends StatefulWidget {
     this.zoomGesturesEnabled = true,
     this.tiltGesturesEnabled = true,
     this.myLocationEnabled = false,
+    this.myLocationButtonEnabled = true,
     this.markers,
     this.polylines,
     this.onCameraMoveStarted,
@@ -124,6 +125,19 @@ class GoogleMap extends StatefulWidget {
   /// when the map tries to turn on the My Location layer.
   final bool myLocationEnabled;
 
+  /// Enables or disables the my-location button.
+  ///
+  /// The my-location button causes the camera to move such that the user's
+  /// location is in the center of the map. If the button is enabled, it is
+  /// only shown when the my-location layer is enabled.
+  ///
+  /// By default, the my-location button is enabled (and hence shown when the
+  /// my-location layer is enabled).
+  ///
+  /// See also:
+  ///   * [myLocationEnabled] parameter.
+  final bool myLocationButtonEnabled;
+
   /// Which gestures should be consumed by the map.
   ///
   /// It is possible for other gesture recognizers to be competing with the map on pointer
@@ -271,6 +285,7 @@ class _GoogleMapOptions {
     this.trackCameraPosition,
     this.zoomGesturesEnabled,
     this.myLocationEnabled,
+    this.myLocationButtonEnabled,
   });
 
   static _GoogleMapOptions fromWidget(GoogleMap map) {
@@ -285,6 +300,7 @@ class _GoogleMapOptions {
       trackCameraPosition: map.onCameraMove != null,
       zoomGesturesEnabled: map.zoomGesturesEnabled,
       myLocationEnabled: map.myLocationEnabled,
+      myLocationButtonEnabled: map.myLocationButtonEnabled,
     );
   }
 
@@ -308,6 +324,8 @@ class _GoogleMapOptions {
 
   final bool myLocationEnabled;
 
+  final bool myLocationButtonEnabled;
+
   Map<String, dynamic> toMap() {
     final Map<String, dynamic> optionsMap = <String, dynamic>{};
 
@@ -327,6 +345,7 @@ class _GoogleMapOptions {
     addIfNonNull('zoomGesturesEnabled', zoomGesturesEnabled);
     addIfNonNull('trackCameraPosition', trackCameraPosition);
     addIfNonNull('myLocationEnabled', myLocationEnabled);
+    addIfNonNull('myLocationButtonEnabled', myLocationButtonEnabled);
 
     return optionsMap;
   }
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 795270662043..0a13b335de2f 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.10
+version: 0.5.11
 
 dependencies:
   flutter:
diff --git a/packages/google_maps_flutter/test/fake_maps_controllers.dart b/packages/google_maps_flutter/test/fake_maps_controllers.dart
index 8b793eb5112b..6fa62a84d321 100644
--- a/packages/google_maps_flutter/test/fake_maps_controllers.dart
+++ b/packages/google_maps_flutter/test/fake_maps_controllers.dart
@@ -43,6 +43,8 @@ class FakePlatformGoogleMap {
 
   bool myLocationEnabled;
 
+  bool myLocationButtonEnabled;
+
   Set<MarkerId> markerIdsToRemove;
 
   Set<Marker> markersToAdd;
@@ -215,6 +217,9 @@ class FakePlatformGoogleMap {
     if (options.containsKey('myLocationEnabled')) {
       myLocationEnabled = options['myLocationEnabled'];
     }
+    if (options.containsKey('myLocationButtonEnabled')) {
+      myLocationButtonEnabled = options['myLocationButtonEnabled'];
+    }
   }
 }
 
diff --git a/packages/google_maps_flutter/test/google_map_test.dart b/packages/google_maps_flutter/test/google_map_test.dart
index 833ae0cece0f..46cf132334ea 100644
--- a/packages/google_maps_flutter/test/google_map_test.dart
+++ b/packages/google_maps_flutter/test/google_map_test.dart
@@ -383,4 +383,34 @@ void main() {
 
     expect(platformGoogleMap.myLocationEnabled, true);
   });
+
+  testWidgets('Can update myLocationButtonEnabled',
+      (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          myLocationEnabled: false,
+        ),
+      ),
+    );
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.myLocationButtonEnabled, true);
+
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
+          myLocationButtonEnabled: false,
+        ),
+      ),
+    );
+
+    expect(platformGoogleMap.myLocationButtonEnabled, false);
+  });
 }

From fc5fab0e40050c1d9f0ae30792eacbe9af120606 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 1 May 2019 07:46:14 -0700
Subject: [PATCH 381/410] [cloud_functions] update Dart API to replace call
 with getHttpsCallable (#1520)

* Updated Dart API to replace `call` with `getHttpsCallable`.
* Added support for timeouts.
* Additional integration testing.
---
 packages/cloud_functions/CHANGELOG.md         |  6 ++
 packages/cloud_functions/android/build.gradle |  2 +-
 .../cloudfunctions/CloudFunctionsPlugin.java  |  5 ++
 .../cloud_functions/example/lib/main.dart     | 14 ++--
 .../example/test/cloud_functions.dart         | 50 ++++++++-----
 .../ios/Classes/CloudFunctionsPlugin.m        |  4 ++
 .../cloud_functions/lib/cloud_functions.dart  | 70 ++-----------------
 .../lib/src/cloud_functions.dart              | 42 +++++++++++
 .../lib/src/https_callable.dart               | 58 +++++++++++++++
 .../lib/src/https_callable_result.dart        | 13 ++++
 packages/cloud_functions/pubspec.yaml         |  2 +-
 .../test/cloud_functions_test.dart            | 18 +++--
 12 files changed, 187 insertions(+), 97 deletions(-)
 create mode 100644 packages/cloud_functions/lib/src/cloud_functions.dart
 create mode 100644 packages/cloud_functions/lib/src/https_callable.dart
 create mode 100644 packages/cloud_functions/lib/src/https_callable_result.dart

diff --git a/packages/cloud_functions/CHANGELOG.md b/packages/cloud_functions/CHANGELOG.md
index 6227fb626b3e..94256b51d08e 100644
--- a/packages/cloud_functions/CHANGELOG.md
+++ b/packages/cloud_functions/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.2.0
+
+* **Breaking change**. Updated Dart API to replace `call` with `getHttpsCallable`.
+* Added support for timeouts.
+* Additional integration testing.
+
 ## 0.1.2+1
 
 * Added a driver test.
diff --git a/packages/cloud_functions/android/build.gradle b/packages/cloud_functions/android/build.gradle
index 8352b929797d..289f7071d883 100644
--- a/packages/cloud_functions/android/build.gradle
+++ b/packages/cloud_functions/android/build.gradle
@@ -45,7 +45,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-functions:16.1.1'
+        api 'com.google.firebase:firebase-functions:16.3.0'
         implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/cloudfunctions/cloudfunctions/CloudFunctionsPlugin.java b/packages/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/cloudfunctions/cloudfunctions/CloudFunctionsPlugin.java
index c9d0da6026e6..81dfc98e6a95 100644
--- a/packages/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/cloudfunctions/cloudfunctions/CloudFunctionsPlugin.java
+++ b/packages/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/cloudfunctions/cloudfunctions/CloudFunctionsPlugin.java
@@ -19,6 +19,7 @@
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /** CloudFunctionsPlugin */
 public class CloudFunctionsPlugin implements MethodCallHandler {
@@ -44,6 +45,10 @@ public void onMethodCall(MethodCall call, final Result result) {
           functions = FirebaseFunctions.getInstance(app);
         }
         HttpsCallableReference httpsCallableReference = functions.getHttpsCallable(functionName);
+        Number timeoutMilliseconds = call.argument("timeoutMilliseconds");
+        if (timeoutMilliseconds != null) {
+          httpsCallableReference.setTimeout(timeoutMilliseconds.longValue(), TimeUnit.MILLISECONDS);
+        }
         httpsCallableReference
             .call(parameters)
             .addOnCompleteListener(
diff --git a/packages/cloud_functions/example/lib/main.dart b/packages/cloud_functions/example/lib/main.dart
index 205d45d2ffe6..ae88e469b6a4 100644
--- a/packages/cloud_functions/example/lib/main.dart
+++ b/packages/cloud_functions/example/lib/main.dart
@@ -18,6 +18,9 @@ class _MyAppState extends State<MyApp> {
 
   @override
   Widget build(BuildContext context) {
+    final HttpsCallable callable = CloudFunctions.instance
+        .getHttpsCallable(functionName: 'repeat')
+          ..timeout = const Duration(seconds: 30);
     return MaterialApp(
       home: Scaffold(
         appBar: AppBar(
@@ -33,17 +36,16 @@ class _MyAppState extends State<MyApp> {
                   child: const Text('SEND REQUEST'),
                   onPressed: () async {
                     try {
-                      final dynamic resp = await CloudFunctions.instance.call(
-                        functionName: 'repeat',
-                        parameters: <String, dynamic>{
+                      final HttpsCallableResult result = await callable.call(
+                        <String, dynamic>{
                           'message': 'hello world!',
                           'count': _responseCount,
                         },
                       );
-                      print(resp);
+                      print(result.data);
                       setState(() {
-                        _response = resp['repeat_message'];
-                        _responseCount = resp['repeat_count'];
+                        _response = result.data['repeat_message'];
+                        _responseCount = result.data['repeat_count'];
                       });
                     } on CloudFunctionsException catch (e) {
                       print('caught firebase functions exception');
diff --git a/packages/cloud_functions/example/test/cloud_functions.dart b/packages/cloud_functions/example/test/cloud_functions.dart
index aef74c5f960b..b6c350da786b 100644
--- a/packages/cloud_functions/example/test/cloud_functions.dart
+++ b/packages/cloud_functions/example/test/cloud_functions.dart
@@ -14,24 +14,38 @@ void main() {
 
   group('$CloudFunctions', () {
     test('call', () async {
-      final dynamic response = await CloudFunctions.instance.call(
-        functionName: 'repeat',
-        parameters: <String, dynamic>{
-          'message': 'foo',
-          'count': 1,
-        },
-      );
-      expect(response['repeat_message'], 'foo');
-      expect(response['repeat_count'], 2);
-      final dynamic response2 = await CloudFunctions.instance.call(
-        functionName: 'repeat',
-        parameters: <String, dynamic>{
-          'message': 'bar',
-          'count': 42,
-        },
-      );
-      expect(response2['repeat_message'], 'bar');
-      expect(response2['repeat_count'], 43);
+      // default timeout
+      final HttpsCallable callable =
+          CloudFunctions.instance.getHttpsCallable(functionName: 'repeat');
+      final HttpsCallableResult response =
+          await callable.call(<String, dynamic>{
+        'message': 'foo',
+        'count': 1,
+      });
+      expect(response.data['repeat_message'], 'foo');
+
+      // long custom timeout
+      callable.timeout = const Duration(days: 300);
+      expect(response.data['repeat_count'], 2);
+      final dynamic response2 = await callable.call(<String, dynamic>{
+        'message': 'bar',
+        'count': 42,
+      });
+      expect(response2.data['repeat_message'], 'bar');
+      expect(response2.data['repeat_count'], 43);
+
+      // impossibly short timeout
+      callable.timeout = const Duration(milliseconds: 1);
+      bool timedOut = false;
+      try {
+        await callable.call(<String, dynamic>{
+          'message': 'impossible',
+          'count': 9001,
+        });
+      } on CloudFunctionsException {
+        timedOut = true;
+      }
+      expect(timedOut, true);
     });
   });
 }
diff --git a/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m b/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m
index 192826cddcc5..1f60400e1387 100644
--- a/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m
+++ b/packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m
@@ -39,6 +39,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     NSObject *parameters = call.arguments[@"parameters"];
     NSString *appName = call.arguments[@"app"];
     NSString *region = call.arguments[@"region"];
+    NSNumber *timeoutMicroseconds = call.arguments[@"timeoutMicroseconds"];
     FIRApp *app = [FIRApp appNamed:appName];
     FIRFunctions *functions;
     if (region != nil && region != (id)[NSNull null]) {
@@ -47,6 +48,9 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
       functions = [FIRFunctions functionsForApp:app];
     }
     FIRHTTPSCallable *function = [functions HTTPSCallableWithName:functionName];
+    if (timeoutMicroseconds != nil && timeoutMicroseconds != [NSNull null]) {
+      [function setTimeoutInterval:(NSTimeInterval)timeoutMicroseconds.doubleValue / 1000000];
+    }
     [function callWithObject:parameters
                   completion:^(FIRHTTPSCallableResult *callableResult, NSError *error) {
                     if (error) {
diff --git a/packages/cloud_functions/lib/cloud_functions.dart b/packages/cloud_functions/lib/cloud_functions.dart
index 92ede2c33184..068d3040cfee 100644
--- a/packages/cloud_functions/lib/cloud_functions.dart
+++ b/packages/cloud_functions/lib/cloud_functions.dart
@@ -1,72 +1,14 @@
-// Copyright 2018, the Chromium project authors.  Please see the AUTHORS file
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:async';
+library cloud_functions;
 
+import 'dart:async';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
 
-class CloudFunctionsException implements Exception {
-  CloudFunctionsException._(this.code, this.message, this.details);
-
-  final String code;
-  final String message;
-  final dynamic details;
-}
-
-/// The entry point for accessing a CloudFunctions.
-///
-/// You can get an instance by calling [CloudFunctions.instance].
-class CloudFunctions {
-  CloudFunctions({FirebaseApp app, String region})
-      : _app = app ?? FirebaseApp.instance,
-        _region = region;
-
-  @visibleForTesting
-  static const MethodChannel channel = MethodChannel('cloud_functions');
-
-  static CloudFunctions _instance = CloudFunctions();
-
-  static CloudFunctions get instance => _instance;
-
-  final FirebaseApp _app;
-
-  final String _region;
-
-  /// Executes this Callable HTTPS trigger asynchronously.
-  ///
-  /// @param functionName The name of the callable function being triggered.
-  /// @param parameters Parameters to be passed to the callable function.
-  Future<dynamic> call(
-      {@required String functionName, Map<String, dynamic> parameters}) async {
-    try {
-      final dynamic response =
-          // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-          // https://github.com/flutter/flutter/issues/26431
-          // ignore: strong_mode_implicit_dynamic_method
-          await channel.invokeMethod('CloudFunctions#call', <String, dynamic>{
-        'app': _app.name,
-        'region': _region,
-        'functionName': functionName,
-        'parameters': parameters,
-      });
-      return response;
-    } on PlatformException catch (e) {
-      if (e.code == 'functionsError') {
-        final String code = e.details['code'];
-        final String message = e.details['message'];
-        final dynamic details = e.details['details'];
-        print('throwing firebase functions exception');
-        throw CloudFunctionsException._(code, message, details);
-      } else {
-        print('throwing generic exception');
-        throw Exception('Unable to call function ' + functionName);
-      }
-    } catch (e) {
-      print(e);
-      rethrow;
-    }
-  }
-}
+part 'src/cloud_functions.dart';
+part 'src/https_callable.dart';
+part 'src/https_callable_result.dart';
diff --git a/packages/cloud_functions/lib/src/cloud_functions.dart b/packages/cloud_functions/lib/src/cloud_functions.dart
new file mode 100644
index 000000000000..2edbf3016fb7
--- /dev/null
+++ b/packages/cloud_functions/lib/src/cloud_functions.dart
@@ -0,0 +1,42 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+part of cloud_functions;
+
+class CloudFunctionsException implements Exception {
+  CloudFunctionsException._(this.code, this.message, this.details);
+
+  final String code;
+  final String message;
+  final dynamic details;
+}
+
+/// The entry point for accessing a CloudFunctions.
+///
+/// You can get an instance by calling [CloudFunctions.instance].
+class CloudFunctions {
+  CloudFunctions({FirebaseApp app, String region})
+      : _app = app ?? FirebaseApp.instance,
+        _region = region;
+
+  @visibleForTesting
+  static const MethodChannel channel = MethodChannel('cloud_functions');
+
+  static CloudFunctions _instance = CloudFunctions();
+
+  static CloudFunctions get instance => _instance;
+
+  final FirebaseApp _app;
+
+  final String _region;
+
+  /// Executes this Callable HTTPS trigger asynchronously.
+  ///
+  /// @param functionName The name of the callable function being triggered.
+  /// @param parameters Parameters to be passed to the callable function.
+  HttpsCallable getHttpsCallable(
+      {@required String functionName, Map<String, dynamic> parameters}) {
+    return HttpsCallable._(this, functionName);
+  }
+}
diff --git a/packages/cloud_functions/lib/src/https_callable.dart b/packages/cloud_functions/lib/src/https_callable.dart
new file mode 100644
index 000000000000..09a8f578596f
--- /dev/null
+++ b/packages/cloud_functions/lib/src/https_callable.dart
@@ -0,0 +1,58 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+part of cloud_functions;
+
+/// A reference to a particular Callable HTTPS trigger in Cloud Functions.
+///
+/// You can get an instance by calling [CloudFunctions.instance.getHTTPSCallable].
+class HttpsCallable {
+  HttpsCallable._(this._cloudFunctions, this._functionName);
+
+  final CloudFunctions _cloudFunctions;
+  final String _functionName;
+
+  /// Executes this Callable HTTPS trigger asynchronously.
+  ///
+  /// The data passed into the trigger can be any of the following types:
+  ///
+  /// `null`
+  /// `String`
+  /// `num`
+  /// [List], where the contained objects are also one of these types.
+  /// [Map], where the values are also one of these types.
+  ///
+  /// The request to the Cloud Functions backend made by this method
+  /// automatically includes a Firebase Instance ID token to identify the app
+  /// instance. If a user is logged in with Firebase Auth, an auth ID token for
+  /// the user is also automatically included.
+  Future<HttpsCallableResult> call([dynamic parameters]) async {
+    try {
+      final MethodChannel channel = CloudFunctions.channel;
+      final dynamic response = await channel
+          .invokeMethod<dynamic>('CloudFunctions#call', <String, dynamic>{
+        'app': _cloudFunctions._app.name,
+        'region': _cloudFunctions._region,
+        'timeoutMicroseconds': timeout?.inMicroseconds,
+        'functionName': _functionName,
+        'parameters': parameters,
+      });
+      return HttpsCallableResult._(response);
+    } on PlatformException catch (e) {
+      if (e.code == 'functionsError') {
+        final String code = e.details['code'];
+        final String message = e.details['message'];
+        final dynamic details = e.details['details'];
+        throw CloudFunctionsException._(code, message, details);
+      } else {
+        throw Exception('Unable to call function ' + _functionName);
+      }
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  /// The timeout to use when calling the function. Defaults to 60 seconds.
+  Duration timeout;
+}
diff --git a/packages/cloud_functions/lib/src/https_callable_result.dart b/packages/cloud_functions/lib/src/https_callable_result.dart
new file mode 100644
index 000000000000..46f53f3a0e93
--- /dev/null
+++ b/packages/cloud_functions/lib/src/https_callable_result.dart
@@ -0,0 +1,13 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+part of cloud_functions;
+
+/// The result of calling a HttpsCallable function.
+class HttpsCallableResult {
+  HttpsCallableResult._(this.data);
+
+  /// Returns the data that was returned from the Callable HTTPS trigger.
+  final dynamic data;
+}
diff --git a/packages/cloud_functions/pubspec.yaml b/packages/cloud_functions/pubspec.yaml
index 3bb4751ac4c6..b4699ee43463 100644
--- a/packages/cloud_functions/pubspec.yaml
+++ b/packages/cloud_functions/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cloud_functions
 description: Flutter plugin for Cloud Functions.
-version: 0.1.2+1
+version: 0.2.0
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_functions
 
diff --git a/packages/cloud_functions/test/cloud_functions_test.dart b/packages/cloud_functions/test/cloud_functions_test.dart
index 8fc18cb6db65..10cb74ae02a6 100644
--- a/packages/cloud_functions/test/cloud_functions_test.dart
+++ b/packages/cloud_functions/test/cloud_functions_test.dart
@@ -28,10 +28,14 @@ void main() {
     });
 
     test('call', () async {
-      await CloudFunctions.instance.call(functionName: 'baz');
-      await CloudFunctions(
-              app: const FirebaseApp(name: '1337'), region: 'space')
-          .call(functionName: 'qux', parameters: <String, dynamic>{
+      await CloudFunctions.instance
+          .getHttpsCallable(functionName: 'baz')
+          .call();
+      final HttpsCallable callable =
+          CloudFunctions(app: const FirebaseApp(name: '1337'), region: 'space')
+              .getHttpsCallable(functionName: 'qux')
+                ..timeout = const Duration(days: 300);
+      await callable.call(<String, dynamic>{
         'quux': 'quuz',
       });
       expect(
@@ -43,6 +47,7 @@ void main() {
               'app': '[DEFAULT]',
               'region': null,
               'functionName': 'baz',
+              'timeoutMicroseconds': null,
               'parameters': null,
             },
           ),
@@ -52,9 +57,8 @@ void main() {
               'app': '1337',
               'region': 'space',
               'functionName': 'qux',
-              'parameters': <String, dynamic>{
-                'quux': 'quuz',
-              },
+              'timeoutMicroseconds': (const Duration(days: 300)).inMicroseconds,
+              'parameters': <String, dynamic>{'quux': 'quuz'},
             },
           ),
         ],

From 4ca5597d06df5ddc42ea4538445c24f8a0080655 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 1 May 2019 07:49:07 -0700
Subject: [PATCH 382/410] [cloud_firestore] support for pagination using
 startAtDocument, endAtDocument, etc. (#1476)

* CloudFirestore Plugin - add paging methods: startAtDocument, startAfterDocument, endAtDocument, endBeforeDocument

Co-Authored-By: collinjackson <jackson@google.com>
---
 packages/cloud_firestore/CHANGELOG.md         |   5 +
 .../cloudfirestore/CloudFirestorePlugin.java  |  47 +++++++
 .../example/test_driver/cloud_firestore.dart  |  67 +++++++++
 .../ios/Classes/CloudFirestorePlugin.m        |  85 ++++++++----
 packages/cloud_firestore/lib/src/query.dart   | 130 +++++++++++++++++-
 packages/cloud_firestore/pubspec.yaml         |   2 +-
 .../test/cloud_firestore_test.dart            | 105 +++++++++++++-
 7 files changed, 404 insertions(+), 37 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index d9f4f1583924..d987568f376f 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.10.1
+
+* Support for `startAtDocument`, `startAfterDocument`, `endAtDocument`, `endBeforeDocument`.
+* Added additional unit and integration tests.
+
 ## 0.10.0
 
 * Support for `FieldValue.increment`.
diff --git a/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
index 1ad7d7856f0a..9b7211326480 100644
--- a/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
+++ b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
@@ -21,6 +21,7 @@
 import com.google.firebase.firestore.DocumentReference;
 import com.google.firebase.firestore.DocumentSnapshot;
 import com.google.firebase.firestore.EventListener;
+import com.google.firebase.firestore.FieldPath;
 import com.google.firebase.firestore.FieldValue;
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.FirebaseFirestoreException;
@@ -92,6 +93,20 @@ private DocumentReference getDocumentReference(Map<String, Object> arguments) {
     return getFirestore(arguments).document(path);
   }
 
+  private Object[] getDocumentValues(Map<String, Object> document, List<List<Object>> orderBy) {
+    String documentId = (String) document.get("id");
+    Map<String, Object> documentData = (Map<String, Object>) document.get("data");
+    List<Object> data = new ArrayList<>();
+    if (orderBy != null) {
+      for (List<Object> order : orderBy) {
+        String orderByFieldName = (String) order.get(0);
+        data.add(documentData.get(orderByFieldName));
+      }
+    }
+    data.add(documentId);
+    return data.toArray();
+  }
+
   private Map<String, Object> parseQuerySnapshot(QuerySnapshot querySnapshot) {
     if (querySnapshot == null) return new HashMap<>();
     Map<String, Object> data = new HashMap<>();
@@ -187,12 +202,44 @@ private Query getQuery(Map<String, Object> arguments) {
       query = query.orderBy(orderByFieldName, direction);
     }
     @SuppressWarnings("unchecked")
+    Map<String, Object> startAtDocument = (Map<String, Object>) parameters.get("startAtDocument");
+    if (startAtDocument != null) {
+      query =
+          query
+              .orderBy(FieldPath.documentId())
+              .startAt(getDocumentValues(startAtDocument, orderBy));
+    }
+    @SuppressWarnings("unchecked")
+    Map<String, Object> startAfterDocument =
+        (Map<String, Object>) parameters.get("startAfterDocument");
+    if (startAfterDocument != null) {
+      query =
+          query
+              .orderBy(FieldPath.documentId())
+              .startAfter(getDocumentValues(startAfterDocument, orderBy));
+    }
+    @SuppressWarnings("unchecked")
     List<Object> startAt = (List<Object>) parameters.get("startAt");
     if (startAt != null) query = query.startAt(startAt.toArray());
     @SuppressWarnings("unchecked")
     List<Object> startAfter = (List<Object>) parameters.get("startAfter");
     if (startAfter != null) query = query.startAfter(startAfter.toArray());
     @SuppressWarnings("unchecked")
+    Map<String, Object> endAtDocument = (Map<String, Object>) parameters.get("endAtDocument");
+    if (endAtDocument != null) {
+      query =
+          query.orderBy(FieldPath.documentId()).endAt(getDocumentValues(endAtDocument, orderBy));
+    }
+    @SuppressWarnings("unchecked")
+    Map<String, Object> endBeforeDocument =
+        (Map<String, Object>) parameters.get("endBeforeDocument");
+    if (endBeforeDocument != null) {
+      query =
+          query
+              .orderBy(FieldPath.documentId())
+              .endBefore(getDocumentValues(endBeforeDocument, orderBy));
+    }
+    @SuppressWarnings("unchecked")
     List<Object> endAt = (List<Object>) parameters.get("endAt");
     if (endAt != null) query = query.endAt(endAt.toArray());
     @SuppressWarnings("unchecked")
diff --git a/packages/cloud_firestore/example/test_driver/cloud_firestore.dart b/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
index 4ff0a009ac6d..71ec266baf97 100644
--- a/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
+++ b/packages/cloud_firestore/example/test_driver/cloud_firestore.dart
@@ -85,5 +85,72 @@ void main() {
       expect(nonexistentSnapshot.data, null);
       expect(nonexistentSnapshot.exists, false);
     });
+
+    test('pagination', () async {
+      // Populate the database with two test documents
+      final CollectionReference messages = firestore.collection('messages');
+      final DocumentReference doc1 = messages.document();
+      // Use document ID as a unique identifier to ensure that we don't
+      // collide with other tests running against this database.
+      final String testRun = doc1.documentID;
+      await doc1.setData(<String, dynamic>{
+        'message': 'pagination testing1',
+        'test_run': testRun,
+        'created_at': FieldValue.serverTimestamp(),
+      });
+      final DocumentSnapshot snapshot1 = await doc1.get();
+      final DocumentReference doc2 = messages.document();
+      await doc2.setData(<String, dynamic>{
+        'message': 'pagination testing2',
+        'test_run': testRun,
+        'created_at': FieldValue.serverTimestamp(),
+      });
+      final DocumentSnapshot snapshot2 = await doc2.get();
+
+      QuerySnapshot snapshot;
+      List<DocumentSnapshot> results;
+
+      // startAtDocument
+      snapshot = await messages
+          .where('test_run', isEqualTo: testRun)
+          .startAtDocument(snapshot1)
+          .getDocuments();
+      results = snapshot.documents;
+      expect(results.length, 2);
+      expect(results[0].data['message'], 'pagination testing1');
+      expect(results[1].data['message'], 'pagination testing2');
+
+      // startAfterDocument
+      snapshot = await messages
+          .where('test_run', isEqualTo: testRun)
+          .startAfterDocument(snapshot1)
+          .getDocuments();
+      results = snapshot.documents;
+      expect(results.length, 1);
+      expect(results[0].data['message'], 'pagination testing2');
+
+      // endAtDocument
+      snapshot = await messages
+          .where('test_run', isEqualTo: testRun)
+          .endAtDocument(snapshot2)
+          .getDocuments();
+      results = snapshot.documents;
+      expect(results.length, 2);
+      expect(results[0].data['message'], 'pagination testing1');
+      expect(results[1].data['message'], 'pagination testing2');
+
+      // endBeforeDocument
+      snapshot = await messages
+          .where('test_run', isEqualTo: testRun)
+          .endBeforeDocument(snapshot2)
+          .getDocuments();
+      results = snapshot.documents;
+      expect(results.length, 1);
+      expect(results[0].data['message'], 'pagination testing1');
+
+      // Clean up
+      await doc1.delete();
+      await doc2.delete();
+    });
   });
 }
diff --git a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
index da821e182e60..2ac51343725b 100644
--- a/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
@@ -14,16 +14,31 @@
                              details:error.localizedDescription];
 }
 
-FIRFirestore *getFirestore(NSDictionary *arguments) {
+static FIRFirestore *getFirestore(NSDictionary *arguments) {
   FIRApp *app = [FIRApp appNamed:arguments[@"app"]];
   return [FIRFirestore firestoreForApp:app];
 }
 
-FIRDocumentReference *getDocumentReference(NSDictionary *arguments) {
+static FIRDocumentReference *getDocumentReference(NSDictionary *arguments) {
   return [getFirestore(arguments) documentWithPath:arguments[@"path"]];
 }
 
-FIRQuery *getQuery(NSDictionary *arguments) {
+static NSArray *getDocumentValues(NSDictionary *document, NSArray *orderBy) {
+  NSMutableArray *values = [[NSMutableArray alloc] init];
+  NSString *documentId = document[@"id"];
+  NSDictionary *documentData = document[@"data"];
+  if (orderBy) {
+    for (id item in orderBy) {
+      NSArray *orderByParameters = item;
+      NSString *fieldName = orderByParameters[0];
+      [values addObject:[documentData objectForKey:fieldName]];
+    }
+  }
+  [values addObject:documentId];
+  return values;
+}
+
+static FIRQuery *getQuery(NSDictionary *arguments) {
   FIRQuery *query = [getFirestore(arguments) collectionWithPath:arguments[@"path"]];
   NSDictionary *parameters = arguments[@"parameters"];
   NSArray *whereConditions = parameters[@"where"];
@@ -55,8 +70,7 @@
   }
   NSArray *orderBy = parameters[@"orderBy"];
   if (orderBy) {
-    for (id item in orderBy) {
-      NSArray *orderByParameters = item;
+    for (NSArray *orderByParameters in orderBy) {
       NSString *fieldName = orderByParameters[0];
       NSNumber *descending = orderByParameters[1];
       query = [query queryOrderedByField:fieldName descending:[descending boolValue]];
@@ -67,25 +81,45 @@
     NSArray *startAtValues = startAt;
     query = [query queryStartingAtValues:startAtValues];
   }
+  id startAtDocument = parameters[@"startAtDocument"];
+  if (startAtDocument) {
+    query = [query queryOrderedByFieldPath:FIRFieldPath.documentID descending:NO];
+    query = [query queryStartingAtValues:getDocumentValues(startAtDocument, orderBy)];
+  }
   id startAfter = parameters[@"startAfter"];
   if (startAfter) {
     NSArray *startAfterValues = startAfter;
     query = [query queryStartingAfterValues:startAfterValues];
   }
+  id startAfterDocument = parameters[@"startAfterDocument"];
+  if (startAfterDocument) {
+    query = [query queryOrderedByFieldPath:FIRFieldPath.documentID descending:NO];
+    query = [query queryStartingAfterValues:getDocumentValues(startAfterDocument, orderBy)];
+  }
   id endAt = parameters[@"endAt"];
   if (endAt) {
     NSArray *endAtValues = endAt;
     query = [query queryEndingAtValues:endAtValues];
   }
+  id endAtDocument = parameters[@"endAtDocument"];
+  if (endAtDocument) {
+    query = [query queryOrderedByFieldPath:FIRFieldPath.documentID descending:NO];
+    query = [query queryEndingAtValues:getDocumentValues(endAtDocument, orderBy)];
+  }
   id endBefore = parameters[@"endBefore"];
   if (endBefore) {
     NSArray *endBeforeValues = endBefore;
     query = [query queryEndingBeforeValues:endBeforeValues];
   }
+  id endBeforeDocument = parameters[@"endBeforeDocument"];
+  if (endBeforeDocument) {
+    query = [query queryOrderedByFieldPath:FIRFieldPath.documentID descending:NO];
+    query = [query queryEndingBeforeValues:getDocumentValues(endBeforeDocument, orderBy)];
+  }
   return query;
 }
 
-NSDictionary *parseQuerySnapshot(FIRQuerySnapshot *snapshot) {
+static NSDictionary *parseQuerySnapshot(FIRQuerySnapshot *snapshot) {
   NSMutableArray *paths = [NSMutableArray array];
   NSMutableArray *documents = [NSMutableArray array];
   NSMutableArray *metadatas = [NSMutableArray array];
@@ -308,6 +342,7 @@ - (instancetype)init {
 }
 
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
+  __weak __typeof__(self) weakSelf = self;
   void (^defaultCompletionBlock)(NSError *) = ^(NSError *error) {
     result(getFlutterError(error));
   };
@@ -321,12 +356,14 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
 
           dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
 
-          [self.channel invokeMethod:@"DoTransaction"
-                           arguments:call.arguments
-                              result:^(id doTransactionResult) {
-                                self->transactionResults[transactionId] = doTransactionResult;
-                                dispatch_semaphore_signal(semaphore);
-                              }];
+          [weakSelf.channel invokeMethod:@"DoTransaction"
+                               arguments:call.arguments
+                                  result:^(id doTransactionResult) {
+                                    FLTCloudFirestorePlugin *currentSelf = weakSelf;
+                                    currentSelf->transactionResults[transactionId] =
+                                        doTransactionResult;
+                                    dispatch_semaphore_signal(semaphore);
+                                  }];
 
           dispatch_semaphore_wait(
               semaphore,
@@ -445,7 +482,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
           }
           NSMutableDictionary *arguments = [parseQuerySnapshot(snapshot) mutableCopy];
           [arguments setObject:handle forKey:@"handle"];
-          [self.channel invokeMethod:@"QuerySnapshot" arguments:arguments];
+          [weakSelf.channel invokeMethod:@"QuerySnapshot" arguments:arguments];
         }];
     _listeners[handle] = listener;
     result(handle);
@@ -458,17 +495,17 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
             result(getFlutterError(error));
             return;
           }
-          [self.channel invokeMethod:@"DocumentSnapshot"
-                           arguments:@{
-                             @"handle" : handle,
-                             @"path" : snapshot ? snapshot.reference.path : [NSNull null],
-                             @"data" : snapshot && snapshot.exists ? snapshot.data : [NSNull null],
-                             @"metadata" : snapshot ? @{
-                               @"hasPendingWrites" : @(snapshot.metadata.hasPendingWrites),
-                               @"isFromCache" : @(snapshot.metadata.isFromCache),
-                             }
-                                                    : [NSNull null],
-                           }];
+          [weakSelf.channel invokeMethod:@"DocumentSnapshot"
+                               arguments:@{
+                                 @"handle" : handle,
+                                 @"path" : snapshot ? snapshot.reference.path : [NSNull null],
+                                 @"data" : snapshot.exists ? snapshot.data : [NSNull null],
+                                 @"metadata" : snapshot ? @{
+                                   @"hasPendingWrites" : @(snapshot.metadata.hasPendingWrites),
+                                   @"isFromCache" : @(snapshot.metadata.isFromCache),
+                                 }
+                                                        : [NSNull null],
+                               }];
         }];
     _listeners[handle] = listener;
     result(handle);
diff --git a/packages/cloud_firestore/lib/src/query.dart b/packages/cloud_firestore/lib/src/query.dart
index dc35082a87fc..1fa1ab2d1434 100644
--- a/packages/cloud_firestore/lib/src/query.dart
+++ b/packages/cloud_firestore/lib/src/query.dart
@@ -80,7 +80,7 @@ class Query {
 
   /// Fetch the documents for this query
   Future<QuerySnapshot> getDocuments() async {
-    final Map<String, dynamic> data =
+    final Map<dynamic, dynamic> data =
         await Firestore.channel.invokeMapMethod<String, dynamic>(
       'Query#getDocuments',
       <String, dynamic>{
@@ -162,16 +162,71 @@ class Query {
     return _copyWithParameters(<String, dynamic>{'orderBy': orders});
   }
 
-  /// Takes a list of [values], creates and returns a new [Query] that starts after
-  /// the provided fields relative to the order of the query.
+  /// Creates and returns a new [Query] that starts after the provided document
+  /// (exclusive). The starting position is relative to the order of the query.
+  /// The document must contain all of the fields provided in the orderBy of
+  /// this query.
+  ///
+  /// Cannot be used in combination with [startAtDocument], [startAt], or
+  /// [startAfter].
+  ///
+  /// See also:
+  ///  * [endAfterDocument] for a query that ends after a document.
+  ///  * [startAtDocument] for a query that starts at a document.
+  ///  * [endAtDocument] for a query that ends at a document.
+  Query startAfterDocument(DocumentSnapshot documentSnapshot) {
+    assert(documentSnapshot != null);
+    assert(!_parameters.containsKey('startAfter'));
+    assert(!_parameters.containsKey('startAt'));
+    assert(!_parameters.containsKey('startAfterDocument'));
+    assert(!_parameters.containsKey('startAtDocument'));
+    return _copyWithParameters(<String, dynamic>{
+      'startAfterDocument': <String, dynamic>{
+        'id': documentSnapshot.documentID,
+        'data': documentSnapshot.data
+      }
+    });
+  }
+
+  /// Creates and returns a new [Query] that starts at the provided document
+  /// (inclusive). The starting position is relative to the order of the query.
+  /// The document must contain all of the fields provided in the orderBy of
+  /// this query.
+  ///
+  /// Cannot be used in combination with [startAfterDocument], [startAfter], or
+  /// [startAt].
+  ///
+  /// See also:
+  ///  * [startAfterDocument] for a query that starts after a document.
+  ///  * [endAtDocument] for a query that ends at a document.
+  ///  * [endBeforeDocument] for a query that ends before a document.
+  Query startAtDocument(DocumentSnapshot documentSnapshot) {
+    assert(documentSnapshot != null);
+    assert(!_parameters.containsKey('startAfter'));
+    assert(!_parameters.containsKey('startAt'));
+    assert(!_parameters.containsKey('startAfterDocument'));
+    assert(!_parameters.containsKey('startAtDocument'));
+    return _copyWithParameters(<String, dynamic>{
+      'startAtDocument': <String, dynamic>{
+        'id': documentSnapshot.documentID,
+        'data': documentSnapshot.data
+      },
+    });
+  }
+
+  /// Takes a list of [values], creates and returns a new [Query] that starts
+  /// after the provided fields relative to the order of the query.
   ///
   /// The [values] must be in order of [orderBy] filters.
   ///
-  /// Cannot be used in combination with [startAt].
+  /// Cannot be used in combination with [startAt], [startAfterDocument], or
+  /// [startAtDocument].
   Query startAfter(List<dynamic> values) {
     assert(values != null);
     assert(!_parameters.containsKey('startAfter'));
     assert(!_parameters.containsKey('startAt'));
+    assert(!_parameters.containsKey('startAfterDocument'));
+    assert(!_parameters.containsKey('startAtDocument'));
     return _copyWithParameters(<String, dynamic>{'startAfter': values});
   }
 
@@ -180,37 +235,98 @@ class Query {
   ///
   /// The [values] must be in order of [orderBy] filters.
   ///
-  /// Cannot be used in combination with [startAfter].
+  /// Cannot be used in combination with [startAfter], [startAfterDocument],
+  /// or [startAtDocument].
   Query startAt(List<dynamic> values) {
     assert(values != null);
     assert(!_parameters.containsKey('startAfter'));
     assert(!_parameters.containsKey('startAt'));
+    assert(!_parameters.containsKey('startAfterDocument'));
+    assert(!_parameters.containsKey('startAtDocument'));
     return _copyWithParameters(<String, dynamic>{'startAt': values});
   }
 
+  /// Creates and returns a new [Query] that ends at the provided document
+  /// (inclusive). The end position is relative to the order of the query.
+  /// The document must contain all of the fields provided in the orderBy of
+  /// this query.
+  ///
+  /// Cannot be used in combination with [endBefore], [endBeforeDocument], or
+  /// [endAt].
+  ///
+  /// See also:
+  ///  * [startAfterDocument] for a query that starts after a document.
+  ///  * [startAtDocument] for a query that starts at a document.
+  ///  * [endBeforeDocument] for a query that ends before a document.
+  Query endAtDocument(DocumentSnapshot documentSnapshot) {
+    assert(documentSnapshot != null);
+    assert(!_parameters.containsKey('endBefore'));
+    assert(!_parameters.containsKey('endAt'));
+    assert(!_parameters.containsKey('endBeforeDocument'));
+    assert(!_parameters.containsKey('endAtDocument'));
+    return _copyWithParameters(<String, dynamic>{
+      'endAtDocument': <String, dynamic>{
+        'id': documentSnapshot.documentID,
+        'data': documentSnapshot.data
+      },
+    });
+  }
+
   /// Takes a list of [values], creates and returns a new [Query] that ends at the
   /// provided fields relative to the order of the query.
   ///
   /// The [values] must be in order of [orderBy] filters.
   ///
-  /// Cannot be used in combination with [endBefore].
+  /// Cannot be used in combination with [endBefore], [endBeforeDocument], or
+  /// [endAtDocument].
   Query endAt(List<dynamic> values) {
     assert(values != null);
     assert(!_parameters.containsKey('endBefore'));
     assert(!_parameters.containsKey('endAt'));
+    assert(!_parameters.containsKey('endBeforeDocument'));
+    assert(!_parameters.containsKey('endAtDocument'));
     return _copyWithParameters(<String, dynamic>{'endAt': values});
   }
 
+  /// Creates and returns a new [Query] that ends before the provided document
+  /// (exclusive). The end position is relative to the order of the query.
+  /// The document must contain all of the fields provided in the orderBy of
+  /// this query.
+  ///
+  /// Cannot be used in combination with [endAt], [endBefore], or
+  /// [endAtDocument].
+  ///
+  /// See also:
+  ///  * [startAfterDocument] for a query that starts after document.
+  ///  * [startAtDocument] for a query that starts at a document.
+  ///  * [endAtDocument] for a query that ends at a document.
+  Query endBeforeDocument(DocumentSnapshot documentSnapshot) {
+    assert(documentSnapshot != null);
+    assert(!_parameters.containsKey('endBefore'));
+    assert(!_parameters.containsKey('endAt'));
+    assert(!_parameters.containsKey('endBeforeDocument'));
+    assert(!_parameters.containsKey('endAtDocument'));
+    return _copyWithParameters(<String, dynamic>{
+      'endBeforeDocument': <String, dynamic>{
+        'id': documentSnapshot.documentID,
+        'data': documentSnapshot.data,
+      },
+    });
+  }
+
   /// Takes a list of [values], creates and returns a new [Query] that ends before
   /// the provided fields relative to the order of the query.
   ///
   /// The [values] must be in order of [orderBy] filters.
   ///
-  /// Cannot be used in combination with [endAt].
+  /// Cannot be used in combination with [endAt], [endBeforeDocument], or
+  /// [endBeforeDocument]
   Query endBefore(List<dynamic> values) {
     assert(values != null);
     assert(!_parameters.containsKey('endBefore'));
     assert(!_parameters.containsKey('endAt'));
+    assert(!_parameters.containsKey('endBeforeDocument'));
+    assert(!_parameters.containsKey('endAtDocument'));
     return _copyWithParameters(<String, dynamic>{'endBefore': values});
   }
 
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 658f5a1606f6..b7ea9791c35a 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.10.0
+version: 0.10.1
 
 flutter:
   plugin:
diff --git a/packages/cloud_firestore/test/cloud_firestore_test.dart b/packages/cloud_firestore/test/cloud_firestore_test.dart
index 6bb5bd5ad8c6..4dc145313c1d 100755
--- a/packages/cloud_firestore/test/cloud_firestore_test.dart
+++ b/packages/cloud_firestore/test/cloud_firestore_test.dart
@@ -552,8 +552,46 @@ void main() {
 
     group('Query', () {
       test('getDocuments', () async {
-        final QuerySnapshot snapshot = await collectionReference.getDocuments();
-        final DocumentSnapshot document = snapshot.documents.first;
+        QuerySnapshot snapshot = await collectionReference.getDocuments();
+        DocumentSnapshot document = snapshot.documents.first;
+        expect(document.documentID, equals('0'));
+        expect(document.reference.path, equals('foo/0'));
+        expect(document.data, equals(kMockDocumentSnapshotData));
+
+        // startAtDocument
+        snapshot =
+            await collectionReference.startAtDocument(document).getDocuments();
+        document = snapshot.documents.first;
+        expect(document.documentID, equals('0'));
+        expect(document.reference.path, equals('foo/0'));
+        expect(document.data, equals(kMockDocumentSnapshotData));
+
+        // startAfterDocument
+        snapshot = await collectionReference
+            .startAfterDocument(document)
+            .getDocuments();
+        document = snapshot.documents.first;
+        expect(document.documentID, equals('0'));
+        expect(document.reference.path, equals('foo/0'));
+        expect(document.data, equals(kMockDocumentSnapshotData));
+
+        // endAtDocument
+        snapshot =
+            await collectionReference.endAtDocument(document).getDocuments();
+        document = snapshot.documents.first;
+        expect(document.documentID, equals('0'));
+        expect(document.reference.path, equals('foo/0'));
+        expect(document.data, equals(kMockDocumentSnapshotData));
+
+        // endBeforeDocument
+        snapshot = await collectionReference
+            .endBeforeDocument(document)
+            .getDocuments();
+        document = snapshot.documents.first;
+        expect(document.documentID, equals('0'));
+        expect(document.reference.path, equals('foo/0'));
+        expect(document.data, equals(kMockDocumentSnapshotData));
+
         expect(
           log,
           equals(
@@ -569,12 +607,69 @@ void main() {
                   },
                 },
               ),
+              isMethodCall(
+                'Query#getDocuments',
+                arguments: <String, dynamic>{
+                  'app': app.name,
+                  'path': 'foo',
+                  'parameters': <String, dynamic>{
+                    'where': <List<dynamic>>[],
+                    'orderBy': <List<dynamic>>[],
+                    'startAtDocument': <String, dynamic>{
+                      'id': '0',
+                      'data': kMockDocumentSnapshotData,
+                    },
+                  },
+                },
+              ),
+              isMethodCall(
+                'Query#getDocuments',
+                arguments: <String, dynamic>{
+                  'app': app.name,
+                  'path': 'foo',
+                  'parameters': <String, dynamic>{
+                    'where': <List<dynamic>>[],
+                    'orderBy': <List<dynamic>>[],
+                    'startAfterDocument': <String, dynamic>{
+                      'id': '0',
+                      'data': kMockDocumentSnapshotData,
+                    },
+                  },
+                },
+              ),
+              isMethodCall(
+                'Query#getDocuments',
+                arguments: <String, dynamic>{
+                  'app': app.name,
+                  'path': 'foo',
+                  'parameters': <String, dynamic>{
+                    'where': <List<dynamic>>[],
+                    'orderBy': <List<dynamic>>[],
+                    'endAtDocument': <String, dynamic>{
+                      'id': '0',
+                      'data': kMockDocumentSnapshotData,
+                    },
+                  },
+                },
+              ),
+              isMethodCall(
+                'Query#getDocuments',
+                arguments: <String, dynamic>{
+                  'app': app.name,
+                  'path': 'foo',
+                  'parameters': <String, dynamic>{
+                    'where': <List<dynamic>>[],
+                    'orderBy': <List<dynamic>>[],
+                    'endBeforeDocument': <String, dynamic>{
+                      'id': '0',
+                      'data': kMockDocumentSnapshotData,
+                    },
+                  },
+                },
+              ),
             ],
           ),
         );
-        expect(document.documentID, equals('0'));
-        expect(document.reference.path, equals('foo/0'));
-        expect(document.data, equals(kMockDocumentSnapshotData));
       });
     });
 

From 01bb87960def3fa82b0cd4a9030dbe85a7471c47 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Wed, 1 May 2019 10:15:44 -0700
Subject: [PATCH 383/410] [in_app_purchase] Minor doc updates (#1555)

Some dartdoc updates to the store_kit_wrappers.
---
 .../sk_payment_queue_wrapper.dart             | 158 ++++++++++++------
 .../sk_payment_transaction_wrappers.dart      | 101 +++++++----
 2 files changed, 168 insertions(+), 91 deletions(-)

diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
index ea0caaba3c37..7723497a374f 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
@@ -13,17 +13,23 @@ import 'sk_product_wrapper.dart';
 
 part 'sk_payment_queue_wrapper.g.dart';
 
-/// A wrapper around [`SKPaymentQueue`](https://developer.apple.com/documentation/storekit/skpaymentqueue?language=objc).
+/// A wrapper around
+/// [`SKPaymentQueue`](https://developer.apple.com/documentation/storekit/skpaymentqueue?language=objc).
 ///
-/// The payment queue contains payment related operations. It communicates with App Store and presents
-/// a user interface for the user to process and authorize the payment.
+/// The payment queue contains payment related operations. It communicates with
+/// the App Store and presents a user interface for the user to process and
+/// authorize payments.
+///
+/// Full information on using `SKPaymentQueue` and processing purchases is
+/// available at the [In-App Purchase Programming
+/// Guide](https://developer.apple.com/library/archive/documentation/NetworkingInternet/Conceptual/StoreKitGuide/Introduction.html#//apple_ref/doc/uid/TP40008267).
 class SKPaymentQueueWrapper {
   SKTransactionObserverWrapper _observer;
 
   /// Returns the default payment queue.
   ///
-  /// We do not support instantiating a custom payment queue, hence the singleton. However, you can
-  /// override the observer
+  /// We do not support instantiating a custom payment queue, hence the
+  /// singleton. However, you can override the observer.
   factory SKPaymentQueueWrapper() {
     return _singleton;
   }
@@ -38,29 +44,39 @@ class SKPaymentQueueWrapper {
   static Future<bool> canMakePayments() async =>
       await channel.invokeMethod('-[SKPaymentQueue canMakePayments:]');
 
-  /// Sets a transaction observer to listen to all the transaction events of the payment queue.
+  /// Sets an observer to listen to all incoming transaction events.
   ///
-  /// You have to have a transaction observer to be added to the payment queue to handle the
-  /// payment follow.
-  /// You must set the observer right when App launches to avoid missing callback when your user
-  /// started a purchase flow from the App Store.
-  /// This method calls StoreKit's [`-[SKPaymentQueue finishTransaction:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506042-addtransactionobserver?language=objc).
+  /// This should be called and set as soon as the app launches in order to
+  /// avoid missing any purchase updates from the App Store. See the
+  /// documentation on StoreKit's [`-[SKPaymentQueue
+  /// addTransactionObserver:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506042-addtransactionobserver?language=objc).
   void setTransactionObserver(SKTransactionObserverWrapper observer) {
     _observer = observer;
   }
 
-  /// Adds a payment object to the payment queue.
+  /// Posts a payment to the queue.
+  ///
+  /// This sends a purchase request to the App Store for confirmation.
+  /// Transaction updates will be delivered to the set
+  /// [SkTransactionObserverWrapper].
+  ///
+  /// A couple preconditions need to be met before calling this method.
+  ///
+  ///   - At least one [SKTransactionObserverWrapper] should have been added to
+  ///     the payment queue using [addTransactionObserver].
+  ///   - The [payment.productIdentifier] needs to have been previously fetched
+  ///     using [SKRequestMaker.startProductRequest] so that a valid `SKProduct`
+  ///     has been cached in the platform side already. Because of this
+  ///     [payment.productIdentifier] cannot be hardcoded.
   ///
-  /// Prior to this call, you have to make sure at least one [SKTransactionObserverWrapper] is added to the payment queue
-  /// using [addTransactionObserver]. You also have to make sure the [SKProductWrapper] of the payment has been fetched using [SKRequestMaker.startProductRequest].
-  /// Each payment will generate a [SKPaymentTransactionWrapper]. After a payment is added to the payment queue, the [SKTransactionObserverWrapper] is responsible for handling
-  /// the transaction that is generated by the payment.
-  /// The [productIdentifier] must match one of the products that are returned in [SKRequestMaker.startProductRequest].
-  /// to test the payment in the [sandbox](https://developer.apple.com/apple-pay/sandbox-testing/).
-  /// This method calls StoreKit's [`-[SKPaymentQueue addPayment:]`] (https://developer.apple.com/documentation/storekit/skpaymentqueue/1506036-addpayment?preferredLanguage=occ).
+  /// This method calls StoreKit's [`-[SKPaymentQueue addPayment:]`]
+  /// (https://developer.apple.com/documentation/storekit/skpaymentqueue/1506036-addpayment?preferredLanguage=occ).
+  ///
+  /// Also see [sandbox
+  /// testing](https://developer.apple.com/apple-pay/sandbox-testing/).
   Future<void> addPayment(SKPaymentWrapper payment) async {
     assert(_observer != null,
-        '[in_app_purchase]: Trying to add a payment without an observer. Observer must be set using `setTransactionObserver` before adding a payment `setTransactionObserver`. It is mandatory to set the observer at the moment when app launches.');
+        '[in_app_purchase]: Trying to add a payment without an observer. One must be set using `SkPaymentQueueWrapper.setTransactionObserver` before the app launches.');
     Map requestMap = payment.toMap();
     await channel.invokeMethod(
       '-[InAppPurchasePlugin addPayment:result:]',
@@ -70,10 +86,15 @@ class SKPaymentQueueWrapper {
 
   /// Finishes a transaction and removes it from the queue.
   ///
-  /// This method should be called from an [SKTransactionObserverWrapper] callback when receiving notification from the payment queue. You should only
-  /// call this method after the transaction is successfully processed and the functionality purchased by the user is unlocked.
-  /// It will throw a Platform exception if the [SKPaymentTransactionWrapper.transactionState] is [SKPaymentTransactionStateWrapper.purchasing].
-  /// This method calls StoreKit's [`-[SKPaymentQueue finishTransaction:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506003-finishtransaction?language=objc).
+  /// This method should be called after the given [transaction] has been
+  /// succesfully processed and its content has been delivered to the user.
+  /// Transaction status updates are propagated to [SkTransactionObserver].
+  ///
+  /// This will throw a Platform exception if [transaction.transactionState] is
+  /// [SKPaymentTransactionStateWrapper.purchasing].
+  ///
+  /// This method calls StoreKit's [`-[SKPaymentQueue
+  /// finishTransaction:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506003-finishtransaction?language=objc).
   Future<void> finishTransaction(
       SKPaymentTransactionWrapper transaction) async {
     await channel.invokeMethod(
@@ -81,16 +102,25 @@ class SKPaymentQueueWrapper {
         transaction.transactionIdentifier);
   }
 
-  /// Restore transactions to maintain access to content that customers have already purchased.
+  /// Restore previously purchased transactions.
   ///
-  /// For example, when a user upgrades to a new phone, they want to keep the content they purchased in the old phone.
-  /// This call will invoke the [SKTransactionObserverWrapper.restoreCompletedTransactions] or [SKTransactionObserverWrapper.paymentQueueRestoreCompletedTransactionsFinished] as well as [SKTransactionObserverWrapper.updatedTransaction]
-  /// in the [SKTransactionObserverWrapper]. If you keep the download content in your own server, in the observer methods, you can simply finish the transaction by calling [finishTransaction] and
-  /// download the content from your own server.
-  /// If you keep the download content on Apple's server, you can access the download content in the transaction object that you get from [SKTransactionObserverWrapper.updatedTransaction] when the [SKPaymentTransactionWrapper.transactionState] is [SKPaymentTransactionStateWrapper.restored].
-  /// The `applicationUserName` is the [SKPaymentWrapper.applicationUsername] you used to create payments. If you did not use a `applicationUserName` when creating payments, then you can ignore this parameter.
-  /// This method either triggers [`-[SKPayment restoreCompletedTransactions]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506123-restorecompletedtransactions?language=objc) or [`-[SKPayment restoreCompletedTransactionsWithApplicationUsername:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1505992-restorecompletedtransactionswith?language=objc)
-  /// depends on weather the `applicationUserName` is passed.
+  /// Use this to load previously purchased content on a new device.
+  ///
+  /// This call triggers purchase updates on the set
+  /// [SKTransactionObserverWrapper] for previously made transactions. This will
+  /// invoke [SKTransactionObserverWrapper.restoreCompletedTransactions],
+  /// [SKTransactionObserverWrapper.paymentQueueRestoreCompletedTransactionsFinished],
+  /// and [SKTransactionObserverWrapper.updatedTransaction]. These restored
+  /// transactions need to be marked complete with [finishTransaction] once the
+  /// content is delivered, like any other transaction.
+  ///
+  /// The `applicationUserName` should match the original
+  /// [SKPaymentWrapper.applicationUsername] used in [addPayment].
+  ///
+  /// This method either triggers [`-[SKPayment
+  /// restoreCompletedTransactions]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1506123-restorecompletedtransactions?language=objc)
+  /// or [`-[SKPayment restoreCompletedTransactionsWithApplicationUsername:]`](https://developer.apple.com/documentation/storekit/skpaymentqueue/1505992-restorecompletedtransactionswith?language=objc)
+  /// depending on whether the `applicationUserName` is set.
   Future<void> restoreTransactions({String applicationUserName}) async {
     await channel.invokeMethod(
         '-[InAppPurchasePlugin restoreTransactions:result:]',
@@ -161,7 +191,8 @@ class SKPaymentQueueWrapper {
   }
 }
 
-/// Dart wrapper around StoreKit's [NSError](https://developer.apple.com/documentation/foundation/nserror?language=objc).
+/// Dart wrapper around StoreKit's
+/// [NSError](https://developer.apple.com/documentation/foundation/nserror?language=objc).
 @JsonSerializable(nullable: true)
 class SKError {
   SKError(
@@ -170,20 +201,25 @@ class SKError {
   /// Constructs an instance of this from a key-value map of data.
   ///
   /// The map needs to have named string keys with values matching the names and
-  /// types of all of the members on this class.
-  /// The `map` parameter must not be null.
+  /// types of all of the members on this class. The `map` parameter must not be
+  /// null.
   factory SKError.fromJson(Map map) {
     assert(map != null);
     return _$SKErrorFromJson(map);
   }
 
-  /// Error [code](https://developer.apple.com/documentation/foundation/1448136-nserror_codes) defined in the Cocoa Framework.
+  /// Error [code](https://developer.apple.com/documentation/foundation/1448136-nserror_codes)
+  /// as defined in the Cocoa Framework.
   final int code;
 
-  /// Error [domain](https://developer.apple.com/documentation/foundation/nscocoaerrordomain?language=objc) defined in the Cocoa Framework.
+  /// Error
+  /// [domain](https://developer.apple.com/documentation/foundation/nscocoaerrordomain?language=objc)
+  /// as defined in the Cocoa Framework.
   final String domain;
 
-  /// A map that contains more detailed information about the error. Any key of the map must be one of the [NSErrorUserInfoKey](https://developer.apple.com/documentation/foundation/nserroruserinfokey?language=objc).
+  /// A map that contains more detailed information about the error.
+  ///
+  /// Any key of the map must be a valid [NSErrorUserInfoKey](https://developer.apple.com/documentation/foundation/nserroruserinfokey?language=objc).
   final Map<String, dynamic> userInfo;
 
   @override
@@ -202,11 +238,13 @@ class SKError {
   }
 }
 
-/// Dart wrapper around StoreKit's [SKPayment](https://developer.apple.com/documentation/storekit/skpayment?language=objc).
+/// Dart wrapper around StoreKit's
+/// [SKPayment](https://developer.apple.com/documentation/storekit/skpayment?language=objc).
 ///
-/// Used as the parameter to initiate a payment.
-/// In general, a developer should not need to create the payment object explicitly; instead, use
-/// [SKPaymentQueueWrapper.addPayment] directly with a product identifier to initiate a payment.
+/// Used as the parameter to initiate a payment. In general, a developer should
+/// not need to create the payment object explicitly; instead, use
+/// [SKPaymentQueueWrapper.addPayment] directly with a product identifier to
+/// initiate a payment.
 @JsonSerializable(nullable: true)
 class SKPaymentWrapper {
   SKPaymentWrapper(
@@ -219,8 +257,8 @@ class SKPaymentWrapper {
   /// Constructs an instance of this from a key value map of data.
   ///
   /// The map needs to have named string keys with values matching the names and
-  /// types of all of the members on this class.
-  /// The `map` parameter must not be null.
+  /// types of all of the members on this class. The `map` parameter must not be
+  /// null.
   factory SKPaymentWrapper.fromJson(Map map) {
     assert(map != null);
     return _$SKPaymentWrapperFromJson(map);
@@ -242,25 +280,35 @@ class SKPaymentWrapper {
 
   /// An opaque id for the user's account.
   ///
-  /// Used to help the store detect irregular activity. See https://developer.apple.com/documentation/storekit/skpayment/1506116-applicationusername?language=objc for more details.
-  /// For example, you can use a one-way hash of the user’s account name on your server. Don’t use the Apple ID for your developer account, the user’s Apple ID, or the user’s not hashed account name on your server.
+  /// Used to help the store detect irregular activity. See
+  /// [applicationUsername](https://developer.apple.com/documentation/storekit/skpayment/1506116-applicationusername?language=objc)
+  /// for more details. For example, you can use a one-way hash of the user’s
+  /// account name on your server. Don’t use the Apple ID for your developer
+  /// account, the user’s Apple ID, or the user’s plaintext account name on
+  /// your server.
   final String applicationUsername;
 
   /// Reserved for future use.
   ///
-  /// The value must be null before sending the payment. If the value is not null, the payment will be rejected.
-  /// Converted to String from NSData from ios platform using UTF8Encoding. The default is null.
-  // The iOS Platform provided this property but it is reserved for future use. We also provide this
-  // property to match the iOS platform; in case any future update for this property occurs, we do not need to
-  // add this property later.
+  /// The value must be null before sending the payment. If the value is not
+  /// null, the payment will be rejected.
+  ///
+  // The iOS Platform provided this property but it is reserved for future use.
+  // We also provide this property to match the iOS platform. Converted to
+  // String from NSData from ios platform using UTF8Encoding. The / default is
+  // null.
   final String requestData;
 
-  /// The amount of the product this payment is for. The default is 1. The minimum is 1. The maximum is 10.
+  /// The amount of the product this payment is for.
+  ///
+  /// The default is 1. The minimum is 1. The maximum is 10.
   final int quantity;
 
-  /// Produces an "ask to buy" flow in the sandbox if set to true. Default is false. I doesn't do it.
+  /// Produces an "ask to buy" flow in the sandbox if set to true. Default is
+  /// false.
   ///
-  /// For how to test in App Store sand box, see https://developer.apple.com/in-app-purchase/.
+  /// See https://developer.apple.com/in-app-purchase/ for a guide on Sandbox
+  /// testing.
   final bool simulatesAskToBuyInSandbox;
 
   @override
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
index 49aae195aaa9..374b97152e79 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.dart
@@ -11,9 +11,13 @@ import 'enum_converters.dart';
 
 part 'sk_payment_transaction_wrappers.g.dart';
 
-/// This class is Dart wrapper around [SKTransactionObserver](https://developer.apple.com/documentation/storekit/skpaymenttransactionobserver?language=objc).
+/// Callback handlers for transaction status changes.
 ///
-/// Must be subclassed. Must be instantiated and added to the [SKPaymentQueueWrapper] via [SKPaymentQueueWrapper.setTransactionObserver] at the app launch.
+/// Must be subclassed. Must be instantiated and added to the
+/// [SKPaymentQueueWrapper] via [SKPaymentQueueWrapper.setTransactionObserver]
+/// at app launch.
+///
+/// This class is a Dart wrapper around [SKTransactionObserver](https://developer.apple.com/documentation/storekit/skpaymenttransactionobserver?language=objc).
 abstract class SKTransactionObserverWrapper {
   /// Triggered when any transactions are updated.
   void updatedTransactions({List<SKPaymentTransactionWrapper> transactions});
@@ -27,53 +31,71 @@ abstract class SKTransactionObserverWrapper {
   /// Triggered when payment queue has finished sending restored transactions.
   void paymentQueueRestoreCompletedTransactionsFinished();
 
-  /// Triggered when a user initiated an in-app purchase from App Store.
+  /// Triggered when a user initiates an in-app purchase from App Store.
   ///
-  /// Return `true` to continue the transaction in your app. If you have multiple [SKTransactionObserverWrapper]s, the transaction
-  /// will continue if one [SKTransactionObserverWrapper] has [shouldAddStorePayment] returning `true`.
-  /// Return `false` to defer or cancel the transaction. For example, you may need to defer a transaction if the user is in the middle of onboarding.
-  /// You can also continue the transaction later by calling
-  /// [addPayment] with the [SKPaymentWrapper] object you get from this method.
+  /// Return `true` to continue the transaction in your app. If you have
+  /// multiple [SKTransactionObserverWrapper]s, the transaction will continue if
+  /// any [SKTransactionObserverWrapper] returns `true`. Return `false` to defer
+  /// or cancel the transaction. For example, you may need to defer a
+  /// transaction if the user is in the middle of onboarding. You can also
+  /// continue the transaction later by calling [addPayment] with the
+  /// `payment` param from this method.
   bool shouldAddStorePayment(
       {SKPaymentWrapper payment, SKProductWrapper product});
 }
 
+/// The state of a transaction.
+///
 /// Dart wrapper around StoreKit's
 /// [SKPaymentTransactionState](https://developer.apple.com/documentation/storekit/skpaymenttransactionstate?language=objc).
-///
-/// Presents the state of a transaction. Used for handling a transaction based on different state.
 enum SKPaymentTransactionStateWrapper {
   /// Indicates the transaction is being processed in App Store.
   ///
-  /// You should update your UI to indicate the process and waiting for the transaction to update to the next state.
-  /// Never complete a transaction that is in purchasing state.
+  /// You should update your UI to indicate that you are waiting for the
+  /// transaction to update to another state. Never complete a transaction that
+  /// is still in a purchasing state.
   @JsonValue(0)
   purchasing,
 
-  /// The payment is processed. You should provide the user the content they purchased.
+  /// The user's payment has been succesfully processed.
+  ///
+  /// You should provide the user the content that they purchased.
   @JsonValue(1)
   purchased,
 
-  /// The transaction failed. Check the [SKPaymentTransactionWrapper.error] property from [SKPaymentTransactionWrapper] for details.
+  /// The transaction failed.
+  ///
+  /// Check the [SKPaymentTransactionWrapper.error] property from
+  /// [SKPaymentTransactionWrapper] for details.
   @JsonValue(2)
   failed,
 
-  /// This transaction restores the content previously purchased by the user. The previous transaction information can be
-  /// obtained in [SKPaymentTransactionWrapper.originalTransaction] from [SKPaymentTransactionWrapper].
+  /// This transaction is restoring content previously purchased by the user.
+  ///
+  /// The previous transaction information can be obtained in
+  /// [SKPaymentTransactionWrapper.originalTransaction] from
+  /// [SKPaymentTransactionWrapper].
   @JsonValue(3)
   restored,
 
-  /// The transaction is in the queue but pending external action. Wait for another callback to get the final state.
+  /// The transaction is in the queue but pending external action. Wait for
+  /// another callback to get the final state.
   ///
-  /// You should update your UI to indicate the process and waiting for the transaction to update to the next state.
+  /// You should update your UI to indicate that you are waiting for the
+  /// transaction to update to another state.
   @JsonValue(4)
   deferred,
 }
 
-/// Dart wrapper around StoreKit's [SKPaymentTransaction](https://developer.apple.com/documentation/storekit/skpaymenttransaction?language=objc).
+/// Created when a payment is added to the [SKPaymentQueueWrapper].
+///
+/// Transactions are delivered to your app when a payment is finished
+/// processing. Completed transactions provide a receipt and a transaction
+/// identifier that the app can use to save a permanent record of the processed
+/// payment.
 ///
-/// Created when a payment is added to the [SKPaymentQueueWrapper]. Transactions are delivered to your app when a payment is finished processing.
-/// Completed transactions provide a receipt and a transaction identifier that the app can use to save a permanent record of the processed payment.
+/// Dart wrapper around StoreKit's
+/// [SKPaymentTransaction](https://developer.apple.com/documentation/storekit/skpaymenttransaction?language=objc).
 @JsonSerializable(nullable: true)
 class SKPaymentTransactionWrapper {
   SKPaymentTransactionWrapper({
@@ -88,8 +110,8 @@ class SKPaymentTransactionWrapper {
   /// Constructs an instance of this from a key value map of data.
   ///
   /// The map needs to have named string keys with values matching the names and
-  /// types of all of the members on this class.
-  /// The `map` parameter must not be null.
+  /// types of all of the members on this class. The `map` parameter must not be
+  /// null.
   factory SKPaymentTransactionWrapper.fromJson(Map map) {
     if (map == null) {
       return null;
@@ -97,9 +119,7 @@ class SKPaymentTransactionWrapper {
     return _$SKPaymentTransactionWrapperFromJson(map);
   }
 
-  /// Generate a [PurchaseDetails] object based on the transaction.
-  ///
-  /// [PurchaseDetails] is Used to represent a purchase detail for unified iOS and Android API.
+  /// Generate a [PurchaseDetails] object based on this transaction.
   PurchaseDetails toPurchaseDetails(String base64EncodedReceipt) {
     return PurchaseDetails(
       purchaseID: transactionIdentifier,
@@ -119,29 +139,38 @@ class SKPaymentTransactionWrapper {
   @SKTransactionStatusConverter()
   final SKPaymentTransactionStateWrapper transactionState;
 
-  /// The payment that is created and added to the payment queue which generated this transaction.
+  /// The payment that has been created and added to the payment queue which
+  /// generated this transaction.
   final SKPaymentWrapper payment;
 
-  /// The original Transaction, only available if the [transactionState] is [SKPaymentTransactionStateWrapper.restored].
+  /// The original Transaction.
   ///
-  /// When the [transactionState] is [SKPaymentTransactionStateWrapper.restored], the current transaction object holds a new
-  /// [transactionIdentifier].
+  /// Only available if the [transactionState] is
+  /// [SKPaymentTransactionStateWrapper.restored]. When the [transactionState]
+  /// is [SKPaymentTransactionStateWrapper.restored], the current transaction
+  /// object holds a new [transactionIdentifier].
   final SKPaymentTransactionWrapper originalTransaction;
 
   /// The timestamp of the transaction.
   ///
-  /// Seconds since epoch.
-  /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased] or [SKPaymentTransactionStateWrapper.restored].
+  /// Seconds since epoch. It is only defined when the [transactionState] is
+  /// [SKPaymentTransactionStateWrapper.purchased] or
+  /// [SKPaymentTransactionStateWrapper.restored].
   final double transactionTimeStamp;
 
   /// The unique string identifer of the transaction.
   ///
-  /// It is only defined when the [transactionState] is [SKPaymentTransactionStateWrapper.purchased] or [SKPaymentTransactionStateWrapper.restored].
-  /// You may wish to record this string as part of an audit trail for App Store purchases.
-  /// The value of this string corresponds to the same property in the receipt.
+  /// It is only defined when the [transactionState] is
+  /// [SKPaymentTransactionStateWrapper.purchased] or
+  /// [SKPaymentTransactionStateWrapper.restored]. You may wish to record this
+  /// string as part of an audit trail for App Store purchases. The value of
+  /// this string corresponds to the same property in the receipt.
   final String transactionIdentifier;
 
-  /// The error object, only available if the [transactionState] is [SKPaymentTransactionStateWrapper.failed].
+  /// The error object
+  ///
+  /// Only available if the [transactionState] is
+  /// [SKPaymentTransactionStateWrapper.failed].
   final SKError error;
 
   @override

From e441516556702258cdf56d9fc3136ace6eda8233 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Wed, 1 May 2019 14:00:56 -0700
Subject: [PATCH 384/410] [google_maps_flutter] Android: update
 myLocationButton preference on map load (#1558)

* Update myLocationButton settings on map load

* Update pubspec and changelog
---
 packages/google_maps_flutter/CHANGELOG.md                | 4 ++++
 .../flutter/plugins/googlemaps/GoogleMapController.java  | 9 +++++----
 packages/google_maps_flutter/pubspec.yaml                | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index aaadeacfc81a..8cab8f69888f 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.11+1
+
+* Android: Fix an issue where myLocationButtonEnabled setting was not propagated when set to false onMapLoad.
+
 ## 0.5.11
 
 * Add myLocationButtonEnabled option.
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index 71eeedd7f5e6..7866c59ea19f 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -165,7 +165,7 @@ public void onMapReady(GoogleMap googleMap) {
     googleMap.setOnMarkerClickListener(this);
     googleMap.setOnPolylineClickListener(this);
     googleMap.setOnMapClickListener(this);
-    updateMyLocationEnabled();
+    updateMyLocationSettings();
     markersController.setGoogleMap(googleMap);
     polylinesController.setGoogleMap(googleMap);
     updateInitialMarkers();
@@ -454,7 +454,7 @@ public void setMyLocationEnabled(boolean myLocationEnabled) {
     }
     this.myLocationEnabled = myLocationEnabled;
     if (googleMap != null) {
-      updateMyLocationEnabled();
+      updateMyLocationSettings();
     }
   }
 
@@ -465,7 +465,7 @@ public void setMyLocationButtonEnabled(boolean myLocationButtonEnabled) {
     }
     this.myLocationButtonEnabled = myLocationButtonEnabled;
     if (googleMap != null) {
-      googleMap.getUiSettings().setMyLocationButtonEnabled(myLocationButtonEnabled);
+      updateMyLocationSettings();
     }
   }
 
@@ -494,7 +494,7 @@ private void updateInitialPolylines() {
   }
 
   @SuppressLint("MissingPermission")
-  private void updateMyLocationEnabled() {
+  private void updateMyLocationSettings() {
     if (hasLocationPermission()) {
       // The plugin doesn't add the location permission by default so that apps that don't need
       // the feature won't require the permission.
@@ -502,6 +502,7 @@ private void updateMyLocationEnabled() {
       // fail the build if the permission is missing. The following disables the Gradle lint.
       //noinspection ResourceType
       googleMap.setMyLocationEnabled(myLocationEnabled);
+      googleMap.getUiSettings().setMyLocationButtonEnabled(myLocationButtonEnabled);
     } else {
       // TODO(amirh): Make the options update fail.
       // https://github.com/flutter/flutter/issues/24327
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 0a13b335de2f..f3465134ed12 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.11
+version: 0.5.11+1
 
 dependencies:
   flutter:

From 98d0cbce394b469ebe171a2c9eca1dfdf8637753 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Wed, 1 May 2019 14:21:51 -0700
Subject: [PATCH 385/410] add cyanglaz to codeowner (#1559)

---
 CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 30ca400adaf8..32662040e677 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -27,5 +27,5 @@ packages/image_picker/* @cyanglaz
 packages/in_app_purchase/* @mklim @cyanglaz
 packages/package_info/* @cyanglaz
 packages/shared_preferences/* @collinjackson
-packages/video_player/* @iskakaushik
+packages/video_player/* @iskakaushik @cyanglaz
 packages/webview_flutter/* @amirh @iskakaushik

From 5ba657dc26eb9f0fde7e47b1577a5f5fd31c105c Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Wed, 1 May 2019 15:29:14 -0700
Subject: [PATCH 386/410] [in_app_purchase] Remove extraneous download logic
 (#1560)

Not supporting downloads right now, but there's some dangling unit tests
and members that still reference them. Remove them and regenerate the
mapping classes.
---
 packages/in_app_purchase/README.md            |  5 +-
 .../PaymentQueueTest.m                        |  3 --
 .../ios/in_app_purchase_pluginTests/Stubs.h   |  4 --
 .../ios/in_app_purchase_pluginTests/Stubs.m   | 27 ----------
 .../TranslatorTest.m                          | 54 -------------------
 .../ios/Classes/FIAObjectTranslator.h         |  2 -
 .../ios/Classes/FIAObjectTranslator.m         | 33 +-----------
 .../ios/Classes/InAppPurchasePlugin.m         |  6 +--
 .../purchase_wrapper.g.dart                   | 34 ++----------
 .../sku_details_wrapper.g.dart                | 43 +++------------
 .../sk_payment_queue_wrapper.g.dart           |  5 +-
 .../sk_payment_transaction_wrappers.g.dart    | 41 +++-----------
 .../sk_product_wrapper.dart                   | 24 ---------
 .../sk_product_wrapper.g.dart                 |  8 ---
 .../store_kit_wrappers/sk_product_test.dart   |  2 -
 .../sk_test_stub_objects.dart                 |  6 ---
 16 files changed, 26 insertions(+), 271 deletions(-)

diff --git a/packages/in_app_purchase/README.md b/packages/in_app_purchase/README.md
index e29ca26860f4..9c95754415ec 100644
--- a/packages/in_app_purchase/README.md
+++ b/packages/in_app_purchase/README.md
@@ -21,8 +21,9 @@ This plugin uses
 [json_serializable](https://pub.dartlang.org/packages/json_serializable) for the
 many data structs passed between the underlying platform layers and Dart. After
 editing any of the serialized data structs, rebuild the serializers by running
-`flutter packages pub run build_runner build`. `flutter packages pub run
-build_runner watch` will watch the filesystem for changes.
+`flutter packages pub run build_runner build --delete-conflicting-outputs`.
+`flutter packages pub run build_runner watch --delete-conflicting-outputs` will
+watch the filesystem for changes.
 
 ### Design
 
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/PaymentQueueTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/PaymentQueueTest.m
index 9fd0fdbe28d8..d3935a19a43c 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/PaymentQueueTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/PaymentQueueTest.m
@@ -32,9 +32,6 @@ - (void)setUp {
     @"productIdentifier" : @"123",
     @"localizedTitle" : @"title",
     @"localizedDescription" : @"des",
-    @"downloadable" : @YES,
-    @"downloadContentLengths" : @1,
-    @"downloadContentVersion" : [NSNull null],  // not mockable
     @"subscriptionPeriod" : self.periodMap,
     @"introductoryPrice" : self.discountMap,
     @"subscriptionGroupIdentifier" : @"com.group"
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
index fe943a40a156..61d5fa36fa2f 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.h
@@ -42,10 +42,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithState:(SKPaymentTransactionState)state;
 @end
 
-@interface SKDownloadStub : SKDownload
-- (instancetype)initWithMap:(NSDictionary *)map;
-@end
-
 @interface SKMutablePaymentStub : SKMutablePayment
 - (instancetype)initWithMap:(NSDictionary *)map;
 @end
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
index 338213bce212..dc4998831441 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/Stubs.m
@@ -187,11 +187,6 @@ - (instancetype)initWithMap:(NSDictionary *)map {
             forKey:@"error"];
     [self setValue:[NSDate dateWithTimeIntervalSince1970:[map[@"transactionTimeStamp"] doubleValue]]
             forKey:@"transactionDate"];
-    NSMutableArray *downloads = [NSMutableArray new];
-    for (NSDictionary *downloadMap in map[@"downloads"]) {
-      [downloads addObject:[[SKDownloadStub alloc] initWithMap:downloadMap]];
-    }
-    [self setValue:downloads forKey:@"downloads"];
   }
   return self;
 }
@@ -207,28 +202,6 @@ - (instancetype)initWithState:(SKPaymentTransactionState)state {
 
 @end
 
-@implementation SKDownloadStub
-
-- (instancetype)initWithMap:(NSDictionary *)map {
-  self = [super init];
-  if (self) {
-    [self setValue:map[@"state"] forKey:@"downloadState"];
-    [self setValue:map[@"contentIdentifier"] ?: [NSNull null] forKey:@"contentIdentifier"];
-    [self setValue:map[@"contentLength"] ?: [NSNull null] forKey:@"contentLength"];
-    [self setValue:[NSURL URLWithString:map[@"contentURL"]] ?: [NSNull null] forKey:@"contentURL"];
-    [self setValue:map[@"error"] ? [[NSErrorStub alloc] initWithMap:map[@"error"]] : [NSNull null]
-            forKey:@"error"];
-    [self setValue:map[@"progress"] ?: [NSNull null] forKey:@"progress"];
-    [self setValue:map[@"timeRemaining"] ?: [NSNull null] forKey:@"timeRemaining"];
-    [self setValue:[[SKPaymentTransactionStub alloc] initWithID:map[@"transactionID"]]
-                       ?: [NSNull null]
-            forKey:@"transaction"];
-  }
-  return self;
-}
-
-@end
-
 @implementation NSErrorStub
 
 - (instancetype)initWithMap:(NSDictionary *)map {
diff --git a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
index d6babfce8cf2..7d7fad5c2ce4 100644
--- a/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
+++ b/packages/in_app_purchase/example/ios/in_app_purchase_pluginTests/TranslatorTest.m
@@ -12,7 +12,6 @@ @interface TranslatorTest : XCTestCase
 @property(strong, nonatomic) NSDictionary *discountMap;
 @property(strong, nonatomic) NSDictionary *productMap;
 @property(strong, nonatomic) NSDictionary *productResponseMap;
-@property(strong, nonatomic) NSDictionary *downloadMap;
 @property(strong, nonatomic) NSDictionary *paymentMap;
 @property(strong, nonatomic) NSDictionary *transactionMap;
 @property(strong, nonatomic) NSDictionary *errorMap;
@@ -37,29 +36,12 @@ - (void)setUp {
     @"productIdentifier" : @"123",
     @"localizedTitle" : @"title",
     @"localizedDescription" : @"des",
-    @"downloadable" : @YES,
-    @"downloadContentLengths" : @1,
-    @"downloadContentVersion" : [NSNull null],  // not mockable
     @"subscriptionPeriod" : self.periodMap,
     @"introductoryPrice" : self.discountMap,
     @"subscriptionGroupIdentifier" : @"com.group"
   };
   self.productResponseMap =
       @{@"products" : @[ self.productMap ], @"invalidProductIdentifiers" : @[]};
-  self.downloadMap = @{
-    @"state" : @(0),
-    @"contentIdentifier" : [NSNull null],
-    @"contentLength" : @(2),
-    @"contentURL" : @"https://flutter.io",
-    @"contentVersion" : [NSNull null],
-    @"error" : [FIAObjectTranslator getMapFromNSError:[NSError errorWithDomain:@"test_stub"
-                                                                          code:123
-                                                                      userInfo:@{}]],
-    @"progress" : @(0.5),
-    @"timeRemaining" : @(100),
-    @"downloadTimeUnKnown" : @(NO),
-    @"transactionID" : [NSNull null],
-  };
   self.paymentMap = @{
     @"productIdentifier" : @"123",
     @"requestData" : @"abcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefgh",
@@ -76,20 +58,6 @@ - (void)setUp {
                                                                       userInfo:@{}]],
     @"transactionTimeStamp" : @([NSDate date].timeIntervalSince1970),
     @"originalTransaction" : [NSNull null],
-    @"downloads" : @[ @{
-      @"state" : @(0),
-      @"contentIdentifier" : [NSNull null],
-      @"contentLength" : @(2),
-      @"contentURL" : @"https://flutter.io",
-      @"contentVersion" : [NSNull null],
-      @"error" : [FIAObjectTranslator getMapFromNSError:[NSError errorWithDomain:@"test_stub"
-                                                                            code:123
-                                                                        userInfo:@{}]],
-      @"progress" : @(0.5),
-      @"timeRemaining" : @(100),
-      @"downloadTimeUnKnown" : @(NO),
-      @"transactionID" : @"567",
-    } ]
   };
   self.transactionMap = @{
     @"transactionIdentifier" : @"567",
@@ -100,20 +68,6 @@ - (void)setUp {
                                                                       userInfo:@{}]],
     @"transactionTimeStamp" : @([NSDate date].timeIntervalSince1970),
     @"originalTransaction" : originalTransactionMap,
-    @"downloads" : @[ @{
-      @"state" : @(0),
-      @"contentIdentifier" : [NSNull null],
-      @"contentLength" : @(2),
-      @"contentURL" : @"https://flutter.io",
-      @"contentVersion" : [NSNull null],
-      @"error" : [FIAObjectTranslator getMapFromNSError:[NSError errorWithDomain:@"test_stub"
-                                                                            code:123
-                                                                        userInfo:@{}]],
-      @"progress" : @(0.5),
-      @"timeRemaining" : @(100),
-      @"downloadTimeUnKnown" : @(NO),
-      @"transactionID" : @"567",
-    } ]
   };
   self.errorMap = @{
     @"code" : @(123),
@@ -150,14 +104,6 @@ - (void)testProductResponseToMap {
   XCTAssertEqualObjects(map, self.productResponseMap);
 }
 
-- (void)testDownloadToMap {
-  // bug with state, downloadTimeUnKnown, transaction and contentIdentifer in KVC, cannot test these
-  // fields.
-  SKDownloadStub *download = [[SKDownloadStub alloc] initWithMap:self.downloadMap];
-  NSDictionary *map = [FIAObjectTranslator getMapFromSKDownload:download];
-  XCTAssertEqualObjects(map, self.downloadMap);
-}
-
 - (void)testPaymentToMap {
   SKMutablePayment *payment = [FIAObjectTranslator getSKMutablePaymentFromMap:self.paymentMap];
   NSDictionary *map = [FIAObjectTranslator getMapFromSKPayment:payment];
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
index 401cda4f13fc..5243a391ddaf 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.h
@@ -27,8 +27,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (NSDictionary *)getMapFromSKPaymentTransaction:(SKPaymentTransaction *)transaction;
 
-+ (NSDictionary *)getMapFromSKDownload:(SKDownload *)download;
-
 + (NSDictionary *)getMapFromNSError:(NSError *)error;
 
 @end
diff --git a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
index 375028015c90..c393a46867a8 100644
--- a/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
+++ b/packages/in_app_purchase/ios/Classes/FIAObjectTranslator.m
@@ -16,10 +16,7 @@ + (NSDictionary *)getMapFromSKProduct:(SKProduct *)product {
     @"localizedDescription" : product.localizedDescription ?: [NSNull null],
     @"localizedTitle" : product.localizedTitle ?: [NSNull null],
     @"productIdentifier" : product.productIdentifier ?: [NSNull null],
-    @"downloadable" : @(product.downloadable),
-    @"price" : product.price.description ?: [NSNull null],
-    @"downloadContentLengths" : product.downloadContentLengths ?: [NSNull null],
-    @"downloadContentVersion" : product.downloadContentVersion ?: [NSNull null]
+    @"price" : product.price.description ?: [NSNull null]
 
   }];
   // TODO(cyanglaz): NSLocale is a complex object, want to see the actual need of getting this
@@ -148,38 +145,10 @@ + (NSDictionary *)getMapFromSKPaymentTransaction:(SKPaymentTransaction *)transac
     @"transactionIdentifier" : transaction.transactionIdentifier ?: [NSNull null],
     @"transactionState" : @(transaction.transactionState)
   }];
-  NSMutableArray *downloads = [NSMutableArray new];
-  for (SKDownload *download in transaction.downloads) {
-    [downloads addObject:[FIAObjectTranslator getMapFromSKDownload:download]];
-  }
-  [map setObject:downloads forKey:@"downloads"];
 
   return map;
 }
 
-+ (NSDictionary *)getMapFromSKDownload:(SKDownload *)download {
-  if (!download) {
-    return nil;
-  }
-  NSMutableDictionary *map = [[NSMutableDictionary alloc] initWithDictionary:@{
-    @"contentLength" : @(download.contentLength),
-    @"contentIdentifier" : download.contentIdentifier ?: [NSNull null],
-    @"contentURL" : download.contentURL.absoluteString ?: [NSNull null],
-    @"contentVersion" : download.contentVersion ?: [NSNull null],
-    @"error" : [FIAObjectTranslator getMapFromNSError:download.error] ?: @{},
-    @"progress" : @(download.progress),
-    @"timeRemaining" : @(download.timeRemaining),
-    @"downloadTimeUnKnown" : @(download.timeRemaining == SKDownloadTimeRemainingUnknown),
-    @"transactionID" : download.transaction.transactionIdentifier ?: [NSNull null]
-  }];
-  if (@available(iOS 12.0, *)) {
-    [map setObject:@(download.state) forKey:@"state"];
-  } else {
-    [map setObject:@(download.downloadState) forKey:@"state"];
-  }
-  return map;
-}
-
 + (NSDictionary *)getMapFromNSError:(NSError *)error {
   if (!error) {
     return nil;
diff --git a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
index ddd11baa7d6b..c147615d7958 100644
--- a/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
+++ b/packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m
@@ -293,11 +293,7 @@ - (void)restoreCompletedTransactionsFinished {
 }
 
 - (void)updatedDownloads:(NSArray<SKDownload *> *)downloads {
-  NSMutableArray *maps = [NSMutableArray new];
-  for (SKDownload *download in downloads) {
-    [maps addObject:[FIAObjectTranslator getMapFromSKDownload:download]];
-  }
-  [self.callbackChannel invokeMethod:@"updatedDownloads" arguments:maps];
+  NSLog(@"Received an updatedDownloads callback, but downloads are not supported.");
 }
 
 - (BOOL)shouldAddStorePayment:(SKPayment *)payment product:(SKProduct *)product {
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart
index 5504083da3ef..4af4b6992587 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/purchase_wrapper.g.dart
@@ -32,8 +32,8 @@ Map<String, dynamic> _$PurchaseWrapperToJson(PurchaseWrapper instance) =>
 
 PurchasesResultWrapper _$PurchasesResultWrapperFromJson(Map json) {
   return PurchasesResultWrapper(
-      responseCode:
-          _$enumDecode(_$BillingResponseEnumMap, json['responseCode']),
+      responseCode: const BillingResponseConverter()
+          .fromJson(json['responseCode'] as int),
       purchasesList: (json['purchasesList'] as List)
           .map((e) => PurchaseWrapper.fromJson(e as Map))
           .toList());
@@ -42,33 +42,7 @@ PurchasesResultWrapper _$PurchasesResultWrapperFromJson(Map json) {
 Map<String, dynamic> _$PurchasesResultWrapperToJson(
         PurchasesResultWrapper instance) =>
     <String, dynamic>{
-      'responseCode': _$BillingResponseEnumMap[instance.responseCode],
+      'responseCode':
+          const BillingResponseConverter().toJson(instance.responseCode),
       'purchasesList': instance.purchasesList
     };
-
-T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
-  if (source == null) {
-    throw ArgumentError('A value must be provided. Supported values: '
-        '${enumValues.values.join(', ')}');
-  }
-  return enumValues.entries
-      .singleWhere((e) => e.value == source,
-          orElse: () => throw ArgumentError(
-              '`$source` is not one of the supported values: '
-              '${enumValues.values.join(', ')}'))
-      .key;
-}
-
-const _$BillingResponseEnumMap = <BillingResponse, dynamic>{
-  BillingResponse.featureNotSupported: -2,
-  BillingResponse.serviceDisconnected: -1,
-  BillingResponse.ok: 0,
-  BillingResponse.userCanceled: 1,
-  BillingResponse.serviceUnavailable: 2,
-  BillingResponse.billingUnavailable: 3,
-  BillingResponse.itemUnavailable: 4,
-  BillingResponse.developerError: 5,
-  BillingResponse.error: 6,
-  BillingResponse.itemAlreadyOwned: 7,
-  BillingResponse.itemNotOwned: 8
-};
diff --git a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
index 087818dcef52..3d059834a4f7 100644
--- a/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/billing_client_wrappers/sku_details_wrapper.g.dart
@@ -20,7 +20,7 @@ SkuDetailsWrapper _$SkuDetailsWrapperFromJson(Map json) {
       sku: json['sku'] as String,
       subscriptionPeriod: json['subscriptionPeriod'] as String,
       title: json['title'] as String,
-      type: _$enumDecode(_$SkuTypeEnumMap, json['type']),
+      type: const SkuTypeConverter().fromJson(json['type'] as String),
       isRewarded: json['isRewarded'] as bool);
 }
 
@@ -38,32 +38,14 @@ Map<String, dynamic> _$SkuDetailsWrapperToJson(SkuDetailsWrapper instance) =>
       'sku': instance.sku,
       'subscriptionPeriod': instance.subscriptionPeriod,
       'title': instance.title,
-      'type': _$SkuTypeEnumMap[instance.type],
+      'type': const SkuTypeConverter().toJson(instance.type),
       'isRewarded': instance.isRewarded
     };
 
-T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
-  if (source == null) {
-    throw ArgumentError('A value must be provided. Supported values: '
-        '${enumValues.values.join(', ')}');
-  }
-  return enumValues.entries
-      .singleWhere((e) => e.value == source,
-          orElse: () => throw ArgumentError(
-              '`$source` is not one of the supported values: '
-              '${enumValues.values.join(', ')}'))
-      .key;
-}
-
-const _$SkuTypeEnumMap = <SkuType, dynamic>{
-  SkuType.inapp: 'inapp',
-  SkuType.subs: 'subs'
-};
-
 SkuDetailsResponseWrapper _$SkuDetailsResponseWrapperFromJson(Map json) {
   return SkuDetailsResponseWrapper(
-      responseCode:
-          _$enumDecode(_$BillingResponseEnumMap, json['responseCode']),
+      responseCode: const BillingResponseConverter()
+          .fromJson(json['responseCode'] as int),
       skuDetailsList: (json['skuDetailsList'] as List)
           .map((e) => SkuDetailsWrapper.fromJson(e as Map))
           .toList());
@@ -72,20 +54,7 @@ SkuDetailsResponseWrapper _$SkuDetailsResponseWrapperFromJson(Map json) {
 Map<String, dynamic> _$SkuDetailsResponseWrapperToJson(
         SkuDetailsResponseWrapper instance) =>
     <String, dynamic>{
-      'responseCode': _$BillingResponseEnumMap[instance.responseCode],
+      'responseCode':
+          const BillingResponseConverter().toJson(instance.responseCode),
       'skuDetailsList': instance.skuDetailsList
     };
-
-const _$BillingResponseEnumMap = <BillingResponse, dynamic>{
-  BillingResponse.featureNotSupported: -2,
-  BillingResponse.serviceDisconnected: -1,
-  BillingResponse.ok: 0,
-  BillingResponse.userCanceled: 1,
-  BillingResponse.serviceUnavailable: 2,
-  BillingResponse.billingUnavailable: 3,
-  BillingResponse.itemUnavailable: 4,
-  BillingResponse.developerError: 5,
-  BillingResponse.error: 6,
-  BillingResponse.itemAlreadyOwned: 7,
-  BillingResponse.itemNotOwned: 8
-};
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
index d2a9d514dcac..3452a5b6cc2a 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.g.dart
@@ -10,8 +10,9 @@ SKError _$SKErrorFromJson(Map json) {
   return SKError(
       code: json['code'] as int,
       domain: json['domain'] as String,
-      userInfo:
-          (json['userInfo'] as Map)?.map((k, e) => MapEntry(k as String, e)));
+      userInfo: (json['userInfo'] as Map)?.map(
+        (k, e) => MapEntry(k as String, e),
+      ));
 }
 
 Map<String, dynamic> _$SKErrorToJson(SKError instance) => <String, dynamic>{
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.g.dart
index c2d859c5108b..36da9a366f7f 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.g.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_payment_transaction_wrappers.g.dart
@@ -11,8 +11,10 @@ SKPaymentTransactionWrapper _$SKPaymentTransactionWrapperFromJson(Map json) {
       payment: json['payment'] == null
           ? null
           : SKPaymentWrapper.fromJson(json['payment'] as Map),
-      transactionState: _$enumDecodeNullable(
-          _$SKPaymentTransactionStateWrapperEnumMap, json['transactionState']),
+      transactionState: json['transactionState'] == null
+          ? null
+          : const SKTransactionStatusConverter()
+              .fromJson(json['transactionState'] as int),
       originalTransaction: json['originalTransaction'] == null
           ? null
           : SKPaymentTransactionWrapper.fromJson(
@@ -27,40 +29,13 @@ SKPaymentTransactionWrapper _$SKPaymentTransactionWrapperFromJson(Map json) {
 Map<String, dynamic> _$SKPaymentTransactionWrapperToJson(
         SKPaymentTransactionWrapper instance) =>
     <String, dynamic>{
-      'transactionState':
-          _$SKPaymentTransactionStateWrapperEnumMap[instance.transactionState],
+      'transactionState': instance.transactionState == null
+          ? null
+          : const SKTransactionStatusConverter()
+              .toJson(instance.transactionState),
       'payment': instance.payment,
       'originalTransaction': instance.originalTransaction,
       'transactionTimeStamp': instance.transactionTimeStamp,
       'transactionIdentifier': instance.transactionIdentifier,
       'error': instance.error
     };
-
-T _$enumDecode<T>(Map<T, dynamic> enumValues, dynamic source) {
-  if (source == null) {
-    throw ArgumentError('A value must be provided. Supported values: '
-        '${enumValues.values.join(', ')}');
-  }
-  return enumValues.entries
-      .singleWhere((e) => e.value == source,
-          orElse: () => throw ArgumentError(
-              '`$source` is not one of the supported values: '
-              '${enumValues.values.join(', ')}'))
-      .key;
-}
-
-T _$enumDecodeNullable<T>(Map<T, dynamic> enumValues, dynamic source) {
-  if (source == null) {
-    return null;
-  }
-  return _$enumDecode<T>(enumValues, source);
-}
-
-const _$SKPaymentTransactionStateWrapperEnumMap =
-    <SKPaymentTransactionStateWrapper, dynamic>{
-  SKPaymentTransactionStateWrapper.purchasing: 0,
-  SKPaymentTransactionStateWrapper.purchased: 1,
-  SKPaymentTransactionStateWrapper.failed: 2,
-  SKPaymentTransactionStateWrapper.restored: 3,
-  SKPaymentTransactionStateWrapper.deferred: 4
-};
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
index 658ce39ac55b..42fc72bd05dc 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.dart
@@ -201,11 +201,8 @@ class SKProductWrapper {
     @required this.localizedTitle,
     @required this.localizedDescription,
     @required this.priceLocale,
-    @required this.downloadContentVersion,
     @required this.subscriptionGroupIdentifier,
     @required this.price,
-    @required this.downloadable,
-    @required this.downloadContentLengths,
     @required this.subscriptionPeriod,
     @required this.introductoryPrice,
   });
@@ -235,12 +232,6 @@ class SKProductWrapper {
   /// Includes locale information about the price, e.g. `$` as the currency symbol for US locale.
   final SKPriceLocaleWrapper priceLocale;
 
-  /// The version of the downloadable content.
-  ///
-  /// This is only available when [downloadable] is true.
-  /// It is formatted as a series of integers separated by periods.
-  final String downloadContentVersion;
-
   /// The subscription group identifier.
   ///
   /// A subscription group is a collection of subscription products.
@@ -250,17 +241,6 @@ class SKProductWrapper {
   /// The price of the product, in the currency that is defined in [priceLocale].
   final String price;
 
-  /// Whether the AppStore has downloadable content for this product.
-  ///
-  /// [downloadContentVersion] and [downloadContentLengths] become available if this is true.
-  final bool downloadable;
-
-  /// The length of the downloadable content.
-  ///
-  /// This is only available when [downloadable] is true.
-  /// Each element is the size of one of the downloadable files (in bytes).
-  final List<int> downloadContentLengths;
-
   /// The object represents the subscription period of the product.
   ///
   /// Can be [null] is the product is not a subscription.
@@ -288,12 +268,8 @@ class SKProductWrapper {
         typedOther.localizedTitle == localizedTitle &&
         typedOther.localizedDescription == localizedDescription &&
         typedOther.priceLocale == priceLocale &&
-        typedOther.downloadContentVersion == downloadContentVersion &&
         typedOther.subscriptionGroupIdentifier == subscriptionGroupIdentifier &&
         typedOther.price == price &&
-        typedOther.downloadable == downloadable &&
-        DeepCollectionEquality.unordered().equals(
-            typedOther.downloadContentLengths, downloadContentLengths) &&
         typedOther.subscriptionPeriod == subscriptionPeriod &&
         typedOther.introductoryPrice == introductoryPrice;
   }
diff --git a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
index 0efb2cd8ad13..10a421878f55 100644
--- a/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
+++ b/packages/in_app_purchase/lib/src/store_kit_wrappers/sk_product_wrapper.g.dart
@@ -106,14 +106,9 @@ SKProductWrapper _$SKProductWrapperFromJson(Map json) {
       priceLocale: json['priceLocale'] == null
           ? null
           : SKPriceLocaleWrapper.fromJson(json['priceLocale'] as Map),
-      downloadContentVersion: json['downloadContentVersion'] as String,
       subscriptionGroupIdentifier:
           json['subscriptionGroupIdentifier'] as String,
       price: json['price'] as String,
-      downloadable: json['downloadable'] as bool,
-      downloadContentLengths: (json['downloadContentLengths'] as List)
-          ?.map((e) => e as int)
-          ?.toList(),
       subscriptionPeriod: json['subscriptionPeriod'] == null
           ? null
           : SKProductSubscriptionPeriodWrapper.fromJson(
@@ -130,11 +125,8 @@ Map<String, dynamic> _$SKProductWrapperToJson(SKProductWrapper instance) =>
       'localizedTitle': instance.localizedTitle,
       'localizedDescription': instance.localizedDescription,
       'priceLocale': instance.priceLocale,
-      'downloadContentVersion': instance.downloadContentVersion,
       'subscriptionGroupIdentifier': instance.subscriptionGroupIdentifier,
       'price': instance.price,
-      'downloadable': instance.downloadable,
-      'downloadContentLengths': instance.downloadContentLengths,
       'subscriptionPeriod': instance.subscriptionPeriod,
       'introductoryPrice': instance.introductoryPrice
     };
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
index 81e4c62edb74..d5bd285a58d6 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_product_test.dart
@@ -64,10 +64,8 @@ void main() {
       expect(wrapper.localizedTitle, null);
       expect(wrapper.localizedDescription, null);
       expect(wrapper.priceLocale, null);
-      expect(wrapper.downloadContentVersion, null);
       expect(wrapper.subscriptionGroupIdentifier, null);
       expect(wrapper.price, null);
-      expect(wrapper.downloadable, null);
       expect(wrapper.subscriptionPeriod, null);
     });
 
diff --git a/packages/in_app_purchase/test/store_kit_wrappers/sk_test_stub_objects.dart b/packages/in_app_purchase/test/store_kit_wrappers/sk_test_stub_objects.dart
index af2a881277c9..b4fa0165a18c 100644
--- a/packages/in_app_purchase/test/store_kit_wrappers/sk_test_stub_objects.dart
+++ b/packages/in_app_purchase/test/store_kit_wrappers/sk_test_stub_objects.dart
@@ -54,11 +54,8 @@ final SKProductWrapper dummyProductWrapper = SKProductWrapper(
   localizedTitle: 'title',
   localizedDescription: 'description',
   priceLocale: dummyLocale,
-  downloadContentVersion: 'version',
   subscriptionGroupIdentifier: 'com.group',
   price: '1.0',
-  downloadable: true,
-  downloadContentLengths: <int>[1, 2],
   subscriptionPeriod: dummySubscription,
   introductoryPrice: dummyDiscount,
 );
@@ -99,11 +96,8 @@ Map<String, dynamic> buildProductMap(SKProductWrapper product) {
     'localizedTitle': product.localizedTitle,
     'localizedDescription': product.localizedDescription,
     'priceLocale': buildLocaleMap(product.priceLocale),
-    'downloadContentVersion': product.downloadContentVersion,
     'subscriptionGroupIdentifier': product.subscriptionGroupIdentifier,
     'price': product.price,
-    'downloadable': product.downloadable,
-    'downloadContentLengths': product.downloadContentLengths,
     'subscriptionPeriod':
         buildSubscriptionPeriodMap(product.subscriptionPeriod),
     'introductoryPrice': buildDiscountMap(product.introductoryPrice),

From 616688a086b39698d7b93afe2906e164b176c7e8 Mon Sep 17 00:00:00 2001
From: Masayuki Ono <mono0926@gmail.com>
Date: Fri, 3 May 2019 02:35:34 +0900
Subject: [PATCH 387/410] [firebase_storage] Fix putFile method's Content-Type
 auto-detection for iOS (#1355)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use `putFile` iOS SDK method instead of `putData` for `putFile`

- `putFile` should use `putFile` iOS SDK method correctly
- `putFile` uses file extension as Content-Type automatically if not specified

* Verify ‘content-type’ is ‘text/plain’

- https://github.com/flutter/plugins/pull/1355#pullrequestreview-232605513
-  ‘content-type’ was ‘application/octet-stream’ before this pull request
---
 packages/firebase_storage/CHANGELOG.md        |  4 +++
 .../example/test_driver/firebase_storage.dart |  1 +
 .../ios/Classes/FirebaseStoragePlugin.m       | 31 +++++++++++++------
 packages/firebase_storage/pubspec.yaml        |  2 +-
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/packages/firebase_storage/CHANGELOG.md b/packages/firebase_storage/CHANGELOG.md
index 8c08aed58be7..187f01b29e29 100644
--- a/packages/firebase_storage/CHANGELOG.md
+++ b/packages/firebase_storage/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.1+2
+
+* On iOS, use `putFile` instead of `putData` appropriately to detect `Content-Type`.
+
 ## 2.1.1+1
 
 * On iOS, gracefully handle the case of uploading a nonexistent file without crashing.
diff --git a/packages/firebase_storage/example/test_driver/firebase_storage.dart b/packages/firebase_storage/example/test_driver/firebase_storage.dart
index 677192196fd6..986439b4c649 100644
--- a/packages/firebase_storage/example/test_driver/firebase_storage.dart
+++ b/packages/firebase_storage/example/test_driver/firebase_storage.dart
@@ -44,6 +44,7 @@ void main() {
       final String url = await ref.getDownloadURL();
       final http.Response downloadData = await http.get(url);
       expect(downloadData.body, kTestString);
+      expect(downloadData.headers['content-type'], 'text/plain');
       final File tempFile = File('${systemTempDir.path}/tmp$uuid.txt');
       if (tempFile.existsSync()) {
         await tempFile.delete();
diff --git a/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m b/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
index cab57c57b982..2d5b2feb8ac6 100644
--- a/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
+++ b/packages/firebase_storage/ios/Classes/FirebaseStoragePlugin.m
@@ -180,22 +180,35 @@ - (void)getReferenceFromUrl:(FlutterMethodCall *)call result:(FlutterResult)resu
 }
 
 - (void)putFile:(FlutterMethodCall *)call result:(FlutterResult)result {
-  NSData *data = [NSData dataWithContentsOfFile:call.arguments[@"filename"]];
+  NSURL *fileUrl = [NSURL fileURLWithPath:call.arguments[@"filename"]];
+  [self
+      putHandler:^(FIRStorageReference *fileRef, FIRStorageMetadata *metadata) {
+        return [fileRef putFile:fileUrl metadata:metadata];
+      }
+            call:call
+          result:result];
+}
+
+- (void)putData:(FlutterMethodCall *)call result:(FlutterResult)result {
+  NSData *data = [(FlutterStandardTypedData *)call.arguments[@"data"] data];
   if (data == nil) {
     result([FlutterError errorWithCode:@"storage_error"
                                message:@"Failed to read file"
                                details:nil]);
     return;
   }
-  [self put:data call:call result:result];
-}
-
-- (void)putData:(FlutterMethodCall *)call result:(FlutterResult)result {
-  NSData *data = [(FlutterStandardTypedData *)call.arguments[@"data"] data];
-  [self put:data call:call result:result];
+  [self
+      putHandler:^(FIRStorageReference *fileRef, FIRStorageMetadata *metadata) {
+        return [fileRef putData:data metadata:metadata];
+      }
+            call:call
+          result:result];
 }
 
-- (void)put:(NSData *)data call:(FlutterMethodCall *)call result:(FlutterResult)result {
+- (void)putHandler:(FIRStorageUploadTask * (^)(FIRStorageReference *fileRef,
+                                               FIRStorageMetadata *metadata))putHandler
+              call:(FlutterMethodCall *)call
+            result:(FlutterResult)result {
   NSString *path = call.arguments[@"path"];
   NSDictionary *metadataDictionary = call.arguments[@"metadata"];
   FIRStorageMetadata *metadata;
@@ -203,7 +216,7 @@ - (void)put:(NSData *)data call:(FlutterMethodCall *)call result:(FlutterResult)
     metadata = [self buildMetadataFromDictionary:metadataDictionary];
   }
   FIRStorageReference *fileRef = [storage.reference child:path];
-  FIRStorageUploadTask *uploadTask = [fileRef putData:data metadata:metadata];
+  FIRStorageUploadTask *uploadTask = putHandler(fileRef, metadata);
   NSNumber *handle = [NSNumber numberWithInt:_nextUploadHandle++];
   [uploadTask observeStatus:FIRStorageTaskStatusSuccess
                     handler:^(FIRStorageTaskSnapshot *snapshot) {
diff --git a/packages/firebase_storage/pubspec.yaml b/packages/firebase_storage/pubspec.yaml
index 8c9a1ba06c2e..680f8f28c21b 100755
--- a/packages/firebase_storage/pubspec.yaml
+++ b/packages/firebase_storage/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Storage, a powerful, simple, and
   cost-effective object storage service for Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_storage
-version: 2.1.1+1
+version: 2.1.1+2
 
 flutter:
   plugin:

From 20449bf13bf9ac79a5bc0ccfb85710c5955cfefc Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Thu, 2 May 2019 13:23:30 -0700
Subject: [PATCH 388/410] [in_app_purchase] Update README. Increment version.
 (#1561)

---
 packages/in_app_purchase/CHANGELOG.md      |  65 +++++++++
 packages/in_app_purchase/README.md         | 160 +++++++++++++++++----
 packages/in_app_purchase/example/README.md |  13 +-
 packages/in_app_purchase/pubspec.yaml      |   4 +-
 4 files changed, 207 insertions(+), 35 deletions(-)

diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md
index 371102aba2fe..118cd609e335 100644
--- a/packages/in_app_purchase/CHANGELOG.md
+++ b/packages/in_app_purchase/CHANGELOG.md
@@ -1,3 +1,68 @@
+## 0.1.0
+
+Beta relase.
+
+* Ability to list products, load previous purchases, and make purchases.
+* Simplified Dart API that's been unified for ease of use.
+* Platform specific APIs more directly exposing `StoreKit` and `BillingClient`.
+
+Includes:
+
+* 5ba657dc [in_app_purchase] Remove extraneous download logic (#1560)
+* 01bb8796 [in_app_purchase] Minor doc updates (#1555)
+* 1a4d493f [in_app_purchase] Only fetch owned purchases (#1540)
+* d63c51cf [in_app_purchase] Add auto-consume errors to PurchaseDetails (#1537)
+* 959da97f [in_app_purchase] Minor doc updates (#1536)
+* b82ae1a6 [in_app_purchase] Rename the unified API (#1517)
+* d1ad723a [in_app_purchase]remove SKDownloadWrapper and related code. (#1474)
+* 7c1e8b8a [in_app_purchase]make payment unified APIs (#1421)
+* 80233db6 [in_app_purchase] Add references to the original object for PurchaseDetails and ProductDetails (#1448)
+* 8c180f0d [in_app_purchase]load purchase (#1380)
+* e9f141bc [in_app_purchase] Iap refactor (#1381)
+* d3b3d60c add driver test command to cirrus (#1342)
+* aee12523 [in_app_purchase] refactoring and tests (#1322)
+* 6d7b4592 [in_app_purchase] Adds Dart BillingClient APIs for loading purchases (#1286)
+* 5567a9c8 [in_app_purchase]retrieve receipt (#1303)
+* 3475f1b7 [in_app_purchase]restore purchases (#1299)
+* a533148d [in_app_purchase] payment queue dart ios (#1249)
+* 10030840 [in_app_purchase] Minor bugfixes and code cleanup (#1284)
+* 347f508d [in_app_purchase] Fix CI formatting errors. (#1281)
+* fad02d87 [in_app_purchase] Java API for querying purchases (#1259)
+* bc501915 [In_app_purchase]SKProduct related fixes (#1252)
+* f92ba3a1 IAP make payment objc (#1231)
+* 62b82522 [IAP] Add the Dart API for launchBillingFlow (#1232)
+* b40a4acf [IAP] Add Java call for launchBillingFlow (#1230)
+* 4ff06cd1 [In_app_purchase]remove categories (#1222)
+* 0e72ca56 [In_app_purchase]fix requesthandler crash (#1199)
+* 81dff2be Iap getproductlist basic draft (#1169)
+* db139b28 Iap iOS add payment dart wrappers (#1178)
+* 2e5fbb9b Fix the param map passed down to the platform channel when calling querySkuDetails (#1194)
+* 4a84bac1 Mark some packages as unpublishable (#1193)
+* 51696552 Add a gradle warning to the AndroidX plugins (#1138)
+* 832ab832 Iap add payment objc translators (#1172)
+* d0e615cf Revert "IAP add payment translators in objc (#1126)" (#1171)
+* 09a5a36e IAP add payment translators in objc (#1126)
+* a100fbf9 Expose nslocale and expose currencySymbol instead of currencyCode to match android (#1162)
+* 1c982efd Using json serializer for skproduct wrapper and related classes (#1147)
+* 3039a261 Iap productlist ios (#1068)
+* 2a1593da [IAP] Update dev deps to match flutter_driver (#1118)
+* 9f87cbe5 [IAP] Update README (#1112)
+* 59e84d85 Migrate independent plugins to AndroidX (#1103)
+* a027ccd6 [IAP] Generate boilerplate serializers (#1090)
+* 909cf1c2 [IAP] Fetch SkuDetails from Google Play (#1084)
+* 6bbaa7e5 [IAP] Add missing license headers (#1083)
+* 5347e877 [IAP] Clean up Dart unit tests (#1082)
+* fe03e407 [IAP] Check if the payment processor is available (#1057)
+* 43ee28cf Fix `Manifest versionCode not found` (#1076)
+* 4d702ad7 Supress `strong_mode_implicit_dynamic_method` for `invokeMethod` calls. (#1065)
+* 809ccde7 Doc and build script updates to the IAP plugin (#1024)
+* 052b71a9 Update the IAP README (#933)
+* 54f9c4e2 Upgrade Android Gradle Plugin to 3.2.1 (#916)
+* ced3e99d Set all gradle-wrapper versions to 4.10.2 (#915)
+* eaa1388b Reconfigure Cirrus to use clang 7 (#905)
+* 9b153920 Update gradle dependencies. (#881)
+* 1aef7d92 Enable lint unnecessary_new (#701)
+
 ## 0.0.2
 
 * Added missing flutter_test package dependency.
diff --git a/packages/in_app_purchase/README.md b/packages/in_app_purchase/README.md
index 9c95754415ec..e16b491f7ba6 100644
--- a/packages/in_app_purchase/README.md
+++ b/packages/in_app_purchase/README.md
@@ -1,45 +1,149 @@
 # In App Purchase
 
-A Flutter plugin for in-app purchases.
+A Flutter plugin for in-app purchases. Exposes APIs for making in app purchases
+through the App Store (on iOS) and Google Play (on Android).
 
-## Getting Started
+## Features
 
-This plugin is not ready to be used yet. Follow
-[flutter/flutter#9591](https://github.com/flutter/flutter/issues/9591) for more
-updates.
+Add this to your Flutter app to:
 
-There's a significant amount of setup required for testing in app purchases
-successfully, including registering new app IDs and store entries to use for
-testing in both the Play Developer Console and App Store Connect. Both Google
-Play and the App Store require developers to configure an app with in-app items
-for purchase to call their in-app-purchase APIs. You can check out the [example
-app](example/README.md) for an example on configuring both.
+1. Show in app products that are available for sale from the underlying shop.
+   Includes consumables, permanent upgrades, and subscriptions.
+2. Load in app products currently owned by the user according to the underlying
+   shop.
+3. Send your user to the underlying store to purchase your products.
 
-## Development
+## Getting Started
 
-This plugin uses
-[json_serializable](https://pub.dartlang.org/packages/json_serializable) for the
-many data structs passed between the underlying platform layers and Dart. After
-editing any of the serialized data structs, rebuild the serializers by running
-`flutter packages pub run build_runner build --delete-conflicting-outputs`.
-`flutter packages pub run build_runner watch --delete-conflicting-outputs` will
-watch the filesystem for changes.
+This plugin is in beta. Please use with caution and file any potential issues
+you see on our [issue tracker](https://github.com/flutter/flutter/issues/new/choose).
 
-### Design
+This plugin relies on the App Store and Google Play for making in app purchases.
+It exposes a unified surface, but you'll still need to understand and configure
+your app with each store to handle purchases using them. Both have extensive
+guides:
 
-The API surface is stacked into 2 main layers.
+* [In-App Purchase (App Store)](https://developer.apple.com/in-app-purchase/)
+* [Google Play Biling Overview](https://developer.android.com/google/play/billing/billing_overview)
+
+You can check out the [example app README](example/README.md) for steps on how
+to configure in app purchases in both stores.
+
+Once you've configured your in app purchases in their respective stores, you're
+able to start using the plugin. There's two basic options available to you to
+use.
 
 1. [in_app_purchase.dart](lib/src/in_app_purchase.dart),
    the generic idiommatic Flutter API. This exposes the most basic IAP-related
    functionality. The goal is that Flutter apps should be able to use this API
-   surface on its own for the vast majority of cases.
-   [google_play_connection.dart](lib/src/google_play_connection.dart) and
-   [app_store_connection.dart](lib/src/app_store_connection.dart) implement this
-   for the specific platforms.
+   surface on its own for the vast majority of cases. If you use this you should
+   be able to handle most use cases for loading and making purchases. If you would
+   like a more platform dependent approach, we also provide the second option as
+   below.
 
-2. The dart wrappers around the platform specific IAP APIs and their platform
-   specific implementations of the generic interface. See
+2. Dart APIs exposing the underlying platform APIs as directly as possible:
    [store_kit_wrappers.dart](lib/src/store_kit_wrappers.dart) and
    [billing_client_wrappers.dart](lib/src/billing_client_wrappers.dart). These
    API surfaces should expose all the platform-specific behavior and allow for
-   more fine-tuned control when needed.
\ No newline at end of file
+   more fine-tuned control when needed. However if you use this you'll need to
+   code your purchase handling logic significantly differently depending on
+   which platform you're on.
+
+### Initializing the plugin
+
+```dart
+// Subscribe to any incoming purchases at app initialization. These can
+// propagate from either storefront so it's important to listen as soon as
+// possible to avoid losing events.
+class _MyAppState extends State<MyApp> {
+  StreamSubscription<List<PurchaseDetails>> _subscription;
+
+  @override
+  void initState() {
+    final Stream purchaseUpdates =
+        InAppPurchaseConnection.instance.purchaseUpdatedStream;
+    _subscription = purchaseUpdates.listen((List<PurchaseDetails> purchases) {
+      _handlePurchaseUpdates(purchases);
+    });
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _subscription.cancel();
+    super.dispose();
+  }
+```
+
+### Connecting to the Storefront
+
+```dart
+final bool available = await InAppPurchaseConnection.instance.isAvailable();
+if (!available) {
+  // The store cannot be reached or accessed. Update the UI accordingly.
+}
+```
+
+### Loading products for sale
+
+```dart
+const Set<String> _kIds = <String>['product1', 'product2'].toSet();
+final ProductDetailsResponse response = await InAppPurchaseConnection.instance.queryProductDetails(_kIds);
+if (!response.notFoundIds.isEmpty()) {
+    // Handle the error.
+}
+List<ProductDetails> products = response.productDetails;
+```
+
+### Loading previous purchases
+
+```dart
+final QueryPurchaseDetailsResponse response = await InAppPurchaseConnection.instance.queryPastPurchases();
+if (response.error != null) {
+    // Handle the error.
+}
+for (PurchaseDetails purchase : repsonse.pastPurchases) {
+    _verifyPurchase(purchase);  // Verify the purchase following the best practices for each storefront.
+    _deliverPurchase(purchase); // Deliver the purchase to the user in your app.
+    if (Platform.isIOS) {
+        // Mark that you've delivered the purchase. Only the App Store requires
+        // this final confirmation.
+        InAppPurchaseConnection.instance.completePurchase(purchase);
+    }
+}
+```
+
+Note that the App Store does not have any APIs for querying consummable
+products, and Google Play considers consummable products to no longer be owned
+once they're marked as consumed and fails to return them here. For restoring
+these across devices you'll need to persist them on your own server and query
+that as well.
+
+### Making a purchase
+
+Both storefronts handle consummable and non-consummable products differently. If
+you're using `InAppPurchaseConnection`, you need to make a distinction here and
+call the right purchase method for each type.
+
+```dart
+final ProductDetails productDetails = ... // Saved earlier from queryPastPurchases().
+final PurchaseParam purchaseParam = PurchaseParam(productDetails: productDetails);
+if (_isConsumable(productDetails)) {
+    InAppPurchaseConnection.instance.buyConsumable(purchaseParam: purchaseParam);
+} else {
+    InAppPurchaseConnection.instance.buyNonConsumable(purchaseParam: purchaseParam);
+}
+
+// From here the purchase flow will be handled by the underlying storefront.
+// Updates will be delivered to the `InAppPurchaseConnection.instance.purchaseUpdatedStream`.
+```
+
+## Development
+
+This plugin uses
+[json_serializable](https://pub.dartlang.org/packages/json_serializable) for the
+many data structs passed between the underlying platform layers and Dart. After
+editing any of the serialized data structs, rebuild the serializers by running
+`flutter packages pub run build_runner build --delete-conflicting-outputs`.
+`flutter packages pub run build_runner watch --delete-conflicting-outputs` will
+watch the filesystem for changes.
\ No newline at end of file
diff --git a/packages/in_app_purchase/example/README.md b/packages/in_app_purchase/example/README.md
index 4c21b987b627..9fcad23d19ae 100644
--- a/packages/in_app_purchase/example/README.md
+++ b/packages/in_app_purchase/example/README.md
@@ -4,16 +4,19 @@ Demonstrates how to use the In App Purchase (IAP) Plugin.
 
 ## Getting Started
 
-WARNING: This plugin and example are not ready to be used. Right now the example
-app doesn't actually demonstrate any IAP functionality yet. Follow
-[flutter/flutter#9591](https://github.com/flutter/flutter/issues/9591) for more
-updates.
+This plugin is in beta. Please use with caution and file any potential issues
+you see on our [issue tracker](https://github.com/flutter/flutter/issues/new/choose).
 
 There's a significant amount of setup required for testing in app purchases
 successfully, including registering new app IDs and store entries to use for
 testing in both the Play Developer Console and App Store Connect. Both Google
 Play and the App Store require developers to configure an app with in-app items
-for purchase to call their in-app-purchase APIs.
+for purchase to call their in-app-purchase APIs. Both stores have extensive
+documentation on how to do this, and we've also included a high level guide
+below.
+
+* [In-App Purchase (App Store)](https://developer.apple.com/in-app-purchase/)
+* [Google Play Biling Overview](https://developer.android.com/google/play/billing/billing_overview)
 
 ### Android
 
diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml
index cffd35c77e7e..87ba54d63571 100644
--- a/packages/in_app_purchase/pubspec.yaml
+++ b/packages/in_app_purchase/pubspec.yaml
@@ -2,11 +2,11 @@ name: in_app_purchase
 description: A Flutter plugin for in-app purchases.
 author:  Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase
-version: 0.0.2
-publish_to: none # Not ready to be uploaded
+version: 0.1.0
 
 dependencies:
   async: ^2.0.8
+  collection: ^1.14.11
   flutter:
     sdk: flutter
   json_annotation: ^2.0.0

From 3bba81759894345e9407be49c960367359ef3aba Mon Sep 17 00:00:00 2001
From: ml <github@matthewlloyd.net>
Date: Thu, 2 May 2019 18:48:28 -0400
Subject: [PATCH 389/410] Avoid calling null callbacks (#1553)

There is no requirement that the callback parameters need to be non-null,
so without these checks, the plugin can generate exceptions, e.g. when
overlays that have no onTap callback are clicked.

Also guards against overlay or marker IDs not being present in the
dictionaries, which could happen by race condition (e.g. a click event
could be slightly delayed and get handled after the associated object has
already been removed).
---
 packages/google_maps_flutter/CHANGELOG.md        |  4 ++++
 .../google_maps_flutter/lib/src/google_map.dart  | 16 ++++++++++++----
 packages/google_maps_flutter/pubspec.yaml        |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 8cab8f69888f..e953619e8662 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.12
+
+* Prevent calling null callbacks and callbacks on removed objects.
+
 ## 0.5.11+1
 
 * Android: Fix an issue where myLocationButtonEnabled setting was not propagated when set to false onMapLoad.
diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/lib/src/google_map.dart
index d115bce4a3c6..8c51483bcba6 100644
--- a/packages/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/lib/src/google_map.dart
@@ -248,24 +248,32 @@ class _GoogleMapState extends State<GoogleMap> {
   void onMarkerTap(String markerIdParam) {
     assert(markerIdParam != null);
     final MarkerId markerId = MarkerId(markerIdParam);
-    _markers[markerId].onTap();
+    if (_markers[markerId]?.onTap != null) {
+      _markers[markerId].onTap();
+    }
   }
 
   void onPolylineTap(String polylineIdParam) {
     assert(polylineIdParam != null);
     final PolylineId polylineId = PolylineId(polylineIdParam);
-    _polylines[polylineId].onTap();
+    if (_polylines[polylineId]?.onTap != null) {
+      _polylines[polylineId].onTap();
+    }
   }
 
   void onInfoWindowTap(String markerIdParam) {
     assert(markerIdParam != null);
     final MarkerId markerId = MarkerId(markerIdParam);
-    _markers[markerId].infoWindow.onTap();
+    if (_markers[markerId]?.infoWindow?.onTap != null) {
+      _markers[markerId].infoWindow.onTap();
+    }
   }
 
   void onTap(LatLng position) {
     assert(position != null);
-    widget.onTap(position);
+    if (widget.onTap != null) {
+      widget.onTap(position);
+    }
   }
 }
 
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index f3465134ed12..c99792b549ba 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.11+1
+version: 0.5.12
 
 dependencies:
   flutter:

From 49c4ad9a079f2dbf79324f3957bc774a0e294970 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Thu, 2 May 2019 18:30:44 -0700
Subject: [PATCH 390/410] [firebase_crashlytics] Migrate FlutterErrorDetails
 (#1564)

Update our handling of the struct to work on both flutter stable and
master. The plugin itself works on both, but our unit tests now only
run on master.
---
 packages/firebase_crashlytics/CHANGELOG.md                 | 5 +++++
 .../firebase_crashlytics/lib/src/firebase_crashlytics.dart | 5 ++++-
 packages/firebase_crashlytics/pubspec.yaml                 | 2 +-
 .../test/firebase_crashlytics_test.dart                    | 7 +++----
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/firebase_crashlytics/CHANGELOG.md b/packages/firebase_crashlytics/CHANGELOG.md
index 256ee642f31b..7dd847beaa02 100644
--- a/packages/firebase_crashlytics/CHANGELOG.md
+++ b/packages/firebase_crashlytics/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.0.4+3
+
+* Migrate our handling of `FlutterErrorDetails` to work on both Flutter stable
+  and master.
+
 ## 0.0.4+2
 
 * Keep debug log formatting.
diff --git a/packages/firebase_crashlytics/lib/src/firebase_crashlytics.dart b/packages/firebase_crashlytics/lib/src/firebase_crashlytics.dart
index ae2a46769d9c..5931aadae168 100644
--- a/packages/firebase_crashlytics/lib/src/firebase_crashlytics.dart
+++ b/packages/firebase_crashlytics/lib/src/firebase_crashlytics.dart
@@ -47,7 +47,10 @@ class Crashlytics {
           // ignore: strong_mode_implicit_dynamic_method
           await channel.invokeMethod('Crashlytics#onError', <String, dynamic>{
         'exception': details.exceptionAsString(),
-        'context': details.context,
+        // FlutterErrorDetails.context has been migrated from a String to a
+        // DiagnosticsNode. Coerce it to a String here in a way that will work
+        // on both Strings and the new DiagnosticsNode values. See https://groups.google.com/forum/#!topic/flutter-announce/hp1RNIgej38
+        'context': '${details.context}',
         'stackTraceElements': stackTraceElements,
         'logs': _logs.toList(),
         'keys': _prepareKeys(),
diff --git a/packages/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/pubspec.yaml
index 569dbdf30a4e..0b3554797979 100644
--- a/packages/firebase_crashlytics/pubspec.yaml
+++ b/packages/firebase_crashlytics/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_crashlytics
 description: Flutter plugin for Firebase Crashlytics. It reports uncaught errors to the
   Firebase console.
-version: 0.0.4+2
+version: 0.0.4+3
 author: Flutter Team <flutter-dev@google.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_crashlytics
 
diff --git a/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart b/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart
index ab92c9eafdec..d6bee5cc5b83 100644
--- a/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart
+++ b/packages/firebase_crashlytics/test/firebase_crashlytics_test.dart
@@ -1,5 +1,7 @@
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -32,10 +34,7 @@ void main() {
         exception: 'foo exception',
         stack: StackTrace.current,
         library: 'foo library',
-        context: 'foo context',
-        informationCollector: (StringBuffer information) {
-          information.writeln('foo information');
-        },
+        context: ErrorDescription('foo context'),
       );
       crashlytics.enableInDevMode = true;
       crashlytics.log('foo');

From 1b3413a2a01ace10ed340d5bbd336f8c11790e26 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Fri, 3 May 2019 15:13:11 -0700
Subject: [PATCH 391/410] [path_provider] Release as 1.0 and add integration
 tests (#1565)

* Add testing for path_provider
* Add @collinjackson to codeowners
* Release as 1.0
---
 CODEOWNERS                                    |  1 +
 packages/path_provider/CHANGELOG.md           |  4 ++
 packages/path_provider/example/pubspec.yaml   |  6 +++
 .../example/test_driver/path_provider.dart    | 49 +++++++++++++++++++
 .../test_driver/path_provider_test.dart       | 13 +++++
 packages/path_provider/pubspec.yaml           |  6 ++-
 6 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 packages/path_provider/example/test_driver/path_provider.dart
 create mode 100644 packages/path_provider/example/test_driver/path_provider_test.dart

diff --git a/CODEOWNERS b/CODEOWNERS
index 32662040e677..609807e3f171 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -26,6 +26,7 @@ packages/google_sign_in/* @cyanglaz @mehmetf
 packages/image_picker/* @cyanglaz
 packages/in_app_purchase/* @mklim @cyanglaz
 packages/package_info/* @cyanglaz
+packages/path_provider/* @collinjackson
 packages/shared_preferences/* @collinjackson
 packages/video_player/* @iskakaushik @cyanglaz
 packages/webview_flutter/* @amirh @iskakaushik
diff --git a/packages/path_provider/CHANGELOG.md b/packages/path_provider/CHANGELOG.md
index b2578a43ba60..c4c8e763f90d 100644
--- a/packages/path_provider/CHANGELOG.md
+++ b/packages/path_provider/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.0
+
+* Added integration tests.
+
 ## 0.5.0+1
 
 * Log a more detailed warning at build time about the previous AndroidX
diff --git a/packages/path_provider/example/pubspec.yaml b/packages/path_provider/example/pubspec.yaml
index e95c465e856f..9daa92b8c22e 100644
--- a/packages/path_provider/example/pubspec.yaml
+++ b/packages/path_provider/example/pubspec.yaml
@@ -6,6 +6,12 @@ dependencies:
     sdk: flutter
   path_provider:
     path: ../
+  uuid: "^1.0.0"
+
+dev_dependencies:
+  flutter_driver:
+    sdk: flutter
+  test: any
 
 flutter:
   uses-material-design: true
diff --git a/packages/path_provider/example/test_driver/path_provider.dart b/packages/path_provider/example/test_driver/path_provider.dart
new file mode 100644
index 000000000000..c0c623747d17
--- /dev/null
+++ b/packages/path_provider/example/test_driver/path_provider.dart
@@ -0,0 +1,49 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+
+import 'dart:io';
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:uuid/uuid.dart';
+
+void main() {
+  final Completer<String> allTestsCompleter = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => allTestsCompleter.future);
+  tearDownAll(() => allTestsCompleter.complete(null));
+
+  test('getTemporaryDirectory', () async {
+    final Directory result = await getTemporaryDirectory();
+    final String uuid = Uuid().v1();
+    final File file = File('${result.path}/$uuid.txt');
+    file.writeAsStringSync('Hello world!');
+    expect(file.readAsStringSync(), 'Hello world!');
+    expect(result.listSync(), isNotEmpty);
+    file.deleteSync();
+  });
+
+  test('getApplicationDocumentsDirectory', () async {
+    final Directory result = await getApplicationDocumentsDirectory();
+    final String uuid = Uuid().v1();
+    final File file = File('${result.path}/$uuid.txt');
+    file.writeAsStringSync('Hello world!');
+    expect(file.readAsStringSync(), 'Hello world!');
+    expect(result.listSync(), isNotEmpty);
+    file.deleteSync();
+  });
+
+  test('getExternalStorageDirectory', () async {
+    if (Platform.isIOS) {
+      final Future<Directory> result = getExternalStorageDirectory();
+      expect(result, throwsA(isInstanceOf<UnsupportedError>()));
+    } else if (Platform.isAndroid) {
+      final Directory result = await getExternalStorageDirectory();
+      // This directory is not accessible in Android emulators.
+      // However, it should at least have a fake path returned.
+      expect(result.path.length, isNonZero);
+    }
+  });
+}
diff --git a/packages/path_provider/example/test_driver/path_provider_test.dart b/packages/path_provider/example/test_driver/path_provider_test.dart
new file mode 100644
index 000000000000..b0d3305cd652
--- /dev/null
+++ b/packages/path_provider/example/test_driver/path_provider_test.dart
@@ -0,0 +1,13 @@
+// Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter_driver/flutter_driver.dart';
+
+Future<void> main() async {
+  final FlutterDriver driver = await FlutterDriver.connect();
+  await driver.requestData(null, timeout: const Duration(minutes: 1));
+  driver.close();
+}
diff --git a/packages/path_provider/pubspec.yaml b/packages/path_provider/pubspec.yaml
index 2d3304dcaa35..9913857e150f 100644
--- a/packages/path_provider/pubspec.yaml
+++ b/packages/path_provider/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for getting commonly used locations on the Android &
   iOS file systems, such as the temp and app data directories.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider
-version: 0.5.0+1
+version: 1.0.0
 
 flutter:
   plugin:
@@ -18,6 +18,10 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  test: any
+  uuid: "^1.0.0"
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"

From 59053df2d3e2dfd9a2a84def4856d559a0336089 Mon Sep 17 00:00:00 2001
From: Aawaz Gyawali <awazgyawali@gmail.com>
Date: Mon, 6 May 2019 22:30:03 +0545
Subject: [PATCH 392/410] [firebase_auth] Removed automatic signing in
 behaviour when signing in with phone auth. (#1568)

* Update phone auth on Android to avoid signing in the user automatically.
* Remove nextHandle from public API
---
 packages/firebase_auth/CHANGELOG.md           |  6 ++++
 packages/firebase_auth/android/build.gradle   |  1 +
 .../firebaseauth/FirebaseAuthPlugin.java      | 29 +++++++++----------
 .../example/lib/signin_page.dart              |  5 ++--
 .../auth_provider/phone_auth_provider.dart    | 10 +++++++
 .../firebase_auth/lib/src/firebase_auth.dart  | 16 +++++-----
 packages/firebase_auth/pubspec.yaml           |  2 +-
 7 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index f76cb544c06e..6372c30bf4bf 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.9.0
+
+* **Breaking change**: `PhoneVerificationCompleted` now provides an `AuthCredential` that can
+  be used with `signInWithCredential` or `linkWithCredential` instead of signing in automatically.
+* **Breaking change**: Remove internal counter `nextHandle` from public API.
+
 ## 0.8.4+5
 
 * Increase Firebase/Auth CocoaPod dependency to '~> 5.19'.
diff --git a/packages/firebase_auth/android/build.gradle b/packages/firebase_auth/android/build.gradle
index 80a2b7308e92..1affbc85c646 100755
--- a/packages/firebase_auth/android/build.gradle
+++ b/packages/firebase_auth/android/build.gradle
@@ -47,5 +47,6 @@ android {
     }
     dependencies {
         api 'com.google.firebase:firebase-auth:16.0.5'
+        api 'com.google.code.gson:gson:2.8.5'
     }
 }
diff --git a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
index 6e194fb5a025..c1f91babb3c4 100755
--- a/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
+++ b/packages/firebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
@@ -36,6 +36,7 @@
 import com.google.firebase.auth.TwitterAuthProvider;
 import com.google.firebase.auth.UserInfo;
 import com.google.firebase.auth.UserProfileChangeRequest;
+import com.google.gson.Gson;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -189,19 +190,11 @@ private void handleVerifyPhoneNumber(
         new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
           @Override
           public void onVerificationCompleted(PhoneAuthCredential phoneAuthCredential) {
-            firebaseAuth
-                .signInWithCredential(phoneAuthCredential)
-                .addOnCompleteListener(
-                    new OnCompleteListener<AuthResult>() {
-                      @Override
-                      public void onComplete(@NonNull Task<AuthResult> task) {
-                        if (task.isSuccessful()) {
-                          Map<String, Object> arguments = new HashMap<>();
-                          arguments.put("handle", handle);
-                          channel.invokeMethod("phoneVerificationCompleted", arguments);
-                        }
-                      }
-                    });
+            Map<String, Object> arguments = new HashMap<>();
+            arguments.put("handle", handle);
+            String parsedJson = new Gson().toJson(phoneAuthCredential);
+            arguments.put("phoneAuthCredential", parsedJson);
+            channel.invokeMethod("phoneVerificationCompleted", arguments);
           }
 
           @Override
@@ -453,9 +446,13 @@ private AuthCredential getCredential(Map<String, Object> arguments) {
         }
       case PhoneAuthProvider.PROVIDER_ID:
         {
-          String accessToken = data.get("verificationId");
-          String smsCode = data.get("smsCode");
-          credential = PhoneAuthProvider.getCredential(accessToken, smsCode);
+          if (data.containsKey("verificationId")) {
+            String accessToken = data.get("verificationId");
+            String smsCode = data.get("smsCode");
+            credential = PhoneAuthProvider.getCredential(accessToken, smsCode);
+          } else {
+            credential = new Gson().fromJson(data.get("jsonObject"), PhoneAuthCredential.class);
+          }
           break;
         }
       default:
diff --git a/packages/firebase_auth/example/lib/signin_page.dart b/packages/firebase_auth/example/lib/signin_page.dart
index c8f39757c1be..35a7a45ec838 100644
--- a/packages/firebase_auth/example/lib/signin_page.dart
+++ b/packages/firebase_auth/example/lib/signin_page.dart
@@ -506,9 +506,10 @@ class _PhoneSignInSectionState extends State<_PhoneSignInSection> {
       _message = '';
     });
     final PhoneVerificationCompleted verificationCompleted =
-        (FirebaseUser user) {
+        (AuthCredential phoneAuthCredential) {
+      _auth.signInWithCredential(phoneAuthCredential);
       setState(() {
-        _message = 'signInWithPhoneNumber auto succeeded: $user';
+        _message = 'Received phone auth credential: $phoneAuthCredential';
       });
     };
 
diff --git a/packages/firebase_auth/lib/src/auth_provider/phone_auth_provider.dart b/packages/firebase_auth/lib/src/auth_provider/phone_auth_provider.dart
index 9ff5d94eacf4..3930e801d715 100644
--- a/packages/firebase_auth/lib/src/auth_provider/phone_auth_provider.dart
+++ b/packages/firebase_auth/lib/src/auth_provider/phone_auth_provider.dart
@@ -16,4 +16,14 @@ class PhoneAuthProvider {
       'smsCode': smsCode,
     });
   }
+
+  // PhoneAuthProvider uses JSON serialization on Android when the SMS code was
+  // detected automatically.
+  static AuthCredential _getCredentialFromObject({
+    @required String jsonObject,
+  }) {
+    return AuthCredential._(providerId, <String, String>{
+      "jsonObject": jsonObject,
+    });
+  }
 }
diff --git a/packages/firebase_auth/lib/src/firebase_auth.dart b/packages/firebase_auth/lib/src/firebase_auth.dart
index 44b916897c86..4b2949f280d0 100644
--- a/packages/firebase_auth/lib/src/firebase_auth.dart
+++ b/packages/firebase_auth/lib/src/firebase_auth.dart
@@ -4,7 +4,7 @@
 
 part of firebase_auth;
 
-typedef void PhoneVerificationCompleted(FirebaseUser firebaseUser);
+typedef void PhoneVerificationCompleted(AuthCredential phoneAuthCredential);
 typedef void PhoneVerificationFailed(AuthException error);
 typedef void PhoneCodeSent(String verificationId, [int forceResendingToken]);
 typedef void PhoneCodeAutoRetrievalTimeout(String verificationId);
@@ -32,7 +32,7 @@ class FirebaseAuth {
   final Map<int, StreamController<FirebaseUser>> _authStateChangedControllers =
       <int, StreamController<FirebaseUser>>{};
 
-  static int nextHandle = 0;
+  static int _nextHandle = 0;
   final Map<int, Map<String, dynamic>> _phoneAuthCallbacks =
       <int, Map<String, dynamic>>{};
 
@@ -317,7 +317,8 @@ class FirebaseAuth {
   ///
   /// [verificationCompleted] This callback must be implemented.
   ///   It will trigger when an SMS is auto-retrieved or the phone number has
-  ///   been instantly verified. The callback will provide a [FirebaseUser].
+  ///   been instantly verified. The callback will receive an [AuthCredential]
+  ///   that can be passed to [signInWithCredential] or [linkWithCredential].
   ///
   /// [verificationFailed] This callback must be implemented.
   ///   Triggered when an error occurred during phone number verification.
@@ -344,11 +345,11 @@ class FirebaseAuth {
       'PhoneCodeSent': codeSent,
       'PhoneCodeAuthRetrievalTimeout': codeAutoRetrievalTimeout,
     };
-    nextHandle += 1;
-    _phoneAuthCallbacks[nextHandle] = callbacks;
+    _nextHandle += 1;
+    _phoneAuthCallbacks[_nextHandle] = callbacks;
 
     final Map<String, dynamic> params = <String, dynamic>{
-      'handle': nextHandle,
+      'handle': _nextHandle,
       'phoneNumber': phoneNumber,
       'timeout': timeout.inMilliseconds,
       'forceResendingToken': forceResendingToken,
@@ -472,7 +473,8 @@ class FirebaseAuth {
         final int handle = call.arguments['handle'];
         final PhoneVerificationCompleted verificationCompleted =
             _phoneAuthCallbacks[handle]['PhoneVerificationCompleted'];
-        verificationCompleted(await currentUser());
+        verificationCompleted(PhoneAuthProvider._getCredentialFromObject(
+            jsonObject: call.arguments["phoneAuthCredential"].toString()));
         break;
       case 'phoneVerificationFailed':
         final int handle = call.arguments['handle'];
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 45881f0771a3..a1594bbac87d 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.8.4+5"
+version: "0.9.0"
 
 flutter:
   plugin:

From 9de01c06bf9f2b45c3a8d0181a3d315fed23672f Mon Sep 17 00:00:00 2001
From: Matthew Lloyd <github@matthewlloyd.net>
Date: Mon, 6 May 2019 15:54:50 -0400
Subject: [PATCH 393/410] Adds support for circle overlays to the Google Maps
 plugin (#1550)

This is relatively trivial, requiring only some additional logic to disambiguate click events between the various possible overlays.

I've followed the majority (2/3: Android and JavaScript) Google Maps API convention that circles have a center property, rather than
a position.

Also adds a page to the example app to demonstrate its use, which I tested on iOS and Android.
---
 packages/google_maps_flutter/CHANGELOG.md     |   4 +
 .../plugins/googlemaps/CircleBuilder.java     |  66 ++++++
 .../plugins/googlemaps/CircleController.java  |  74 ++++++
 .../plugins/googlemaps/CircleOptionsSink.java |  27 +++
 .../plugins/googlemaps/CirclesController.java | 111 +++++++++
 .../flutter/plugins/googlemaps/Convert.java   |  51 ++++
 .../plugins/googlemaps/GoogleMapBuilder.java  |   7 +
 .../googlemaps/GoogleMapController.java       |  36 +++
 .../plugins/googlemaps/GoogleMapFactory.java  |   3 +
 .../googlemaps/GoogleMapOptionsSink.java      |   2 +
 .../google_maps_flutter/example/lib/main.dart |   2 +
 .../example/lib/place_circle.dart             | 217 ++++++++++++++++++
 .../ios/Classes/GoogleMapCircleController.h   |  39 ++++
 .../ios/Classes/GoogleMapCircleController.m   | 198 ++++++++++++++++
 .../ios/Classes/GoogleMapController.h         |   1 +
 .../ios/Classes/GoogleMapController.m         |  30 ++-
 .../ios/Classes/GoogleMapPolylineController.h |   1 +
 .../ios/Classes/GoogleMapPolylineController.m |   6 +
 .../ios/Classes/GoogleMapsPlugin.h            |   1 +
 .../lib/google_maps_flutter.dart              |   2 +
 .../google_maps_flutter/lib/src/circle.dart   | 164 +++++++++++++
 .../lib/src/circle_updates.dart               |  90 ++++++++
 .../lib/src/controller.dart                   |  20 ++
 .../lib/src/google_map.dart                   |  21 ++
 packages/google_maps_flutter/pubspec.yaml     |   2 +-
 .../test/circle_updates_test.dart             | 198 ++++++++++++++++
 .../test/fake_maps_controllers.dart           |  57 +++++
 27 files changed, 1427 insertions(+), 3 deletions(-)
 create mode 100644 packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleBuilder.java
 create mode 100644 packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleController.java
 create mode 100644 packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleOptionsSink.java
 create mode 100644 packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CirclesController.java
 create mode 100644 packages/google_maps_flutter/example/lib/place_circle.dart
 create mode 100644 packages/google_maps_flutter/ios/Classes/GoogleMapCircleController.h
 create mode 100644 packages/google_maps_flutter/ios/Classes/GoogleMapCircleController.m
 create mode 100644 packages/google_maps_flutter/lib/src/circle.dart
 create mode 100644 packages/google_maps_flutter/lib/src/circle_updates.dart
 create mode 100644 packages/google_maps_flutter/test/circle_updates_test.dart

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index e953619e8662..51d918aea262 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.13
+
+* Add support for Circle overlays.
+
 ## 0.5.12
 
 * Prevent calling null callbacks and callbacks on removed objects.
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleBuilder.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleBuilder.java
new file mode 100644
index 000000000000..6229d67e567e
--- /dev/null
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleBuilder.java
@@ -0,0 +1,66 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.googlemaps;
+
+import com.google.android.gms.maps.model.CircleOptions;
+import com.google.android.gms.maps.model.LatLng;
+
+class CircleBuilder implements CircleOptionsSink {
+  private final CircleOptions circleOptions;
+  private boolean consumeTapEvents;
+
+  CircleBuilder() {
+    this.circleOptions = new CircleOptions();
+  }
+
+  CircleOptions build() {
+    return circleOptions;
+  }
+
+  boolean consumeTapEvents() {
+    return consumeTapEvents;
+  }
+
+  @Override
+  public void setFillColor(int color) {
+    circleOptions.fillColor(color);
+  }
+
+  @Override
+  public void setStrokeColor(int color) {
+    circleOptions.strokeColor(color);
+  }
+
+  @Override
+  public void setCenter(LatLng center) {
+    circleOptions.center(center);
+  }
+
+  @Override
+  public void setRadius(double radius) {
+    circleOptions.radius(radius);
+  }
+
+  @Override
+  public void setConsumeTapEvents(boolean consumeTapEvents) {
+    this.consumeTapEvents = consumeTapEvents;
+    circleOptions.clickable(consumeTapEvents);
+  }
+
+  @Override
+  public void setVisible(boolean visible) {
+    circleOptions.visible(visible);
+  }
+
+  @Override
+  public void setStrokeWidth(float strokeWidth) {
+    circleOptions.strokeWidth(strokeWidth);
+  }
+
+  @Override
+  public void setZIndex(float zIndex) {
+    circleOptions.zIndex(zIndex);
+  }
+}
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleController.java
new file mode 100644
index 000000000000..a649a15d98d0
--- /dev/null
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleController.java
@@ -0,0 +1,74 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.googlemaps;
+
+import com.google.android.gms.maps.model.Circle;
+import com.google.android.gms.maps.model.LatLng;
+
+/** Controller of a single Circle on the map. */
+class CircleController implements CircleOptionsSink {
+  private final Circle circle;
+  private final String googleMapsCircleId;
+  private boolean consumeTapEvents;
+
+  CircleController(Circle circle, boolean consumeTapEvents) {
+    this.circle = circle;
+    this.consumeTapEvents = consumeTapEvents;
+    this.googleMapsCircleId = circle.getId();
+  }
+
+  void remove() {
+    circle.remove();
+  }
+
+  @Override
+  public void setConsumeTapEvents(boolean consumeTapEvents) {
+    this.consumeTapEvents = consumeTapEvents;
+    circle.setClickable(consumeTapEvents);
+  }
+
+  @Override
+  public void setStrokeColor(int strokeColor) {
+    circle.setStrokeColor(strokeColor);
+  }
+
+  @Override
+  public void setFillColor(int fillColor) {
+    circle.setFillColor(fillColor);
+  }
+
+  @Override
+  public void setCenter(LatLng center) {
+    circle.setCenter(center);
+  }
+
+  @Override
+  public void setRadius(double radius) {
+    circle.setRadius(radius);
+  }
+
+  @Override
+  public void setVisible(boolean visible) {
+    circle.setVisible(visible);
+  }
+
+  @Override
+  public void setStrokeWidth(float strokeWidth) {
+    circle.setStrokeWidth(strokeWidth);
+  }
+
+  @Override
+  public void setZIndex(float zIndex) {
+    circle.setZIndex(zIndex);
+  }
+
+  String getGoogleMapsCircleId() {
+    return googleMapsCircleId;
+  }
+
+  boolean consumeTapEvents() {
+    return consumeTapEvents;
+  }
+}
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleOptionsSink.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleOptionsSink.java
new file mode 100644
index 000000000000..950c3209ee62
--- /dev/null
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleOptionsSink.java
@@ -0,0 +1,27 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.googlemaps;
+
+import com.google.android.gms.maps.model.LatLng;
+
+/** Receiver of Circle configuration options. */
+interface CircleOptionsSink {
+
+  void setConsumeTapEvents(boolean consumetapEvents);
+
+  void setStrokeColor(int strokeColor);
+
+  void setFillColor(int fillColor);
+
+  void setCenter(LatLng center);
+
+  void setRadius(double radius);
+
+  void setVisible(boolean visible);
+
+  void setStrokeWidth(float strokeWidth);
+
+  void setZIndex(float zIndex);
+}
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CirclesController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CirclesController.java
new file mode 100644
index 000000000000..e80a123f8358
--- /dev/null
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CirclesController.java
@@ -0,0 +1,111 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.googlemaps;
+
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.model.Circle;
+import com.google.android.gms.maps.model.CircleOptions;
+import io.flutter.plugin.common.MethodChannel;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+class CirclesController {
+
+  private final Map<String, CircleController> circleIdToController;
+  private final Map<String, String> googleMapsCircleIdToDartCircleId;
+  private final MethodChannel methodChannel;
+  private GoogleMap googleMap;
+
+  CirclesController(MethodChannel methodChannel) {
+    this.circleIdToController = new HashMap<>();
+    this.googleMapsCircleIdToDartCircleId = new HashMap<>();
+    this.methodChannel = methodChannel;
+  }
+
+  void setGoogleMap(GoogleMap googleMap) {
+    this.googleMap = googleMap;
+  }
+
+  void addCircles(List<Object> circlesToAdd) {
+    if (circlesToAdd != null) {
+      for (Object circleToAdd : circlesToAdd) {
+        addCircle(circleToAdd);
+      }
+    }
+  }
+
+  void changeCircles(List<Object> circlesToChange) {
+    if (circlesToChange != null) {
+      for (Object circleToChange : circlesToChange) {
+        changeCircle(circleToChange);
+      }
+    }
+  }
+
+  void removeCircles(List<Object> circleIdsToRemove) {
+    if (circleIdsToRemove == null) {
+      return;
+    }
+    for (Object rawCircleId : circleIdsToRemove) {
+      if (rawCircleId == null) {
+        continue;
+      }
+      String circleId = (String) rawCircleId;
+      final CircleController circleController = circleIdToController.remove(circleId);
+      if (circleController != null) {
+        circleController.remove();
+        googleMapsCircleIdToDartCircleId.remove(circleController.getGoogleMapsCircleId());
+      }
+    }
+  }
+
+  boolean onCircleTap(String googleCircleId) {
+    String circleId = googleMapsCircleIdToDartCircleId.get(googleCircleId);
+    if (circleId == null) {
+      return false;
+    }
+    methodChannel.invokeMethod("circle#onTap", Convert.circleIdToJson(circleId));
+    CircleController circleController = circleIdToController.get(circleId);
+    if (circleController != null) {
+      return circleController.consumeTapEvents();
+    }
+    return false;
+  }
+
+  private void addCircle(Object circle) {
+    if (circle == null) {
+      return;
+    }
+    CircleBuilder circleBuilder = new CircleBuilder();
+    String circleId = Convert.interpretCircleOptions(circle, circleBuilder);
+    CircleOptions options = circleBuilder.build();
+    addCircle(circleId, options, circleBuilder.consumeTapEvents());
+  }
+
+  private void addCircle(String circleId, CircleOptions circleOptions, boolean consumeTapEvents) {
+    final Circle circle = googleMap.addCircle(circleOptions);
+    CircleController controller = new CircleController(circle, consumeTapEvents);
+    circleIdToController.put(circleId, controller);
+    googleMapsCircleIdToDartCircleId.put(circle.getId(), circleId);
+  }
+
+  private void changeCircle(Object circle) {
+    if (circle == null) {
+      return;
+    }
+    String circleId = getCircleId(circle);
+    CircleController circleController = circleIdToController.get(circleId);
+    if (circleController != null) {
+      Convert.interpretCircleOptions(circle, circleController);
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  private static String getCircleId(Object circle) {
+    Map<String, Object> circleMap = (Map<String, Object>) circle;
+    return (String) circleMap.get("circleId");
+  }
+}
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
index d26dcf81f5aa..46ae935cbeb6 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
@@ -179,6 +179,15 @@ static Object polylineIdToJson(String polylineId) {
     return data;
   }
 
+  static Object circleIdToJson(String circleId) {
+    if (circleId == null) {
+      return null;
+    }
+    final Map<String, Object> data = new HashMap<>(1);
+    data.put("circleId", circleId);
+    return data;
+  }
+
   static Object latLngToJson(LatLng latLng) {
     return Arrays.asList(latLng.latitude, latLng.longitude);
   }
@@ -409,6 +418,48 @@ static String interpretPolylineOptions(Object o, PolylineOptionsSink sink) {
     }
   }
 
+  static String interpretCircleOptions(Object o, CircleOptionsSink sink) {
+    final Map<?, ?> data = toMap(o);
+    final Object consumeTapEvents = data.get("consumeTapEvents");
+    if (consumeTapEvents != null) {
+      sink.setConsumeTapEvents(toBoolean(consumeTapEvents));
+    }
+    final Object fillColor = data.get("fillColor");
+    if (fillColor != null) {
+      sink.setFillColor(toInt(fillColor));
+    }
+    final Object strokeColor = data.get("strokeColor");
+    if (strokeColor != null) {
+      sink.setStrokeColor(toInt(strokeColor));
+    }
+    final Object visible = data.get("visible");
+    if (visible != null) {
+      sink.setVisible(toBoolean(visible));
+    }
+    final Object strokeWidth = data.get("strokeWidth");
+    if (strokeWidth != null) {
+      sink.setStrokeWidth(toInt(strokeWidth));
+    }
+    final Object zIndex = data.get("zIndex");
+    if (zIndex != null) {
+      sink.setZIndex(toFloat(zIndex));
+    }
+    final Object center = data.get("center");
+    if (center != null) {
+      sink.setCenter(toLatLng(center));
+    }
+    final Object radius = data.get("radius");
+    if (radius != null) {
+      sink.setRadius(toDouble(radius));
+    }
+    final String circleId = (String) data.get("circleId");
+    if (circleId == null) {
+      throw new IllegalArgumentException("circleId was null");
+    } else {
+      return circleId;
+    }
+  }
+
   private static List<LatLng> toPoints(Object o) {
     final List<?> data = toList(o);
     final List<LatLng> points = new ArrayList<>(data.size());
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
index cd1dce1012e7..bb3d750a870f 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
@@ -18,6 +18,7 @@ class GoogleMapBuilder implements GoogleMapOptionsSink {
   private boolean myLocationButtonEnabled = false;
   private Object initialMarkers;
   private Object initialPolylines;
+  private Object initialCircles;
 
   GoogleMapController build(
       int id, Context context, AtomicInteger state, PluginRegistry.Registrar registrar) {
@@ -29,6 +30,7 @@ GoogleMapController build(
     controller.setTrackCameraPosition(trackCameraPosition);
     controller.setInitialMarkers(initialMarkers);
     controller.setInitialPolylines(initialPolylines);
+    controller.setInitialCircles(initialCircles);
     return controller;
   }
 
@@ -105,4 +107,9 @@ public void setInitialMarkers(Object initialMarkers) {
   public void setInitialPolylines(Object initialPolylines) {
     this.initialPolylines = initialPolylines;
   }
+
+  @Override
+  public void setInitialCircles(Object initialCircles) {
+    this.initialCircles = initialCircles;
+  }
 }
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index 7866c59ea19f..f038bc4f9d63 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -26,6 +26,7 @@
 import com.google.android.gms.maps.MapView;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.model.CameraPosition;
+import com.google.android.gms.maps.model.Circle;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.android.gms.maps.model.Marker;
@@ -50,6 +51,7 @@ final class GoogleMapController
         GoogleMap.OnInfoWindowClickListener,
         GoogleMap.OnMarkerClickListener,
         GoogleMap.OnPolylineClickListener,
+        GoogleMap.OnCircleClickListener,
         GoogleMapOptionsSink,
         MethodChannel.MethodCallHandler,
         OnMapReadyCallback,
@@ -73,8 +75,10 @@ final class GoogleMapController
   private final Context context;
   private final MarkersController markersController;
   private final PolylinesController polylinesController;
+  private final CirclesController circlesController;
   private List<Object> initialMarkers;
   private List<Object> initialPolylines;
+  private List<Object> initialCircles;
 
   GoogleMapController(
       int id,
@@ -94,6 +98,7 @@ final class GoogleMapController
     this.registrarActivityHashCode = registrar.activity().hashCode();
     this.markersController = new MarkersController(methodChannel);
     this.polylinesController = new PolylinesController(methodChannel);
+    this.circlesController = new CirclesController(methodChannel);
   }
 
   @Override
@@ -164,12 +169,15 @@ public void onMapReady(GoogleMap googleMap) {
     googleMap.setOnCameraIdleListener(this);
     googleMap.setOnMarkerClickListener(this);
     googleMap.setOnPolylineClickListener(this);
+    googleMap.setOnCircleClickListener(this);
     googleMap.setOnMapClickListener(this);
     updateMyLocationSettings();
     markersController.setGoogleMap(googleMap);
     polylinesController.setGoogleMap(googleMap);
+    circlesController.setGoogleMap(googleMap);
     updateInitialMarkers();
     updateInitialPolylines();
+    updateInitialCircles();
   }
 
   @Override
@@ -239,6 +247,17 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
           result.success(null);
           break;
         }
+      case "circles#update":
+        {
+          Object circlesToAdd = call.argument("circlesToAdd");
+          circlesController.addCircles((List<Object>) circlesToAdd);
+          Object circlesToChange = call.argument("circlesToChange");
+          circlesController.changeCircles((List<Object>) circlesToChange);
+          Object circleIdsToRemove = call.argument("circleIdsToRemove");
+          circlesController.removeCircles((List<Object>) circleIdsToRemove);
+          result.success(null);
+          break;
+        }
       case "map#isCompassEnabled":
         {
           result.success(googleMap.getUiSettings().isCompassEnabled());
@@ -327,6 +346,11 @@ public void onPolylineClick(Polyline polyline) {
     polylinesController.onPolylineTap(polyline.getId());
   }
 
+  @Override
+  public void onCircleClick(Circle circle) {
+    circlesController.onCircleTap(circle.getId());
+  }
+
   @Override
   public void dispose() {
     if (disposed) {
@@ -493,6 +517,18 @@ private void updateInitialPolylines() {
     polylinesController.addPolylines(initialPolylines);
   }
 
+  @Override
+  public void setInitialCircles(Object initialCircles) {
+    this.initialCircles = (List<Object>) initialCircles;
+    if (googleMap != null) {
+      updateInitialCircles();
+    }
+  }
+
+  private void updateInitialCircles() {
+    circlesController.addCircles(initialCircles);
+  }
+
   @SuppressLint("MissingPermission")
   private void updateMyLocationSettings() {
     if (hasLocationPermission()) {
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
index 239561691535..1e1082a67460 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
@@ -38,6 +38,9 @@ public PlatformView create(Context context, int id, Object args) {
     if (params.containsKey("polylinesToAdd")) {
       builder.setInitialPolylines(params.get("polylinesToAdd"));
     }
+    if (params.containsKey("circlesToAdd")) {
+      builder.setInitialCircles(params.get("circlesToAdd"));
+    }
     return builder.build(id, context, mActivityState, mPluginRegistrar);
   }
 }
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
index 5c969987e48d..347b85d428da 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
@@ -33,4 +33,6 @@ interface GoogleMapOptionsSink {
   void setInitialMarkers(Object initialMarkers);
 
   void setInitialPolylines(Object initialPolylines);
+
+  void setInitialCircles(Object initialCircles);
 }
diff --git a/packages/google_maps_flutter/example/lib/main.dart b/packages/google_maps_flutter/example/lib/main.dart
index 45a77bddf031..43a80d1721ec 100644
--- a/packages/google_maps_flutter/example/lib/main.dart
+++ b/packages/google_maps_flutter/example/lib/main.dart
@@ -9,6 +9,7 @@ import 'map_ui.dart';
 import 'marker_icons.dart';
 import 'move_camera.dart';
 import 'page.dart';
+import 'place_circle.dart';
 import 'place_marker.dart';
 import 'place_polyline.dart';
 import 'scrolling_map.dart';
@@ -22,6 +23,7 @@ final List<Page> _allPages = <Page>[
   MarkerIconsPage(),
   ScrollingMapPage(),
   PlacePolylinePage(),
+  PlaceCirclePage(),
 ];
 
 class MapsDemo extends StatelessWidget {
diff --git a/packages/google_maps_flutter/example/lib/place_circle.dart b/packages/google_maps_flutter/example/lib/place_circle.dart
new file mode 100644
index 000000000000..ccd4b1496c0d
--- /dev/null
+++ b/packages/google_maps_flutter/example/lib/place_circle.dart
@@ -0,0 +1,217 @@
+import 'package:flutter/material.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+
+import 'page.dart';
+
+class PlaceCirclePage extends Page {
+  PlaceCirclePage() : super(const Icon(Icons.linear_scale), 'Place circle');
+
+  @override
+  Widget build(BuildContext context) {
+    return const PlaceCircleBody();
+  }
+}
+
+class PlaceCircleBody extends StatefulWidget {
+  const PlaceCircleBody();
+
+  @override
+  State<StatefulWidget> createState() => PlaceCircleBodyState();
+}
+
+class PlaceCircleBodyState extends State<PlaceCircleBody> {
+  PlaceCircleBodyState();
+
+  GoogleMapController controller;
+  Map<CircleId, Circle> circles = <CircleId, Circle>{};
+  int _circleIdCounter = 1;
+  CircleId selectedCircle;
+
+  // Values when toggling circle color
+  int fillColorsIndex = 0;
+  int strokeColorsIndex = 0;
+  List<Color> colors = <Color>[
+    Colors.purple,
+    Colors.red,
+    Colors.green,
+    Colors.pink,
+  ];
+
+  // Values when toggling circle stroke width
+  int widthsIndex = 0;
+  List<int> widths = <int>[10, 20, 5];
+
+  void _onMapCreated(GoogleMapController controller) {
+    this.controller = controller;
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  void _onCircleTapped(CircleId circleId) {
+    setState(() {
+      selectedCircle = circleId;
+    });
+  }
+
+  void _remove() {
+    setState(() {
+      if (circles.containsKey(selectedCircle)) {
+        circles.remove(selectedCircle);
+      }
+      selectedCircle = null;
+    });
+  }
+
+  void _add() {
+    final int circleCount = circles.length;
+
+    if (circleCount == 12) {
+      return;
+    }
+
+    final String circleIdVal = 'circle_id_$_circleIdCounter';
+    _circleIdCounter++;
+    final CircleId circleId = CircleId(circleIdVal);
+
+    final Circle circle = Circle(
+      circleId: circleId,
+      consumeTapEvents: true,
+      strokeColor: Colors.orange,
+      fillColor: Colors.green,
+      strokeWidth: 5,
+      center: _createCenter(),
+      radius: 50000,
+      onTap: () {
+        _onCircleTapped(circleId);
+      },
+    );
+
+    setState(() {
+      circles[circleId] = circle;
+    });
+  }
+
+  void _toggleVisible() {
+    final Circle circle = circles[selectedCircle];
+    setState(() {
+      circles[selectedCircle] = circle.copyWith(
+        visibleParam: !circle.visible,
+      );
+    });
+  }
+
+  void _changeFillColor() {
+    final Circle circle = circles[selectedCircle];
+    setState(() {
+      circles[selectedCircle] = circle.copyWith(
+        fillColorParam: colors[++fillColorsIndex % colors.length],
+      );
+    });
+  }
+
+  void _changeStrokeColor() {
+    final Circle circle = circles[selectedCircle];
+    setState(() {
+      circles[selectedCircle] = circle.copyWith(
+        strokeColorParam: colors[++strokeColorsIndex % colors.length],
+      );
+    });
+  }
+
+  void _changeStrokeWidth() {
+    final Circle circle = circles[selectedCircle];
+    setState(() {
+      circles[selectedCircle] = circle.copyWith(
+        strokeWidthParam: widths[++widthsIndex % widths.length],
+      );
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: <Widget>[
+        Center(
+          child: SizedBox(
+            width: 350.0,
+            height: 300.0,
+            child: GoogleMap(
+              initialCameraPosition: const CameraPosition(
+                target: LatLng(52.4478, -3.5402),
+                zoom: 7.0,
+              ),
+              circles: Set<Circle>.of(circles.values),
+              onMapCreated: _onMapCreated,
+            ),
+          ),
+        ),
+        Expanded(
+          child: SingleChildScrollView(
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: <Widget>[
+                Row(
+                  children: <Widget>[
+                    Column(
+                      children: <Widget>[
+                        FlatButton(
+                          child: const Text('add'),
+                          onPressed: _add,
+                        ),
+                        FlatButton(
+                          child: const Text('remove'),
+                          onPressed: (selectedCircle == null) ? null : _remove,
+                        ),
+                        FlatButton(
+                          child: const Text('toggle visible'),
+                          onPressed:
+                              (selectedCircle == null) ? null : _toggleVisible,
+                        ),
+                      ],
+                    ),
+                    Column(
+                      children: <Widget>[
+                        FlatButton(
+                          child: const Text('change stroke width'),
+                          onPressed: (selectedCircle == null)
+                              ? null
+                              : _changeStrokeWidth,
+                        ),
+                        FlatButton(
+                          child: const Text('change stroke color'),
+                          onPressed: (selectedCircle == null)
+                              ? null
+                              : _changeStrokeColor,
+                        ),
+                        FlatButton(
+                          child: const Text('change fill color'),
+                          onPressed: (selectedCircle == null)
+                              ? null
+                              : _changeFillColor,
+                        ),
+                      ],
+                    )
+                  ],
+                )
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  LatLng _createCenter() {
+    final double offset = _circleIdCounter.ceilToDouble();
+    return _createLatLng(51.4816 + offset * 0.2, -3.1791);
+  }
+
+  LatLng _createLatLng(double lat, double lng) {
+    return LatLng(lat, lng);
+  }
+}
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapCircleController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapCircleController.h
new file mode 100644
index 000000000000..166cf996a572
--- /dev/null
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapCircleController.h
@@ -0,0 +1,39 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <Flutter/Flutter.h>
+#import <GoogleMaps/GoogleMaps.h>
+
+// Defines circle UI options writable from Flutter.
+@protocol FLTGoogleMapCircleOptionsSink
+- (void)setConsumeTapEvents:(BOOL)consume;
+- (void)setVisible:(BOOL)visible;
+- (void)setStrokeColor:(UIColor*)color;
+- (void)setStrokeWidth:(CGFloat)width;
+- (void)setFillColor:(UIColor*)color;
+- (void)setCenter:(CLLocationCoordinate2D)center;
+- (void)setRadius:(CLLocationDistance)radius;
+- (void)setZIndex:(int)zIndex;
+@end
+
+// Defines circle controllable by Flutter.
+@interface FLTGoogleMapCircleController : NSObject <FLTGoogleMapCircleOptionsSink>
+@property(atomic, readonly) NSString* circleId;
+- (instancetype)initCircleWithPosition:(CLLocationCoordinate2D)position
+                                radius:(CLLocationDistance)radius
+                              circleId:(NSString*)circleId
+                               mapView:(GMSMapView*)mapView;
+- (void)removeCircle;
+@end
+
+@interface FLTCirclesController : NSObject
+- (instancetype)init:(FlutterMethodChannel*)methodChannel
+             mapView:(GMSMapView*)mapView
+           registrar:(NSObject<FlutterPluginRegistrar>*)registrar;
+- (void)addCircles:(NSArray*)circlesToAdd;
+- (void)changeCircles:(NSArray*)circlesToChange;
+- (void)removeCircleIds:(NSArray*)circleIdsToRemove;
+- (void)onCircleTap:(NSString*)circleId;
+- (bool)hasCircleWithId:(NSString*)circleId;
+@end
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapCircleController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapCircleController.m
new file mode 100644
index 000000000000..92e951200437
--- /dev/null
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapCircleController.m
@@ -0,0 +1,198 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "GoogleMapCircleController.h"
+#import "JsonConversions.h"
+
+@implementation FLTGoogleMapCircleController {
+  GMSCircle* _circle;
+  GMSMapView* _mapView;
+}
+- (instancetype)initCircleWithPosition:(CLLocationCoordinate2D)position
+                                radius:(CLLocationDistance)radius
+                              circleId:(NSString*)circleId
+                               mapView:(GMSMapView*)mapView {
+  self = [super init];
+  if (self) {
+    _circle = [GMSCircle circleWithPosition:position radius:radius];
+    _mapView = mapView;
+    _circleId = circleId;
+    _circle.userData = @[ circleId ];
+  }
+  return self;
+}
+
+- (void)removeCircle {
+  _circle.map = nil;
+}
+
+#pragma mark - FLTGoogleMapCircleOptionsSink methods
+
+- (void)setConsumeTapEvents:(BOOL)consumes {
+  _circle.tappable = consumes;
+}
+- (void)setVisible:(BOOL)visible {
+  _circle.map = visible ? _mapView : nil;
+}
+- (void)setZIndex:(int)zIndex {
+  _circle.zIndex = zIndex;
+}
+- (void)setCenter:(CLLocationCoordinate2D)center {
+  _circle.position = center;
+}
+- (void)setRadius:(CLLocationDistance)radius {
+  _circle.radius = radius;
+}
+
+- (void)setStrokeColor:(UIColor*)color {
+  _circle.strokeColor = color;
+}
+- (void)setStrokeWidth:(CGFloat)width {
+  _circle.strokeWidth = width;
+}
+- (void)setFillColor:(UIColor*)color {
+  _circle.fillColor = color;
+}
+@end
+
+static int ToInt(NSNumber* data) { return [FLTGoogleMapJsonConversions toInt:data]; }
+
+static BOOL ToBool(NSNumber* data) { return [FLTGoogleMapJsonConversions toBool:data]; }
+
+static CLLocationCoordinate2D ToLocation(NSArray* data) {
+  return [FLTGoogleMapJsonConversions toLocation:data];
+}
+
+static CLLocationDistance ToDistance(NSNumber* data) {
+  return [FLTGoogleMapJsonConversions toFloat:data];
+}
+
+static UIColor* ToColor(NSNumber* data) { return [FLTGoogleMapJsonConversions toColor:data]; }
+
+static void InterpretCircleOptions(NSDictionary* data, id<FLTGoogleMapCircleOptionsSink> sink,
+                                   NSObject<FlutterPluginRegistrar>* registrar) {
+  NSNumber* consumeTapEvents = data[@"consumeTapEvents"];
+  if (consumeTapEvents) {
+    [sink setConsumeTapEvents:ToBool(consumeTapEvents)];
+  }
+
+  NSNumber* visible = data[@"visible"];
+  if (visible) {
+    [sink setVisible:ToBool(visible)];
+  }
+
+  NSNumber* zIndex = data[@"zIndex"];
+  if (zIndex) {
+    [sink setZIndex:ToInt(zIndex)];
+  }
+
+  NSArray* center = data[@"center"];
+  if (center) {
+    [sink setCenter:ToLocation(center)];
+  }
+
+  NSNumber* radius = data[@"radius"];
+  if (radius) {
+    [sink setRadius:ToDistance(radius)];
+  }
+
+  NSNumber* strokeColor = data[@"strokeColor"];
+  if (strokeColor) {
+    [sink setStrokeColor:ToColor(strokeColor)];
+  }
+
+  NSNumber* strokeWidth = data[@"strokeWidth"];
+  if (strokeWidth) {
+    [sink setStrokeWidth:ToInt(strokeWidth)];
+  }
+
+  NSNumber* fillColor = data[@"fillColor"];
+  if (fillColor) {
+    [sink setFillColor:ToColor(fillColor)];
+  }
+}
+
+@implementation FLTCirclesController {
+  NSMutableDictionary* _circleIdToController;
+  FlutterMethodChannel* _methodChannel;
+  NSObject<FlutterPluginRegistrar>* _registrar;
+  GMSMapView* _mapView;
+}
+- (instancetype)init:(FlutterMethodChannel*)methodChannel
+             mapView:(GMSMapView*)mapView
+           registrar:(NSObject<FlutterPluginRegistrar>*)registrar {
+  self = [super init];
+  if (self) {
+    _methodChannel = methodChannel;
+    _mapView = mapView;
+    _circleIdToController = [NSMutableDictionary dictionaryWithCapacity:1];
+    _registrar = registrar;
+  }
+  return self;
+}
+- (void)addCircles:(NSArray*)circlesToAdd {
+  for (NSDictionary* circle in circlesToAdd) {
+    CLLocationCoordinate2D position = [FLTCirclesController getPosition:circle];
+    CLLocationDistance radius = [FLTCirclesController getRadius:circle];
+    NSString* circleId = [FLTCirclesController getCircleId:circle];
+    FLTGoogleMapCircleController* controller =
+        [[FLTGoogleMapCircleController alloc] initCircleWithPosition:position
+                                                              radius:radius
+                                                            circleId:circleId
+                                                             mapView:_mapView];
+    InterpretCircleOptions(circle, controller, _registrar);
+    _circleIdToController[circleId] = controller;
+  }
+}
+- (void)changeCircles:(NSArray*)circlesToChange {
+  for (NSDictionary* circle in circlesToChange) {
+    NSString* circleId = [FLTCirclesController getCircleId:circle];
+    FLTGoogleMapCircleController* controller = _circleIdToController[circleId];
+    if (!controller) {
+      continue;
+    }
+    InterpretCircleOptions(circle, controller, _registrar);
+  }
+}
+- (void)removeCircleIds:(NSArray*)circleIdsToRemove {
+  for (NSString* circleId in circleIdsToRemove) {
+    if (!circleId) {
+      continue;
+    }
+    FLTGoogleMapCircleController* controller = _circleIdToController[circleId];
+    if (!controller) {
+      continue;
+    }
+    [controller removeCircle];
+    [_circleIdToController removeObjectForKey:circleId];
+  }
+}
+- (bool)hasCircleWithId:(NSString*)circleId {
+  if (!circleId) {
+    return false;
+  }
+  return _circleIdToController[circleId] != nil;
+}
+- (void)onCircleTap:(NSString*)circleId {
+  if (!circleId) {
+    return;
+  }
+  FLTGoogleMapCircleController* controller = _circleIdToController[circleId];
+  if (!controller) {
+    return;
+  }
+  [_methodChannel invokeMethod:@"circle#onTap" arguments:@{@"circleId" : circleId}];
+}
++ (CLLocationCoordinate2D)getPosition:(NSDictionary*)circle {
+  NSArray* center = circle[@"center"];
+  return ToLocation(center);
+}
++ (CLLocationDistance)getRadius:(NSDictionary*)circle {
+  NSNumber* radius = circle[@"radius"];
+  return ToDistance(radius);
+}
++ (NSString*)getCircleId:(NSDictionary*)circle {
+  return circle[@"circleId"];
+}
+@end
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
index f0c6cc4becdd..60e1d4260a78 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.h
@@ -4,6 +4,7 @@
 
 #import <Flutter/Flutter.h>
 #import <GoogleMaps/GoogleMaps.h>
+#import "GoogleMapCircleController.h"
 #import "GoogleMapMarkerController.h"
 #import "GoogleMapPolylineController.h"
 
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index 47900ef8ac93..3041b4882a6d 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -55,6 +55,7 @@ @implementation FLTGoogleMapController {
   BOOL _cameraDidInitialSetup;
   FLTMarkersController* _markersController;
   FLTPolylinesController* _polylinesController;
+  FLTCirclesController* _circlesController;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -88,6 +89,9 @@ - (instancetype)initWithFrame:(CGRect)frame
     _polylinesController = [[FLTPolylinesController alloc] init:_channel
                                                         mapView:_mapView
                                                       registrar:registrar];
+    _circlesController = [[FLTCirclesController alloc] init:_channel
+                                                    mapView:_mapView
+                                                  registrar:registrar];
     id markersToAdd = args[@"markersToAdd"];
     if ([markersToAdd isKindOfClass:[NSArray class]]) {
       [_markersController addMarkers:markersToAdd];
@@ -96,6 +100,10 @@ - (instancetype)initWithFrame:(CGRect)frame
     if ([polylinesToAdd isKindOfClass:[NSArray class]]) {
       [_polylinesController addPolylines:polylinesToAdd];
     }
+    id circlesToAdd = args[@"circlesToAdd"];
+    if ([circlesToAdd isKindOfClass:[NSArray class]]) {
+      [_circlesController addCircles:circlesToAdd];
+    }
   }
   return self;
 }
@@ -161,6 +169,20 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
       [_polylinesController removePolylineIds:polylineIdsToRemove];
     }
     result(nil);
+  } else if ([call.method isEqualToString:@"circles#update"]) {
+    id circlesToAdd = call.arguments[@"circlesToAdd"];
+    if ([circlesToAdd isKindOfClass:[NSArray class]]) {
+      [_circlesController addCircles:circlesToAdd];
+    }
+    id circlesToChange = call.arguments[@"circlesToChange"];
+    if ([circlesToChange isKindOfClass:[NSArray class]]) {
+      [_circlesController changeCircles:circlesToChange];
+    }
+    id circleIdsToRemove = call.arguments[@"circleIdsToRemove"];
+    if ([circleIdsToRemove isKindOfClass:[NSArray class]]) {
+      [_circlesController removeCircleIds:circleIdsToRemove];
+    }
+    result(nil);
   } else if ([call.method isEqualToString:@"map#isCompassEnabled"]) {
     NSNumber* isCompassEnabled = @(_mapView.settings.compassButton);
     result(isCompassEnabled);
@@ -300,8 +322,12 @@ - (void)mapView:(GMSMapView*)mapView didTapInfoWindowOfMarker:(GMSMarker*)marker
   [_markersController onInfoWindowTap:markerId];
 }
 - (void)mapView:(GMSMapView*)mapView didTapOverlay:(GMSOverlay*)overlay {
-  NSString* polylineId = overlay.userData[0];
-  [_polylinesController onPolylineTap:polylineId];
+  NSString* overlayId = overlay.userData[0];
+  if ([_polylinesController hasPolylineWithId:overlayId]) {
+    [_polylinesController onPolylineTap:overlayId];
+  } else if ([_circlesController hasCircleWithId:overlayId]) {
+    [_circlesController onCircleTap:overlayId];
+  }
 }
 
 - (void)mapView:(GMSMapView*)mapView didTapAtCoordinate:(CLLocationCoordinate2D)coordinate {
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.h b/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.h
index 462803060af0..a5977bf75e1e 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.h
@@ -32,4 +32,5 @@
 - (void)changePolylines:(NSArray*)polylinesToChange;
 - (void)removePolylineIds:(NSArray*)polylineIdsToRemove;
 - (void)onPolylineTap:(NSString*)polylineId;
+- (bool)hasPolylineWithId:(NSString*)polylineId;
 @end
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.m
index 170c9870fdd7..f593210cf580 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.m
@@ -160,6 +160,12 @@ - (void)onPolylineTap:(NSString*)polylineId {
   }
   [_methodChannel invokeMethod:@"polyline#onTap" arguments:@{@"polylineId" : polylineId}];
 }
+- (bool)hasPolylineWithId:(NSString*)polylineId {
+  if (!polylineId) {
+    return false;
+  }
+  return _polylineIdToController[polylineId] != nil;
+}
 + (GMSMutablePath*)getPath:(NSDictionary*)polyline {
   NSArray* pointArray = polyline[@"points"];
   NSArray<CLLocation*>* points = ToPoints(pointArray);
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.h b/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.h
index dfdce8ab0350..5b8942968e4c 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.h
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapsPlugin.h
@@ -4,6 +4,7 @@
 
 #import <Flutter/Flutter.h>
 #import <GoogleMaps/GoogleMaps.h>
+#import "GoogleMapCircleController.h"
 #import "GoogleMapController.h"
 #import "GoogleMapMarkerController.h"
 #import "GoogleMapPolylineController.h"
diff --git a/packages/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/lib/google_maps_flutter.dart
index dad1e59bea9b..14adf45578b0 100644
--- a/packages/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/lib/google_maps_flutter.dart
@@ -26,4 +26,6 @@ part 'src/location.dart';
 part 'src/pattern_item.dart';
 part 'src/polyline.dart';
 part 'src/polyline_updates.dart';
+part 'src/circle.dart';
+part 'src/circle_updates.dart';
 part 'src/ui.dart';
diff --git a/packages/google_maps_flutter/lib/src/circle.dart b/packages/google_maps_flutter/lib/src/circle.dart
new file mode 100644
index 000000000000..d09d3c492a75
--- /dev/null
+++ b/packages/google_maps_flutter/lib/src/circle.dart
@@ -0,0 +1,164 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of google_maps_flutter;
+
+/// Uniquely identifies a [Circle] among [GoogleMap] circles.
+///
+/// This does not have to be globally unique, only unique among the list.
+@immutable
+class CircleId {
+  CircleId(this.value) : assert(value != null);
+
+  /// value of the [CircleId].
+  final String value;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final CircleId typedOther = other;
+    return value == typedOther.value;
+  }
+
+  @override
+  int get hashCode => value.hashCode;
+
+  @override
+  String toString() {
+    return 'CircleId{value: $value}';
+  }
+}
+
+/// Draws a circle on the map.
+@immutable
+class Circle {
+  const Circle({
+    @required this.circleId,
+    this.consumeTapEvents = false,
+    this.fillColor = Colors.transparent,
+    this.center = const LatLng(0.0, 0.0),
+    this.radius = 0,
+    this.strokeColor = Colors.black,
+    this.strokeWidth = 10,
+    this.visible = true,
+    this.zIndex = 0,
+    this.onTap,
+  });
+
+  /// Uniquely identifies a [Circle].
+  final CircleId circleId;
+
+  /// True if the [Circle] consumes tap events.
+  ///
+  /// If this is false, [onTap] callback will not be triggered.
+  final bool consumeTapEvents;
+
+  /// Fill color in ARGB format, the same format used by Color. The default value is transparent (0x00000000).
+  final Color fillColor;
+
+  /// Geographical location of the circle center.
+  final LatLng center;
+
+  /// Radius of the circle in meters; must be positive. The default value is 0.
+  final double radius;
+
+  /// Fill color in ARGB format, the same format used by Color. The default value is black (0xff000000).
+  final Color strokeColor;
+
+  /// The width of the circle's outline in screen points.
+  ///
+  /// The width is constant and independent of the camera's zoom level.
+  /// The default value is 10.
+  /// Setting strokeWidth to 0 results in no stroke.
+  final int strokeWidth;
+
+  /// True if the circle is visible.
+  final bool visible;
+
+  /// The z-index of the circle, used to determine relative drawing order of
+  /// map overlays.
+  ///
+  /// Overlays are drawn in order of z-index, so that lower values means drawn
+  /// earlier, and thus appearing to be closer to the surface of the Earth.
+  final int zIndex;
+
+  /// Callbacks to receive tap events for circle placed on this map.
+  final VoidCallback onTap;
+
+  /// Creates a new [Circle] object whose values are the same as this instance,
+  /// unless overwritten by the specified parameters.
+  Circle copyWith({
+    bool consumeTapEventsParam,
+    Color fillColorParam,
+    LatLng centerParam,
+    double radiusParam,
+    Color strokeColorParam,
+    int strokeWidthParam,
+    bool visibleParam,
+    int zIndexParam,
+    VoidCallback onTapParam,
+  }) {
+    return Circle(
+      circleId: circleId,
+      consumeTapEvents: consumeTapEventsParam ?? consumeTapEvents,
+      fillColor: fillColorParam ?? fillColor,
+      center: centerParam ?? center,
+      radius: radiusParam ?? radius,
+      strokeColor: strokeColorParam ?? strokeColor,
+      strokeWidth: strokeWidthParam ?? strokeWidth,
+      visible: visibleParam ?? visible,
+      zIndex: zIndexParam ?? zIndex,
+      onTap: onTapParam ?? onTap,
+    );
+  }
+
+  dynamic _toJson() {
+    final Map<String, dynamic> json = <String, dynamic>{};
+
+    void addIfPresent(String fieldName, dynamic value) {
+      if (value != null) {
+        json[fieldName] = value;
+      }
+    }
+
+    addIfPresent('circleId', circleId.value);
+    addIfPresent('consumeTapEvents', consumeTapEvents);
+    addIfPresent('fillColor', fillColor.value);
+    addIfPresent('center', center._toJson());
+    addIfPresent('radius', radius);
+    addIfPresent('strokeColor', strokeColor.value);
+    addIfPresent('strokeWidth', strokeWidth);
+    addIfPresent('visible', visible);
+    addIfPresent('zIndex', zIndex);
+
+    return json;
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final Circle typedOther = other;
+    return circleId == typedOther.circleId;
+  }
+
+  @override
+  int get hashCode => circleId.hashCode;
+}
+
+Map<CircleId, Circle> _keyByCircleId(Iterable<Circle> circles) {
+  if (circles == null) {
+    return <CircleId, Circle>{};
+  }
+  return Map<CircleId, Circle>.fromEntries(circles.map(
+      (Circle circle) => MapEntry<CircleId, Circle>(circle.circleId, circle)));
+}
+
+List<Map<String, dynamic>> _serializeCircleSet(Set<Circle> circles) {
+  if (circles == null) {
+    return null;
+  }
+  return circles.map<Map<String, dynamic>>((Circle p) => p._toJson()).toList();
+}
diff --git a/packages/google_maps_flutter/lib/src/circle_updates.dart b/packages/google_maps_flutter/lib/src/circle_updates.dart
new file mode 100644
index 000000000000..5dddb3a8ad15
--- /dev/null
+++ b/packages/google_maps_flutter/lib/src/circle_updates.dart
@@ -0,0 +1,90 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of google_maps_flutter;
+
+/// [Circle] update events to be applied to the [GoogleMap].
+///
+/// Used in [GoogleMapController] when the map is updated.
+class _CircleUpdates {
+  /// Computes [_CircleUpdates] given previous and current [Circle]s.
+  _CircleUpdates.from(Set<Circle> previous, Set<Circle> current) {
+    if (previous == null) {
+      previous = Set<Circle>.identity();
+    }
+
+    if (current == null) {
+      current = Set<Circle>.identity();
+    }
+
+    final Map<CircleId, Circle> previousCircles = _keyByCircleId(previous);
+    final Map<CircleId, Circle> currentCircles = _keyByCircleId(current);
+
+    final Set<CircleId> prevCircleIds = previousCircles.keys.toSet();
+    final Set<CircleId> currentCircleIds = currentCircles.keys.toSet();
+
+    Circle idToCurrentCircle(CircleId id) {
+      return currentCircles[id];
+    }
+
+    final Set<CircleId> _circleIdsToRemove =
+        prevCircleIds.difference(currentCircleIds);
+
+    final Set<Circle> _circlesToAdd = currentCircleIds
+        .difference(prevCircleIds)
+        .map(idToCurrentCircle)
+        .toSet();
+
+    final Set<Circle> _circlesToChange = currentCircleIds
+        .intersection(prevCircleIds)
+        .map(idToCurrentCircle)
+        .toSet();
+
+    circlesToAdd = _circlesToAdd;
+    circleIdsToRemove = _circleIdsToRemove;
+    circlesToChange = _circlesToChange;
+  }
+
+  Set<Circle> circlesToAdd;
+  Set<CircleId> circleIdsToRemove;
+  Set<Circle> circlesToChange;
+
+  Map<String, dynamic> _toMap() {
+    final Map<String, dynamic> updateMap = <String, dynamic>{};
+
+    void addIfNonNull(String fieldName, dynamic value) {
+      if (value != null) {
+        updateMap[fieldName] = value;
+      }
+    }
+
+    addIfNonNull('circlesToAdd', _serializeCircleSet(circlesToAdd));
+    addIfNonNull('circlesToChange', _serializeCircleSet(circlesToChange));
+    addIfNonNull('circleIdsToRemove',
+        circleIdsToRemove.map<dynamic>((CircleId m) => m.value).toList());
+
+    return updateMap;
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final _CircleUpdates typedOther = other;
+    return setEquals(circlesToAdd, typedOther.circlesToAdd) &&
+        setEquals(circleIdsToRemove, typedOther.circleIdsToRemove) &&
+        setEquals(circlesToChange, typedOther.circlesToChange);
+  }
+
+  @override
+  int get hashCode =>
+      hashValues(circlesToAdd, circleIdsToRemove, circlesToChange);
+
+  @override
+  String toString() {
+    return '_CircleUpdates{circlesToAdd: $circlesToAdd, '
+        'circleIdsToRemove: $circleIdsToRemove, '
+        'circlesToChange: $circlesToChange}';
+  }
+}
diff --git a/packages/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/lib/src/controller.dart
index 4df64292e732..a8660e595cfe 100644
--- a/packages/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/lib/src/controller.dart
@@ -66,6 +66,9 @@ class GoogleMapController {
       case 'polyline#onTap':
         _googleMapState.onPolylineTap(call.arguments['polylineId']);
         break;
+      case 'circle#onTap':
+        _googleMapState.onCircleTap(call.arguments['circleId']);
+        break;
       case 'map#onTap':
         _googleMapState.onTap(LatLng._fromJson(call.arguments['position']));
         break;
@@ -127,6 +130,23 @@ class GoogleMapController {
     );
   }
 
+  /// Updates circle configuration.
+  ///
+  /// Change listeners are notified once the update has been made on the
+  /// platform side.
+  ///
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> _updateCircles(_CircleUpdates circleUpdates) async {
+    assert(circleUpdates != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    await channel.invokeMethod(
+      'circles#update',
+      circleUpdates._toMap(),
+    );
+  }
+
   /// Starts an animated change of the map camera position.
   ///
   /// The returned [Future] completes after the change has been started on the
diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/lib/src/google_map.dart
index 8c51483bcba6..fcbc00cdea70 100644
--- a/packages/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/lib/src/google_map.dart
@@ -32,6 +32,7 @@ class GoogleMap extends StatefulWidget {
     this.myLocationButtonEnabled = true,
     this.markers,
     this.polylines,
+    this.circles,
     this.onCameraMoveStarted,
     this.onCameraMove,
     this.onCameraIdle,
@@ -76,6 +77,9 @@ class GoogleMap extends StatefulWidget {
   /// Polylines to be placed on the map.
   final Set<Polyline> polylines;
 
+  /// Circles to be placed on the map.
+  final Set<Circle> circles;
+
   /// Called when the camera starts moving.
   ///
   /// This can be initiated by the following:
@@ -159,6 +163,7 @@ class _GoogleMapState extends State<GoogleMap> {
 
   Map<MarkerId, Marker> _markers = <MarkerId, Marker>{};
   Map<PolylineId, Polyline> _polylines = <PolylineId, Polyline>{};
+  Map<CircleId, Circle> _circles = <CircleId, Circle>{};
   _GoogleMapOptions _googleMapOptions;
 
   @override
@@ -168,6 +173,7 @@ class _GoogleMapState extends State<GoogleMap> {
       'options': _googleMapOptions.toMap(),
       'markersToAdd': _serializeMarkerSet(widget.markers),
       'polylinesToAdd': _serializePolylineSet(widget.polylines),
+      'circlesToAdd': _serializeCircleSet(widget.circles),
     };
     if (defaultTargetPlatform == TargetPlatform.android) {
       return AndroidView(
@@ -197,6 +203,7 @@ class _GoogleMapState extends State<GoogleMap> {
     _googleMapOptions = _GoogleMapOptions.fromWidget(widget);
     _markers = _keyByMarkerId(widget.markers);
     _polylines = _keyByPolylineId(widget.polylines);
+    _circles = _keyByCircleId(widget.circles);
   }
 
   @override
@@ -205,6 +212,7 @@ class _GoogleMapState extends State<GoogleMap> {
     _updateOptions();
     _updateMarkers();
     _updatePolylines();
+    _updateCircles();
   }
 
   void _updateOptions() async {
@@ -233,6 +241,13 @@ class _GoogleMapState extends State<GoogleMap> {
     _polylines = _keyByPolylineId(widget.polylines);
   }
 
+  void _updateCircles() async {
+    final GoogleMapController controller = await _controller.future;
+    controller._updateCircles(
+        _CircleUpdates.from(_circles.values.toSet(), widget.circles));
+    _circles = _keyByCircleId(widget.circles);
+  }
+
   Future<void> onPlatformViewCreated(int id) async {
     final GoogleMapController controller = await GoogleMapController.init(
       id,
@@ -261,6 +276,12 @@ class _GoogleMapState extends State<GoogleMap> {
     }
   }
 
+  void onCircleTap(String circleIdParam) {
+    assert(circleIdParam != null);
+    final CircleId circleId = CircleId(circleIdParam);
+    _circles[circleId].onTap();
+  }
+
   void onInfoWindowTap(String markerIdParam) {
     assert(markerIdParam != null);
     final MarkerId markerId = MarkerId(markerIdParam);
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index c99792b549ba..40c4e4bb9e00 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.12
+version: 0.5.13
 
 dependencies:
   flutter:
diff --git a/packages/google_maps_flutter/test/circle_updates_test.dart b/packages/google_maps_flutter/test/circle_updates_test.dart
new file mode 100644
index 000000000000..fe7620571443
--- /dev/null
+++ b/packages/google_maps_flutter/test/circle_updates_test.dart
@@ -0,0 +1,198 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+
+import 'fake_maps_controllers.dart';
+
+Set<Circle> _toSet({Circle c1, Circle c2, Circle c3}) {
+  final Set<Circle> res = Set<Circle>.identity();
+  if (c1 != null) {
+    res.add(c1);
+  }
+  if (c2 != null) {
+    res.add(c2);
+  }
+  if (c3 != null) {
+    res.add(c3);
+  }
+  return res;
+}
+
+Widget _mapWithCircles(Set<Circle> circles) {
+  return Directionality(
+    textDirection: TextDirection.ltr,
+    child: GoogleMap(
+      initialCameraPosition: const CameraPosition(target: LatLng(10.0, 15.0)),
+      circles: circles,
+    ),
+  );
+}
+
+void main() {
+  final FakePlatformViewsController fakePlatformViewsController =
+      FakePlatformViewsController();
+
+  setUpAll(() {
+    SystemChannels.platform_views.setMockMethodCallHandler(
+        fakePlatformViewsController.fakePlatformViewsMethodHandler);
+  });
+
+  setUp(() {
+    fakePlatformViewsController.reset();
+  });
+
+  testWidgets('Initializing a circle', (WidgetTester tester) async {
+    final Circle c1 = Circle(circleId: CircleId("circle_1"));
+    await tester.pumpWidget(_mapWithCircles(_toSet(c1: c1)));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.circlesToAdd.length, 1);
+
+    final Circle initializedCircle = platformGoogleMap.circlesToAdd.first;
+    expect(initializedCircle, equals(c1));
+    expect(platformGoogleMap.circleIdsToRemove.isEmpty, true);
+    expect(platformGoogleMap.circlesToChange.isEmpty, true);
+  });
+
+  testWidgets("Adding a circle", (WidgetTester tester) async {
+    final Circle c1 = Circle(circleId: CircleId("circle_1"));
+    final Circle c2 = Circle(circleId: CircleId("circle_2"));
+
+    await tester.pumpWidget(_mapWithCircles(_toSet(c1: c1)));
+    await tester.pumpWidget(_mapWithCircles(_toSet(c1: c1, c2: c2)));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.circlesToAdd.length, 1);
+
+    final Circle addedCircle = platformGoogleMap.circlesToAdd.first;
+    expect(addedCircle, equals(c2));
+    expect(platformGoogleMap.circleIdsToRemove.isEmpty, true);
+
+    expect(platformGoogleMap.circlesToChange.length, 1);
+    expect(platformGoogleMap.circlesToChange.first, equals(c1));
+  });
+
+  testWidgets("Removing a circle", (WidgetTester tester) async {
+    final Circle c1 = Circle(circleId: CircleId("circle_1"));
+
+    await tester.pumpWidget(_mapWithCircles(_toSet(c1: c1)));
+    await tester.pumpWidget(_mapWithCircles(null));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.circleIdsToRemove.length, 1);
+    expect(platformGoogleMap.circleIdsToRemove.first, equals(c1.circleId));
+
+    expect(platformGoogleMap.circlesToChange.isEmpty, true);
+    expect(platformGoogleMap.circlesToAdd.isEmpty, true);
+  });
+
+  testWidgets("Updating a circle", (WidgetTester tester) async {
+    final Circle c1 = Circle(circleId: CircleId("circle_1"));
+    final Circle c2 = Circle(circleId: CircleId("circle_1"), radius: 10);
+
+    await tester.pumpWidget(_mapWithCircles(_toSet(c1: c1)));
+    await tester.pumpWidget(_mapWithCircles(_toSet(c1: c2)));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.circlesToChange.length, 1);
+    expect(platformGoogleMap.circlesToChange.first, equals(c2));
+
+    expect(platformGoogleMap.circleIdsToRemove.isEmpty, true);
+    expect(platformGoogleMap.circlesToAdd.isEmpty, true);
+  });
+
+  testWidgets("Updating a circle", (WidgetTester tester) async {
+    final Circle c1 = Circle(circleId: CircleId("circle_1"));
+    final Circle c2 = Circle(circleId: CircleId("circle_1"), radius: 10);
+
+    await tester.pumpWidget(_mapWithCircles(_toSet(c1: c1)));
+    await tester.pumpWidget(_mapWithCircles(_toSet(c1: c2)));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+    expect(platformGoogleMap.circlesToChange.length, 1);
+
+    final Circle update = platformGoogleMap.circlesToChange.first;
+    expect(update, equals(c2));
+    expect(update.radius, 10);
+  });
+
+  testWidgets("Multi Update", (WidgetTester tester) async {
+    Circle c1 = Circle(circleId: CircleId("circle_1"));
+    Circle c2 = Circle(circleId: CircleId("circle_2"));
+    final Set<Circle> prev = _toSet(c1: c1, c2: c2);
+    c1 = Circle(circleId: CircleId("circle_1"), visible: false);
+    c2 = Circle(circleId: CircleId("circle_2"), radius: 10);
+    final Set<Circle> cur = _toSet(c1: c1, c2: c2);
+
+    await tester.pumpWidget(_mapWithCircles(prev));
+    await tester.pumpWidget(_mapWithCircles(cur));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.circlesToChange, cur);
+    expect(platformGoogleMap.circleIdsToRemove.isEmpty, true);
+    expect(platformGoogleMap.circlesToAdd.isEmpty, true);
+  });
+
+  testWidgets("Multi Update", (WidgetTester tester) async {
+    Circle c2 = Circle(circleId: CircleId("circle_2"));
+    final Circle c3 = Circle(circleId: CircleId("circle_3"));
+    final Set<Circle> prev = _toSet(c2: c2, c3: c3);
+
+    // c1 is added, c2 is updated, c3 is removed.
+    final Circle c1 = Circle(circleId: CircleId("circle_1"));
+    c2 = Circle(circleId: CircleId("circle_2"), radius: 10);
+    final Set<Circle> cur = _toSet(c1: c1, c2: c2);
+
+    await tester.pumpWidget(_mapWithCircles(prev));
+    await tester.pumpWidget(_mapWithCircles(cur));
+
+    final FakePlatformGoogleMap platformGoogleMap =
+        fakePlatformViewsController.lastCreatedView;
+
+    expect(platformGoogleMap.circlesToChange.length, 1);
+    expect(platformGoogleMap.circlesToAdd.length, 1);
+    expect(platformGoogleMap.circleIdsToRemove.length, 1);
+
+    expect(platformGoogleMap.circlesToChange.first, equals(c2));
+    expect(platformGoogleMap.circlesToAdd.first, equals(c1));
+    expect(platformGoogleMap.circleIdsToRemove.first, equals(c3.circleId));
+  });
+
+  testWidgets(
+    "Partial Update",
+    (WidgetTester tester) async {
+      final Circle c1 = Circle(circleId: CircleId("circle_1"));
+      Circle c2 = Circle(circleId: CircleId("circle_2"));
+      final Set<Circle> prev = _toSet(c1: c1, c2: c2);
+      c2 = Circle(circleId: CircleId("circle_2"), radius: 10);
+      final Set<Circle> cur = _toSet(c1: c1, c2: c2);
+
+      await tester.pumpWidget(_mapWithCircles(prev));
+      await tester.pumpWidget(_mapWithCircles(cur));
+
+      final FakePlatformGoogleMap platformGoogleMap =
+          fakePlatformViewsController.lastCreatedView;
+
+      expect(platformGoogleMap.circlesToChange, _toSet(c2: c2));
+      expect(platformGoogleMap.circleIdsToRemove.isEmpty, true);
+      expect(platformGoogleMap.circlesToAdd.isEmpty, true);
+    },
+    // The test is currently broken due to a bug (we're updating all circles
+    // instead of just the ones that were changed):
+    // https://github.com/flutter/flutter/issues/30764
+    // TODO(amirh): enable this test when the issue is fixed.
+    skip: true,
+  );
+}
diff --git a/packages/google_maps_flutter/test/fake_maps_controllers.dart b/packages/google_maps_flutter/test/fake_maps_controllers.dart
index 6fa62a84d321..805fa7a2648b 100644
--- a/packages/google_maps_flutter/test/fake_maps_controllers.dart
+++ b/packages/google_maps_flutter/test/fake_maps_controllers.dart
@@ -17,6 +17,7 @@ class FakePlatformGoogleMap {
     updateOptions(params['options']);
     updateMarkers(params);
     updatePolylines(params);
+    updateCircles(params);
   }
 
   MethodChannel channel;
@@ -57,6 +58,12 @@ class FakePlatformGoogleMap {
 
   Set<Polyline> polylinesToChange;
 
+  Set<CircleId> circleIdsToRemove;
+
+  Set<Circle> circlesToAdd;
+
+  Set<Circle> circlesToChange;
+
   Future<dynamic> onMethodCall(MethodCall call) {
     switch (call.method) {
       case 'map#update':
@@ -68,6 +75,9 @@ class FakePlatformGoogleMap {
       case 'polylines#update':
         updatePolylines(call.arguments);
         return Future<void>.sync(() {});
+      case 'circles#update':
+        updateCircles(call.arguments);
+        return Future<void>.sync(() {});
       default:
         return Future<void>.sync(() {});
     }
@@ -181,6 +191,53 @@ class FakePlatformGoogleMap {
     return result;
   }
 
+  void updateCircles(Map<dynamic, dynamic> circleUpdates) {
+    if (circleUpdates == null) {
+      return;
+    }
+    circlesToAdd = _deserializeCircles(circleUpdates['circlesToAdd']);
+    circleIdsToRemove =
+        _deserializeCircleIds(circleUpdates['circleIdsToRemove']);
+    circlesToChange = _deserializeCircles(circleUpdates['circlesToChange']);
+  }
+
+  Set<CircleId> _deserializeCircleIds(List<dynamic> circleIds) {
+    if (circleIds == null) {
+      // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+      // https://github.com/flutter/flutter/issues/28312
+      // ignore: prefer_collection_literals
+      return Set<CircleId>();
+    }
+    return circleIds.map((dynamic circleId) => CircleId(circleId)).toSet();
+  }
+
+  Set<Circle> _deserializeCircles(dynamic circles) {
+    if (circles == null) {
+      // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+      // https://github.com/flutter/flutter/issues/28312
+      // ignore: prefer_collection_literals
+      return Set<Circle>();
+    }
+    final List<dynamic> circlesData = circles;
+    // TODO(iskakaushik): Remove this when collection literals makes it to stable.
+    // https://github.com/flutter/flutter/issues/28312
+    // ignore: prefer_collection_literals
+    final Set<Circle> result = Set<Circle>();
+    for (Map<dynamic, dynamic> circleData in circlesData) {
+      final String circleId = circleData['circleId'];
+      final bool visible = circleData['visible'];
+      final double radius = circleData['radius'];
+
+      result.add(Circle(
+        circleId: CircleId(circleId),
+        visible: visible,
+        radius: radius,
+      ));
+    }
+
+    return result;
+  }
+
   void updateOptions(Map<dynamic, dynamic> options) {
     if (options.containsKey('compassEnabled')) {
       compassEnabled = options['compassEnabled'];

From 5a857bbb41990ffde0f26f292bb5d114d9170e6f Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 6 May 2019 14:05:21 -0700
Subject: [PATCH 394/410] Updates to dynamic links plugin to remove deprecated
 API usage and update Android dependencies. (#1571)

* Update Android dependencies to 16.1.8
* Replace domain with uriPrefix
---
 packages/firebase_dynamic_links/CHANGELOG.md  |  5 +++
 packages/firebase_dynamic_links/README.md     |  8 ++--
 .../android/build.gradle                      |  2 +-
 .../FirebaseDynamicLinksPlugin.java           |  4 +-
 .../example/lib/main.dart                     |  2 +-
 .../ios/Classes/FirebaseDynamicLinksPlugin.m  |  4 +-
 .../lib/src/dynamic_link_parameters.dart      | 17 ++++----
 packages/firebase_dynamic_links/pubspec.yaml  |  2 +-
 .../test/firebase_dynamic_links_test.dart     | 42 +++++++++----------
 9 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/packages/firebase_dynamic_links/CHANGELOG.md b/packages/firebase_dynamic_links/CHANGELOG.md
index 3172546c7f09..a6e6f81bf066 100644
--- a/packages/firebase_dynamic_links/CHANGELOG.md
+++ b/packages/firebase_dynamic_links/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.0.
+
+* Update Android dependencies to 16.1.7.
+* **Breaking change**. Dynamic link parameter `domain` replaced with `uriPrefix`.
+
 ## 0.2.1
 
 * Throw `PlatformException` if there is an error retrieving dynamic link.
diff --git a/packages/firebase_dynamic_links/README.md b/packages/firebase_dynamic_links/README.md
index 423a8133fd97..b3250deb6a56 100644
--- a/packages/firebase_dynamic_links/README.md
+++ b/packages/firebase_dynamic_links/README.md
@@ -18,7 +18,7 @@ To use this plugin, add `firebase_dynamic_links` as a [dependency in your pubspe
 
 ## Create Dynamic Links
 
-You create a Dynamic Link either by using the Firebase console, using a REST API, iOS or Android Builder API, Flutter API, or by forming a URL by adding Dynamic Link parameters to a domain specific to your app. These parameters specify the links you want to open, depending on the user's platform and whether your app is installed.
+You create a Dynamic Link either by using the Firebase console, using a REST API, iOS or Android Builder API, Flutter API, or by forming a URL by adding Dynamic Link parameters to a URI prefix specific to your app. These parameters specify the links you want to open, depending on the user's platform and whether your app is installed.
 
 Below are instructions to create Dynamic Links using Flutter with the Firebase Dynamic Links API. This API accepts either a long Dynamic Link or an object containing Dynamic Link parameters, and returns a URL like the following example:
 
@@ -30,7 +30,7 @@ You can create a Dynamic Link programmatically by setting the following paramete
 
 ```dart
 final DynamicLinkParameters parameters = DynamicLinkParameters(
-  domain: 'abc123.app.goo.gl',
+  uriPrefix: 'https://abc123.app.goo.gl',
   link: Uri.parse('https://example.com/'),
   androidParameters: AndroidParameters(
       packageName: 'com.example.android',
@@ -83,7 +83,7 @@ You can receive a Dynamic Link containing a deep link that takes the user to spe
 
 1. In the [Firebase Console](https://console.firebase.google.com), open the Dynamic Links section.
   - Accept the terms of service if you are prompted to do so.
-  - Take note of your project's Dynamic Links domain, which is displayed at the top of the Dynamic Links page. You need your project's Dynamic Links domain to programmatically create Dynamic Links. A Dynamic Links domain looks like `YOUR_SUBDOMAIN.page.link`.
+  - Take note of your project's Dynamic Links URL prefix, which is displayed at the top of the Dynamic Links page. You need your project's Dynamic Links URL prefix to programmatically create Dynamic Links. A Dynamic Links URL prefix looks like `https://YOUR_SUBDOMAIN.page.link`.
 
 Receiving dynamic links on *iOS* requires a couple more steps than *Android*. If you only want to receive dynamic links on *Android*, skip to step 4. You can also follow a video on the next two steps [here.](https://youtu.be/sFPo296OQqk?t=2m40s)
 
@@ -138,4 +138,4 @@ If your app did not open from a dynamic link, `retrieveDynamicLink()` will retur
 
 ## Getting Started
 
-See the `example` directory for a complete sample app using Google Dynamic Links for Firebase.
\ No newline at end of file
+See the `example` directory for a complete sample app using Google Dynamic Links for Firebase.
diff --git a/packages/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/android/build.gradle
index 2077643d2db4..3609aa0d0ceb 100644
--- a/packages/firebase_dynamic_links/android/build.gradle
+++ b/packages/firebase_dynamic_links/android/build.gradle
@@ -45,7 +45,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-dynamic-links:16.1.2'
+        api 'com.google.firebase:firebase-dynamic-links:16.1.8'
         implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java b/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
index 4d41ad11305c..91fe3a06ed27 100644
--- a/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
+++ b/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
@@ -158,10 +158,10 @@ private void buildShortDynamicLink(
   private DynamicLink.Builder setupParameters(MethodCall call) {
     DynamicLink.Builder dynamicLinkBuilder = FirebaseDynamicLinks.getInstance().createDynamicLink();
 
-    String domain = call.argument("domain");
+    String uriPrefix = call.argument("uriPrefix");
     String link = call.argument("link");
 
-    dynamicLinkBuilder.setDynamicLinkDomain(domain);
+    dynamicLinkBuilder.setDomainUriPrefix(uriPrefix);
     dynamicLinkBuilder.setLink(Uri.parse(link));
 
     Map<String, Object> androidParameters = call.argument("androidParameters");
diff --git a/packages/firebase_dynamic_links/example/lib/main.dart b/packages/firebase_dynamic_links/example/lib/main.dart
index e1c8842d2df7..43d16e9537e2 100644
--- a/packages/firebase_dynamic_links/example/lib/main.dart
+++ b/packages/firebase_dynamic_links/example/lib/main.dart
@@ -68,7 +68,7 @@ class _MainScreenState extends State<_MainScreen> with WidgetsBindingObserver {
     });
 
     final DynamicLinkParameters parameters = DynamicLinkParameters(
-      domain: 'cx4k7.app.goo.gl',
+      uriPrefix: 'https://cx4k7.app.goo.gl',
       link: Uri.parse('https://dynamic.link.example/helloworld'),
       androidParameters: AndroidParameters(
         packageName: 'io.flutter.plugins.firebasedynamiclinksexample',
diff --git a/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m b/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
index f9e78f59ab5f..556c5f69799d 100644
--- a/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
+++ b/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
@@ -155,10 +155,10 @@ - (FIRDynamicLinkComponentsOptions *)setupOptions:(NSDictionary *)arguments {
 
 - (FIRDynamicLinkComponents *)setupParameters:(NSDictionary *)arguments {
   NSURL *link = [NSURL URLWithString:arguments[@"link"]];
-  NSString *domain = arguments[@"domain"];
+  NSString *uriPrefix = arguments[@"uriPrefix"];
 
   FIRDynamicLinkComponents *components = [FIRDynamicLinkComponents componentsWithLink:link
-                                                                               domain:domain];
+                                                                      domainURIPrefix:uriPrefix];
 
   if (![arguments[@"androidParameters"] isEqual:[NSNull null]]) {
     NSDictionary *params = arguments[@"androidParameters"];
diff --git a/packages/firebase_dynamic_links/lib/src/dynamic_link_parameters.dart b/packages/firebase_dynamic_links/lib/src/dynamic_link_parameters.dart
index 0391d8c5b9d2..a2b6cbf8c54f 100644
--- a/packages/firebase_dynamic_links/lib/src/dynamic_link_parameters.dart
+++ b/packages/firebase_dynamic_links/lib/src/dynamic_link_parameters.dart
@@ -12,7 +12,7 @@ part of firebase_dynamic_links;
 class DynamicLinkParameters {
   DynamicLinkParameters({
     this.androidParameters,
-    @required this.domain,
+    @required this.uriPrefix,
     this.dynamicLinkParametersOptions,
     this.googleAnalyticsParameters,
     this.iosParameters,
@@ -20,17 +20,18 @@ class DynamicLinkParameters {
     @required this.link,
     this.navigationInfoParameters,
     this.socialMetaTagParameters,
-  })  : assert(domain != null),
+  })  : assert(uriPrefix != null),
         assert(link != null);
 
   /// Android parameters for a generated Dynamic Link URL.
   final AndroidParameters androidParameters;
 
-  /// The Firebase project’s Dynamic Links domain.
-  ///
-  /// You can find this value in the Dynamic Links section of the Firebase
-  /// console. https://console.firebase.google.com/
-  final String domain;
+  /// Domain URI Prefix of your App.
+  // This value must be your assigned domain from the Firebase console.
+  // (e.g. https://xyz.page.link)
+  //
+  // The domain URI prefix must start with a valid HTTPS scheme (https://).
+  final String uriPrefix;
 
   /// Defines behavior for generating Dynamic Link URLs.
   final DynamicLinkParametersOptions dynamicLinkParametersOptions;
@@ -78,7 +79,7 @@ class DynamicLinkParameters {
 
   Map<String, dynamic> get _data => <String, dynamic>{
         'androidParameters': androidParameters?._data,
-        'domain': domain,
+        'uriPrefix': uriPrefix,
         'dynamicLinkParametersOptions': dynamicLinkParametersOptions?._data,
         'googleAnalyticsParameters': googleAnalyticsParameters?._data,
         'iosParameters': iosParameters?._data,
diff --git a/packages/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/pubspec.yaml
index e66b1b04c381..59c6eac9e743 100644
--- a/packages/firebase_dynamic_links/pubspec.yaml
+++ b/packages/firebase_dynamic_links/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_dynamic_links
 description: Flutter plugin for Google Dynamic Links for Firebase, an app solution for creating
   and handling links across multiple platforms.
-version: 0.2.1
+version: 0.3.0
 
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_dynamic_links
diff --git a/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart b/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart
index 43755dd0046c..acf7121c7f22 100644
--- a/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart
+++ b/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart
@@ -89,7 +89,7 @@ void main() {
 
       test('$AndroidParameters', () async {
         final DynamicLinkParameters components = DynamicLinkParameters(
-          domain: 'test-domain',
+          uriPrefix: 'https://test-domain/',
           link: Uri.parse('test-link.com'),
           androidParameters: AndroidParameters(
             fallbackUrl: Uri.parse('test-url'),
@@ -110,7 +110,7 @@ void main() {
                 'minimumVersion': 1,
                 'packageName': 'test-package',
               },
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': null,
               'googleAnalyticsParameters': null,
               'iosParameters': null,
@@ -128,7 +128,7 @@ void main() {
                 'minimumVersion': 1,
                 'packageName': 'test-package',
               },
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': null,
               'googleAnalyticsParameters': null,
               'iosParameters': null,
@@ -143,7 +143,7 @@ void main() {
 
       test('$DynamicLinkParametersOptions', () async {
         final DynamicLinkParameters components = DynamicLinkParameters(
-          domain: 'test-domain',
+          uriPrefix: 'https://test-domain/',
           link: Uri.parse('test-link.com'),
           dynamicLinkParametersOptions: DynamicLinkParametersOptions(
               shortDynamicLinkPathLength: ShortDynamicLinkPathLength.short),
@@ -157,7 +157,7 @@ void main() {
             'DynamicLinkParameters#buildUrl',
             arguments: <String, dynamic>{
               'androidParameters': null,
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': <String, dynamic>{
                 'shortDynamicLinkPathLength':
                     ShortDynamicLinkPathLength.short.index,
@@ -174,7 +174,7 @@ void main() {
             'DynamicLinkParameters#buildShortLink',
             arguments: <String, dynamic>{
               'androidParameters': null,
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': <String, dynamic>{
                 'shortDynamicLinkPathLength':
                     ShortDynamicLinkPathLength.short.index,
@@ -197,7 +197,7 @@ void main() {
 
       test('$GoogleAnalyticsParameters', () async {
         final DynamicLinkParameters components = DynamicLinkParameters(
-          domain: 'test-domain',
+          uriPrefix: 'https://test-domain/',
           link: Uri.parse('test-link.com'),
           googleAnalyticsParameters: GoogleAnalyticsParameters(
             campaign: 'where',
@@ -216,7 +216,7 @@ void main() {
             'DynamicLinkParameters#buildUrl',
             arguments: <String, dynamic>{
               'androidParameters': null,
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': null,
               'googleAnalyticsParameters': <String, dynamic>{
                 'campaign': 'where',
@@ -236,7 +236,7 @@ void main() {
             'DynamicLinkParameters#buildShortLink',
             arguments: <String, dynamic>{
               'androidParameters': null,
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': null,
               'googleAnalyticsParameters': <String, dynamic>{
                 'campaign': 'where',
@@ -257,7 +257,7 @@ void main() {
 
       test('$IosParameters', () async {
         final DynamicLinkParameters components = DynamicLinkParameters(
-          domain: 'test-domain',
+          uriPrefix: 'https://test-domain/',
           link: Uri.parse('test-link.com'),
           iosParameters: IosParameters(
             appStoreId: 'is',
@@ -278,7 +278,7 @@ void main() {
             'DynamicLinkParameters#buildUrl',
             arguments: <String, dynamic>{
               'androidParameters': null,
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': null,
               'googleAnalyticsParameters': null,
               'iosParameters': <String, dynamic>{
@@ -300,7 +300,7 @@ void main() {
             'DynamicLinkParameters#buildShortLink',
             arguments: <String, dynamic>{
               'androidParameters': null,
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': null,
               'googleAnalyticsParameters': null,
               'iosParameters': <String, dynamic>{
@@ -323,7 +323,7 @@ void main() {
 
       test('$ItunesConnectAnalyticsParameters', () async {
         final DynamicLinkParameters components = DynamicLinkParameters(
-          domain: 'test-domain',
+          uriPrefix: 'https://test-domain/',
           link: Uri.parse('test-link.com'),
           itunesConnectAnalyticsParameters: ItunesConnectAnalyticsParameters(
             affiliateToken: 'hello',
@@ -340,7 +340,7 @@ void main() {
             'DynamicLinkParameters#buildUrl',
             arguments: <String, dynamic>{
               'androidParameters': null,
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': null,
               'googleAnalyticsParameters': null,
               'iosParameters': null,
@@ -358,7 +358,7 @@ void main() {
             'DynamicLinkParameters#buildShortLink',
             arguments: <String, dynamic>{
               'androidParameters': null,
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': null,
               'googleAnalyticsParameters': null,
               'iosParameters': null,
@@ -377,7 +377,7 @@ void main() {
 
       test('$NavigationInfoParameters', () async {
         final DynamicLinkParameters components = DynamicLinkParameters(
-          domain: 'test-domain',
+          uriPrefix: 'https://test-domain/',
           link: Uri.parse('test-link.com'),
           navigationInfoParameters:
               NavigationInfoParameters(forcedRedirectEnabled: true),
@@ -391,7 +391,7 @@ void main() {
             'DynamicLinkParameters#buildUrl',
             arguments: <String, dynamic>{
               'androidParameters': null,
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': null,
               'googleAnalyticsParameters': null,
               'iosParameters': null,
@@ -407,7 +407,7 @@ void main() {
             'DynamicLinkParameters#buildShortLink',
             arguments: <String, dynamic>{
               'androidParameters': null,
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': null,
               'googleAnalyticsParameters': null,
               'iosParameters': null,
@@ -424,7 +424,7 @@ void main() {
 
       test('$SocialMetaTagParameters', () async {
         final DynamicLinkParameters components = DynamicLinkParameters(
-          domain: 'test-domain',
+          uriPrefix: 'https://test-domain/',
           link: Uri.parse('test-link.com'),
           socialMetaTagParameters: SocialMetaTagParameters(
             description: 'describe',
@@ -441,7 +441,7 @@ void main() {
             'DynamicLinkParameters#buildUrl',
             arguments: <String, dynamic>{
               'androidParameters': null,
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': null,
               'googleAnalyticsParameters': null,
               'iosParameters': null,
@@ -459,7 +459,7 @@ void main() {
             'DynamicLinkParameters#buildShortLink',
             arguments: <String, dynamic>{
               'androidParameters': null,
-              'domain': 'test-domain',
+              'uriPrefix': 'https://test-domain/',
               'dynamicLinkParametersOptions': null,
               'googleAnalyticsParameters': null,
               'iosParameters': null,

From a2c79a18d19a2e1222759dad0ee2b10324427e18 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 6 May 2019 15:49:01 -0700
Subject: [PATCH 395/410] Update firebase_core Android dependency (#1576)

---
 packages/firebase_core/CHANGELOG.md         | 4 ++++
 packages/firebase_core/android/build.gradle | 2 +-
 packages/firebase_core/pubspec.yaml         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md
index 9a341b2128ab..1b1362ddec70 100644
--- a/packages/firebase_core/CHANGELOG.md
+++ b/packages/firebase_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0
+
+* Update Android dependencies to latest.
+
 ## 0.3.4
 
 * Updates Android firebase-core dependency to a version that is compatible with other Flutterfire plugins.
diff --git a/packages/firebase_core/android/build.gradle b/packages/firebase_core/android/build.gradle
index 9aaf4bf3d7a6..8a20bb9f8f32 100644
--- a/packages/firebase_core/android/build.gradle
+++ b/packages/firebase_core/android/build.gradle
@@ -45,6 +45,6 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-core:16.0.4'
+        api 'com.google.firebase:firebase-core:16.0.9'
     }
 }
diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml
index 861c2109678a..d0467f6b5913 100644
--- a/packages/firebase_core/pubspec.yaml
+++ b/packages/firebase_core/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Core, enabling connecting to multiple
   Firebase apps.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_core
-version: 0.3.4
+version: 0.4.0
 
 flutter:
   plugin:

From f254cd2573db895d927abeff1e2b7a1dfb177b1b Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 6 May 2019 15:57:33 -0700
Subject: [PATCH 396/410] Remove flaky timeout test (#1573)

---
 packages/cloud_functions/CHANGELOG.md               |  4 ++++
 .../example/test/cloud_functions.dart               | 13 -------------
 packages/cloud_functions/pubspec.yaml               |  2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/packages/cloud_functions/CHANGELOG.md b/packages/cloud_functions/CHANGELOG.md
index 94256b51d08e..8e4e350c6b0f 100644
--- a/packages/cloud_functions/CHANGELOG.md
+++ b/packages/cloud_functions/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0+1
+
+* Removed flaky timeout test.
+
 ## 0.2.0
 
 * **Breaking change**. Updated Dart API to replace `call` with `getHttpsCallable`.
diff --git a/packages/cloud_functions/example/test/cloud_functions.dart b/packages/cloud_functions/example/test/cloud_functions.dart
index b6c350da786b..4bccc1f0aed0 100644
--- a/packages/cloud_functions/example/test/cloud_functions.dart
+++ b/packages/cloud_functions/example/test/cloud_functions.dart
@@ -33,19 +33,6 @@ void main() {
       });
       expect(response2.data['repeat_message'], 'bar');
       expect(response2.data['repeat_count'], 43);
-
-      // impossibly short timeout
-      callable.timeout = const Duration(milliseconds: 1);
-      bool timedOut = false;
-      try {
-        await callable.call(<String, dynamic>{
-          'message': 'impossible',
-          'count': 9001,
-        });
-      } on CloudFunctionsException {
-        timedOut = true;
-      }
-      expect(timedOut, true);
     });
   });
 }
diff --git a/packages/cloud_functions/pubspec.yaml b/packages/cloud_functions/pubspec.yaml
index b4699ee43463..6a6920af454b 100644
--- a/packages/cloud_functions/pubspec.yaml
+++ b/packages/cloud_functions/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cloud_functions
 description: Flutter plugin for Cloud Functions.
-version: 0.2.0
+version: 0.2.0+1
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_functions
 

From 6c55a052038a85dc052947ef37437f37315d3b89 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 6 May 2019 21:10:00 -0700
Subject: [PATCH 397/410] Update Flutterfire Android dependencies. (#1572)

* All the plugins that have firebase_core dependencies have been updated to the firebase_core release that was just published (#1576)
* Updated firebase_auth dependency on firebase_dynamic_links to fix compile failures.
* Updated firebase_messaging to handle breaking change on Android.
---
 packages/cloud_firestore/CHANGELOG.md         |  4 +++
 packages/cloud_firestore/android/build.gradle |  2 +-
 packages/cloud_firestore/example/pubspec.yaml |  2 +-
 packages/cloud_firestore/pubspec.yaml         |  4 +--
 packages/cloud_functions/CHANGELOG.md         |  4 +++
 packages/cloud_functions/android/build.gradle |  2 +-
 packages/cloud_functions/example/pubspec.yaml |  2 +-
 packages/cloud_functions/pubspec.yaml         |  4 +--
 packages/firebase_admob/CHANGELOG.md          |  4 +++
 packages/firebase_admob/android/build.gradle  |  2 +-
 packages/firebase_admob/example/pubspec.yaml  |  2 +-
 packages/firebase_admob/pubspec.yaml          |  4 +--
 packages/firebase_analytics/CHANGELOG.md      |  4 +++
 .../firebase_analytics/android/build.gradle   |  2 +-
 .../firebase_analytics/example/pubspec.yaml   |  2 +-
 packages/firebase_analytics/pubspec.yaml      |  4 +--
 packages/firebase_auth/CHANGELOG.md           |  5 ++++
 packages/firebase_auth/android/build.gradle   |  2 +-
 packages/firebase_auth/example/pubspec.yaml   |  4 +--
 packages/firebase_auth/pubspec.yaml           |  6 ++--
 packages/firebase_database/CHANGELOG.md       |  4 +++
 .../firebase_database/android/build.gradle    |  2 +-
 .../firebase_database/example/pubspec.yaml    |  2 +-
 packages/firebase_database/pubspec.yaml       |  4 +--
 packages/firebase_dynamic_links/CHANGELOG.md  |  4 +++
 .../example/pubspec.yaml                      |  2 +-
 packages/firebase_dynamic_links/pubspec.yaml  |  4 +--
 packages/firebase_messaging/CHANGELOG.md      |  4 +++
 .../firebase_messaging/android/build.gradle   |  2 +-
 .../android/src/main/AndroidManifest.xml      |  5 ----
 .../FirebaseMessagingPlugin.java              | 21 +++++++++++---
 .../FlutterFirebaseInstanceIDService.java     | 29 -------------------
 .../FlutterFirebaseMessagingService.java      | 16 ++++++++++
 .../firebase_messaging/example/pubspec.yaml   |  2 +-
 packages/firebase_messaging/pubspec.yaml      |  4 +--
 packages/firebase_ml_vision/CHANGELOG.md      |  4 +++
 .../firebase_ml_vision/android/build.gradle   |  2 +-
 .../firebase_ml_vision/example/pubspec.yaml   |  2 +-
 packages/firebase_ml_vision/pubspec.yaml      |  4 +--
 packages/firebase_performance/CHANGELOG.md    |  4 +++
 .../firebase_performance/android/build.gradle |  2 +-
 .../firebase_performance/example/pubspec.yaml |  2 +-
 packages/firebase_performance/pubspec.yaml    |  4 +--
 packages/firebase_remote_config/CHANGELOG.md  |  4 +++
 .../android/build.gradle                      |  2 +-
 .../example/pubspec.yaml                      |  2 +-
 packages/firebase_remote_config/pubspec.yaml  |  4 +--
 packages/firebase_storage/CHANGELOG.md        |  4 +++
 .../firebase_storage/android/build.gradle     |  2 +-
 .../firebase_storage/example/pubspec.yaml     |  2 +-
 packages/firebase_storage/pubspec.yaml        |  4 +--
 51 files changed, 131 insertions(+), 87 deletions(-)
 delete mode 100644 packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index d987568f376f..6c2d84583d20 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.11.0
+
+* Update Android dependencies to latest.
+
 ## 0.10.1
 
 * Support for `startAtDocument`, `startAfterDocument`, `endAtDocument`, `endBeforeDocument`.
diff --git a/packages/cloud_firestore/android/build.gradle b/packages/cloud_firestore/android/build.gradle
index c0283007130d..786c25b2704d 100755
--- a/packages/cloud_firestore/android/build.gradle
+++ b/packages/cloud_firestore/android/build.gradle
@@ -47,7 +47,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-firestore:18.2.0'
+        api 'com.google.firebase:firebase-firestore:19.0.0'
         implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/cloud_firestore/example/pubspec.yaml b/packages/cloud_firestore/example/pubspec.yaml
index 8463f1deb2f5..004c491062e9 100755
--- a/packages/cloud_firestore/example/pubspec.yaml
+++ b/packages/cloud_firestore/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   cloud_firestore:
     path: ../
-  firebase_core: "^0.3.2"
+  firebase_core: "^0.4.0"
 
 dev_dependencies:
   flutter_driver:
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index b7ea9791c35a..8fe40ee3de2e 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.10.1
+version: 0.11.0
 
 flutter:
   plugin:
@@ -16,7 +16,7 @@ dependencies:
     sdk: flutter
   meta: "^1.0.5"
   collection: "^1.14.3"
-  firebase_core: "^0.3.0"
+  firebase_core: "^0.4.0"
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/cloud_functions/CHANGELOG.md b/packages/cloud_functions/CHANGELOG.md
index 8e4e350c6b0f..3a089a199025 100644
--- a/packages/cloud_functions/CHANGELOG.md
+++ b/packages/cloud_functions/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.0
+
+* Update Android dependencies to latest.
+
 ## 0.2.0+1
 
 * Removed flaky timeout test.
diff --git a/packages/cloud_functions/android/build.gradle b/packages/cloud_functions/android/build.gradle
index 289f7071d883..f2b67565cd4a 100644
--- a/packages/cloud_functions/android/build.gradle
+++ b/packages/cloud_functions/android/build.gradle
@@ -45,7 +45,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-functions:16.3.0'
+        api 'com.google.firebase:firebase-functions:17.0.0'
         implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/cloud_functions/example/pubspec.yaml b/packages/cloud_functions/example/pubspec.yaml
index dc98e62dfbb4..2619baf7dcb8 100644
--- a/packages/cloud_functions/example/pubspec.yaml
+++ b/packages/cloud_functions/example/pubspec.yaml
@@ -9,7 +9,7 @@ dependencies:
   cupertino_icons: ^0.1.2
   cloud_functions:
     path: ..
-  firebase_core: ^0.3.1
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/cloud_functions/pubspec.yaml b/packages/cloud_functions/pubspec.yaml
index 6a6920af454b..12bf19f7646f 100644
--- a/packages/cloud_functions/pubspec.yaml
+++ b/packages/cloud_functions/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cloud_functions
 description: Flutter plugin for Cloud Functions.
-version: 0.2.0+1
+version: 0.3.0
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_functions
 
@@ -13,7 +13,7 @@ dependencies:
   meta: ^1.1.6
   flutter:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/firebase_admob/CHANGELOG.md b/packages/firebase_admob/CHANGELOG.md
index 6e3aff899926..12cff8e25d5a 100644
--- a/packages/firebase_admob/CHANGELOG.md
+++ b/packages/firebase_admob/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.0
+
+* Update Android dependencies to latest.
+
 ## 0.8.0+4
 
 * Update documentation to add AdMob App ID in Info.plist
diff --git a/packages/firebase_admob/android/build.gradle b/packages/firebase_admob/android/build.gradle
index cd82b1bf15b0..846ec4851ca3 100644
--- a/packages/firebase_admob/android/build.gradle
+++ b/packages/firebase_admob/android/build.gradle
@@ -45,6 +45,6 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-ads:17.0.0'
+        api 'com.google.firebase:firebase-ads:17.2.0'
     }
 }
diff --git a/packages/firebase_admob/example/pubspec.yaml b/packages/firebase_admob/example/pubspec.yaml
index 1a359fcc3f18..775e4852b10a 100644
--- a/packages/firebase_admob/example/pubspec.yaml
+++ b/packages/firebase_admob/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_admob:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 flutter:
   uses-material-design: true
diff --git a/packages/firebase_admob/pubspec.yaml b/packages/firebase_admob/pubspec.yaml
index c59ca5263543..814fdd11c21d 100644
--- a/packages/firebase_admob/pubspec.yaml
+++ b/packages/firebase_admob/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_admob
 description: Firebase AdMob plugin for Flutter applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_admob
-version: 0.8.0+4
+version: 0.9.0
 
 flutter:
   plugin:
@@ -20,7 +20,7 @@ dev_dependencies:
   mockito: ^3.0.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index a2942b699519..a6fafa133f15 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.0
+
+* Update Android dependencies to latest.
+
 ## 2.1.1+3
 
 * Added an initial integration test.
diff --git a/packages/firebase_analytics/android/build.gradle b/packages/firebase_analytics/android/build.gradle
index 5031bfd92710..eeae3842066d 100755
--- a/packages/firebase_analytics/android/build.gradle
+++ b/packages/firebase_analytics/android/build.gradle
@@ -45,6 +45,6 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-analytics:16.0.4'
+        api 'com.google.firebase:firebase-analytics:16.5.0'
     }
 }
diff --git a/packages/firebase_analytics/example/pubspec.yaml b/packages/firebase_analytics/example/pubspec.yaml
index 299dabeffbef..2207a8ecb318 100755
--- a/packages/firebase_analytics/example/pubspec.yaml
+++ b/packages/firebase_analytics/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_analytics:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index 843ecf78e695..dbff970acf36 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 2.1.1+3
+version: 3.0.0
 
 flutter:
   plugin:
@@ -21,7 +21,7 @@ dev_dependencies:
   mockito: 3.0.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
   flutter_driver:
     sdk: flutter
 
diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index 6372c30bf4bf..0665e3d137a2 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.10.0
+
+* Update firebase_dynamic_links dependency.
+* Update Android dependencies to latest.
+
 ## 0.9.0
 
 * **Breaking change**: `PhoneVerificationCompleted` now provides an `AuthCredential` that can
diff --git a/packages/firebase_auth/android/build.gradle b/packages/firebase_auth/android/build.gradle
index 1affbc85c646..11cb25db4f74 100755
--- a/packages/firebase_auth/android/build.gradle
+++ b/packages/firebase_auth/android/build.gradle
@@ -46,7 +46,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-auth:16.0.5'
+        api 'com.google.firebase:firebase-auth:17.0.0'
         api 'com.google.code.gson:gson:2.8.5'
     }
 }
diff --git a/packages/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/example/pubspec.yaml
index 4236d11cafb0..5356bd5c52a2 100755
--- a/packages/firebase_auth/example/pubspec.yaml
+++ b/packages/firebase_auth/example/pubspec.yaml
@@ -8,8 +8,8 @@ dependencies:
   firebase_auth:
     path: ../
   google_sign_in: ^4.0.0
-  firebase_core: ^0.3.0
-  firebase_dynamic_links: ^0.2.0+3
+  firebase_core: ^0.4.0
+  firebase_dynamic_links: ^0.3.0
 
 dev_dependencies:
   flutter_driver:
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index a1594bbac87d..7fcf85a997bc 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.9.0"
+version: "0.10.0"
 
 flutter:
   plugin:
@@ -14,14 +14,14 @@ flutter:
 
 dependencies:
   meta: ^1.0.4
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
   flutter:
     sdk: flutter
 
 dev_dependencies:
   google_sign_in: ^3.0.4
-  firebase_dynamic_links: ^0.2.0+3
+  firebase_dynamic_links: ^0.3.0
   test: ^1.3.0
   flutter_test:
     sdk: flutter
diff --git a/packages/firebase_database/CHANGELOG.md b/packages/firebase_database/CHANGELOG.md
index 82a5e30879da..38078502a07a 100644
--- a/packages/firebase_database/CHANGELOG.md
+++ b/packages/firebase_database/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.0
+
+* Update Android dependencies to latest.
+
 ## 2.0.3
 
 * Provide a `toString` implementation for `DatabaseError`.
diff --git a/packages/firebase_database/android/build.gradle b/packages/firebase_database/android/build.gradle
index f51f2acfb444..67f43f923818 100755
--- a/packages/firebase_database/android/build.gradle
+++ b/packages/firebase_database/android/build.gradle
@@ -45,6 +45,6 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-database:16.0.3'
+        api 'com.google.firebase:firebase-database:17.0.0'
     }
 }
diff --git a/packages/firebase_database/example/pubspec.yaml b/packages/firebase_database/example/pubspec.yaml
index 881e8af2cc5a..3c1735eab718 100755
--- a/packages/firebase_database/example/pubspec.yaml
+++ b/packages/firebase_database/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_database:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   flutter_driver:
diff --git a/packages/firebase_database/pubspec.yaml b/packages/firebase_database/pubspec.yaml
index 6c513aead36a..1728d09c58b8 100755
--- a/packages/firebase_database/pubspec.yaml
+++ b/packages/firebase_database/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Database, a cloud-hosted NoSQL database
   with realtime data syncing across Android and iOS clients, and offline access.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_database
-version: 2.0.3
+version: 3.0.0
 
 flutter:
   plugin:
@@ -14,7 +14,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   test: ^1.3.0
diff --git a/packages/firebase_dynamic_links/CHANGELOG.md b/packages/firebase_dynamic_links/CHANGELOG.md
index a6e6f81bf066..a6be81ecc1d3 100644
--- a/packages/firebase_dynamic_links/CHANGELOG.md
+++ b/packages/firebase_dynamic_links/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0
+
+* Update dependency on firebase_core to 0.4.0.
+
 ## 0.3.0.
 
 * Update Android dependencies to 16.1.7.
diff --git a/packages/firebase_dynamic_links/example/pubspec.yaml b/packages/firebase_dynamic_links/example/pubspec.yaml
index 7756f70e4e47..f396651940d9 100644
--- a/packages/firebase_dynamic_links/example/pubspec.yaml
+++ b/packages/firebase_dynamic_links/example/pubspec.yaml
@@ -7,7 +7,7 @@ dependencies:
 
   firebase_dynamic_links:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
   url_launcher: ^4.2.0
 
diff --git a/packages/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/pubspec.yaml
index 59c6eac9e743..f87e00d1f549 100644
--- a/packages/firebase_dynamic_links/pubspec.yaml
+++ b/packages/firebase_dynamic_links/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_dynamic_links
 description: Flutter plugin for Google Dynamic Links for Firebase, an app solution for creating
   and handling links across multiple platforms.
-version: 0.3.0
+version: 0.4.0
 
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_dynamic_links
@@ -14,7 +14,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   url_launcher: ^4.2.0
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 flutter:
   plugin:
diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index 2a113827a2c9..30cfecc85bcc 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.0.0
+
+* Update Android dependencies to latest.
+
 ## 4.0.0+4
 
 * Remove obsolete `use_frameworks!` instruction.
diff --git a/packages/firebase_messaging/android/build.gradle b/packages/firebase_messaging/android/build.gradle
index 34c75c16a46b..bf6f3a5df5da 100644
--- a/packages/firebase_messaging/android/build.gradle
+++ b/packages/firebase_messaging/android/build.gradle
@@ -45,7 +45,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-messaging:17.3.3'
+        api 'com.google.firebase:firebase-messaging:18.0.0'
         implementation 'androidx.annotation:annotation:1.0.0'
         implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     }
diff --git a/packages/firebase_messaging/android/src/main/AndroidManifest.xml b/packages/firebase_messaging/android/src/main/AndroidManifest.xml
index c97e19d133a6..b173cc78b94a 100644
--- a/packages/firebase_messaging/android/src/main/AndroidManifest.xml
+++ b/packages/firebase_messaging/android/src/main/AndroidManifest.xml
@@ -2,11 +2,6 @@
   package="io.flutter.plugins.firebasemessaging">
 
   <application>
-    <service android:name=".FlutterFirebaseInstanceIDService">
-      <intent-filter>
-        <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-      </intent-filter>
-    </service>
     <service android:name=".FlutterFirebaseMessagingService">
       <intent-filter>
         <action android:name="com.google.firebase.MESSAGING_EVENT"/>
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
index 2085eae9160f..130522ef4041 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
@@ -52,7 +52,7 @@ private FirebaseMessagingPlugin(Registrar registrar, MethodChannel channel) {
     FirebaseApp.initializeApp(registrar.context());
 
     IntentFilter intentFilter = new IntentFilter();
-    intentFilter.addAction(FlutterFirebaseInstanceIDService.ACTION_TOKEN);
+    intentFilter.addAction(FlutterFirebaseMessagingService.ACTION_TOKEN);
     intentFilter.addAction(FlutterFirebaseMessagingService.ACTION_REMOTE_MESSAGE);
     LocalBroadcastManager manager = LocalBroadcastManager.getInstance(registrar.context());
     manager.registerReceiver(this, intentFilter);
@@ -67,8 +67,8 @@ public void onReceive(Context context, Intent intent) {
       return;
     }
 
-    if (action.equals(FlutterFirebaseInstanceIDService.ACTION_TOKEN)) {
-      String token = intent.getStringExtra(FlutterFirebaseInstanceIDService.EXTRA_TOKEN);
+    if (action.equals(FlutterFirebaseMessagingService.ACTION_TOKEN)) {
+      String token = intent.getStringExtra(FlutterFirebaseMessagingService.EXTRA_TOKEN);
       channel.invokeMethod("onToken", token);
     } else if (action.equals(FlutterFirebaseMessagingService.ACTION_REMOTE_MESSAGE)) {
       RemoteMessage message =
@@ -100,7 +100,20 @@ private Map<String, Object> parseRemoteMessage(RemoteMessage message) {
   @Override
   public void onMethodCall(final MethodCall call, final Result result) {
     if ("configure".equals(call.method)) {
-      FlutterFirebaseInstanceIDService.broadcastToken(registrar.context());
+      FirebaseInstanceId.getInstance()
+          .getInstanceId()
+          .addOnCompleteListener(
+              new OnCompleteListener<InstanceIdResult>() {
+                @Override
+                public void onComplete(@NonNull Task<InstanceIdResult> task) {
+                  if (!task.isSuccessful()) {
+                    Log.w(TAG, "getToken, error fetching instanceID: ", task.getException());
+                    result.success(null);
+                    return;
+                  }
+                  channel.invokeMethod("onToken", task.getResult().getToken());
+                }
+              });
       if (registrar.activity() != null) {
         sendMessageFromIntent("onLaunch", registrar.activity().getIntent());
       }
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java
deleted file mode 100644
index 71840b8e3c09..000000000000
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseInstanceIDService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package io.flutter.plugins.firebasemessaging;
-
-import android.content.Context;
-import android.content.Intent;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.iid.FirebaseInstanceIdService;
-
-public class FlutterFirebaseInstanceIDService extends FirebaseInstanceIdService {
-
-  public static final String ACTION_TOKEN = "io.flutter.plugins.firebasemessaging.TOKEN";
-  public static final String EXTRA_TOKEN = "token";
-
-  public static void broadcastToken(Context context) {
-    Intent intent = new Intent(ACTION_TOKEN);
-    intent.putExtra(EXTRA_TOKEN, FirebaseInstanceId.getInstance().getToken());
-    LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
-  }
-
-  /** Called if InstanceID token is updated. */
-  @Override
-  public void onTokenRefresh() {
-    broadcastToken(this);
-  }
-}
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java
index cdea8469a42a..345c0161e192 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseMessagingService.java
@@ -15,6 +15,9 @@ public class FlutterFirebaseMessagingService extends FirebaseMessagingService {
       "io.flutter.plugins.firebasemessaging.NOTIFICATION";
   public static final String EXTRA_REMOTE_MESSAGE = "notification";
 
+  public static final String ACTION_TOKEN = "io.flutter.plugins.firebasemessaging.TOKEN";
+  public static final String EXTRA_TOKEN = "token";
+
   /**
    * Called when message is received.
    *
@@ -26,4 +29,17 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
     intent.putExtra(EXTRA_REMOTE_MESSAGE, remoteMessage);
     LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
   }
+
+  /**
+   * Called when a new token for the default Firebase project is generated.
+   *
+   * @param token The token used for sending messages to this application instance. This token is
+   *     the same as the one retrieved by getInstanceId().
+   */
+  @Override
+  public void onNewToken(String token) {
+    Intent intent = new Intent(ACTION_TOKEN);
+    intent.putExtra(EXTRA_TOKEN, token);
+    LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
+  }
 }
diff --git a/packages/firebase_messaging/example/pubspec.yaml b/packages/firebase_messaging/example/pubspec.yaml
index 42940ecdd010..b6f5dda32bbb 100644
--- a/packages/firebase_messaging/example/pubspec.yaml
+++ b/packages/firebase_messaging/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_messaging:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
index fc2d538dfdbd..6826f13ec8ea 100644
--- a/packages/firebase_messaging/pubspec.yaml
+++ b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 4.0.0+4
+version: 5.0.0
 
 flutter:
   plugin:
@@ -22,7 +22,7 @@ dev_dependencies:
   mockito: ^3.0.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index 1a6f41115e74..da4bc4d99aff 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.0
+
+* Update Android dependencies to latest.
+
 ## 0.7.0+2
 
 * Fix analyzer warnings about `const Rect` in tests.
diff --git a/packages/firebase_ml_vision/android/build.gradle b/packages/firebase_ml_vision/android/build.gradle
index 8fcc744893c9..92cabac01cd5 100644
--- a/packages/firebase_ml_vision/android/build.gradle
+++ b/packages/firebase_ml_vision/android/build.gradle
@@ -45,7 +45,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-ml-vision:19.0.2'
+        api 'com.google.firebase:firebase-ml-vision:20.0.0'
         implementation 'androidx.annotation:annotation:1.0.0'
         implementation 'androidx.exifinterface:exifinterface:1.0.0'
     }
diff --git a/packages/firebase_ml_vision/example/pubspec.yaml b/packages/firebase_ml_vision/example/pubspec.yaml
index 5e82de2c3397..440d1c3c83ad 100644
--- a/packages/firebase_ml_vision/example/pubspec.yaml
+++ b/packages/firebase_ml_vision/example/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
   cupertino_icons: ^0.1.2
   firebase_ml_vision:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index e743eacc9494..878c1e513a0f 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_ml_vision
 description: Flutter plugin for Firebase machine learning vision services.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.7.0+2
+version: 0.8.0
 
 dependencies:
   flutter:
@@ -12,7 +12,7 @@ dev_dependencies:
   image_picker: ^0.5.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
   flutter_driver:
     sdk: flutter
   test: any
diff --git a/packages/firebase_performance/CHANGELOG.md b/packages/firebase_performance/CHANGELOG.md
index 7b915e7c8c6c..e3fc06951fbd 100644
--- a/packages/firebase_performance/CHANGELOG.md
+++ b/packages/firebase_performance/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0
+
+* Update Android dependencies to latest.
+
 ## 0.1.1
 
 * Deprecate `Trace.incrementCounter` and add `Trace.incrementMetric`.
diff --git a/packages/firebase_performance/android/build.gradle b/packages/firebase_performance/android/build.gradle
index d74a4b24bc6e..e44c3137a3d0 100644
--- a/packages/firebase_performance/android/build.gradle
+++ b/packages/firebase_performance/android/build.gradle
@@ -45,6 +45,6 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-perf:16.1.2'
+        api 'com.google.firebase:firebase-perf:17.0.0'
     }
 }
diff --git a/packages/firebase_performance/example/pubspec.yaml b/packages/firebase_performance/example/pubspec.yaml
index ef9440d129f5..2bcf0b94b414 100644
--- a/packages/firebase_performance/example/pubspec.yaml
+++ b/packages/firebase_performance/example/pubspec.yaml
@@ -8,7 +8,7 @@ dependencies:
     sdk: flutter
   firebase_performance:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/firebase_performance/pubspec.yaml b/packages/firebase_performance/pubspec.yaml
index 56ed140e2f34..629918d8ab0d 100644
--- a/packages/firebase_performance/pubspec.yaml
+++ b/packages/firebase_performance/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Google Performance Monitoring for Firebase, an a
   iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_performance
-version: 0.1.1
+version: 0.2.0
 
 dependencies:
   flutter:
@@ -14,7 +14,7 @@ dev_dependencies:
   http: ^0.12.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
   flutter_driver:
     sdk: flutter
   test: any
diff --git a/packages/firebase_remote_config/CHANGELOG.md b/packages/firebase_remote_config/CHANGELOG.md
index 280bf9a77641..4ffa31d70c45 100644
--- a/packages/firebase_remote_config/CHANGELOG.md
+++ b/packages/firebase_remote_config/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0
+
+* Update Android dependencies to latest.
+
 ## 0.1.0+3
 
 * Initial integration tests.
diff --git a/packages/firebase_remote_config/android/build.gradle b/packages/firebase_remote_config/android/build.gradle
index 5994006e4d7a..b6a14831eb45 100644
--- a/packages/firebase_remote_config/android/build.gradle
+++ b/packages/firebase_remote_config/android/build.gradle
@@ -45,7 +45,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-config:16.0.1'
+        api 'com.google.firebase:firebase-config:16.4.1'
         implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/firebase_remote_config/example/pubspec.yaml b/packages/firebase_remote_config/example/pubspec.yaml
index 99c4879fd7b2..06c9b5bea711 100644
--- a/packages/firebase_remote_config/example/pubspec.yaml
+++ b/packages/firebase_remote_config/example/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
   cupertino_icons: ^0.1.0
   firebase_remote_config:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/pubspec.yaml
index e0b6bcb16775..e74cb80ca107 100644
--- a/packages/firebase_remote_config/pubspec.yaml
+++ b/packages/firebase_remote_config/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Remote Config. Update your application
   re-releasing.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_remote_config
-version: 0.1.0+3
+version: 0.2.0
 
 dependencies:
   flutter:
@@ -12,7 +12,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
   flutter_driver:
     sdk: flutter
   test: any
diff --git a/packages/firebase_storage/CHANGELOG.md b/packages/firebase_storage/CHANGELOG.md
index 187f01b29e29..7b5f05b1c088 100644
--- a/packages/firebase_storage/CHANGELOG.md
+++ b/packages/firebase_storage/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.0
+
+* Update Android dependencies to latest.
+
 ## 2.1.1+2
 
 * On iOS, use `putFile` instead of `putData` appropriately to detect `Content-Type`.
diff --git a/packages/firebase_storage/android/build.gradle b/packages/firebase_storage/android/build.gradle
index 0445829f8300..c2bfd0a7f322 100755
--- a/packages/firebase_storage/android/build.gradle
+++ b/packages/firebase_storage/android/build.gradle
@@ -53,7 +53,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-storage:16.0.3'
+        api 'com.google.firebase:firebase-storage:17.0.0'
         implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/firebase_storage/example/pubspec.yaml b/packages/firebase_storage/example/pubspec.yaml
index 9301adf1d6d2..c52f55f550b4 100755
--- a/packages/firebase_storage/example/pubspec.yaml
+++ b/packages/firebase_storage/example/pubspec.yaml
@@ -7,7 +7,7 @@ dependencies:
     sdk: flutter
   firebase_storage:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
   uuid: "^1.0.0"
   http: ^0.12.0
 
diff --git a/packages/firebase_storage/pubspec.yaml b/packages/firebase_storage/pubspec.yaml
index 680f8f28c21b..ae803278b942 100755
--- a/packages/firebase_storage/pubspec.yaml
+++ b/packages/firebase_storage/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Storage, a powerful, simple, and
   cost-effective object storage service for Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_storage
-version: 2.1.1+2
+version: 3.0.0
 
 flutter:
   plugin:
@@ -14,7 +14,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   http: ^0.12.0

From 4f0c5dd2bd30673446a8d511f7a791af9757eb3e Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Tue, 7 May 2019 08:42:20 -0700
Subject: [PATCH 398/410] [firebase_messaging] more graceful handling of failed
 startup (#1579)

---
 packages/firebase_messaging/CHANGELOG.md                      | 4 ++++
 .../plugins/firebasemessaging/FirebaseMessagingPlugin.java    | 1 -
 packages/firebase_messaging/pubspec.yaml                      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index 30cfecc85bcc..a4a9f31ed657 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.0.1
+
+* Fix error in the logs on startup if unable to retrieve token on startup on Android.
+
 ## 5.0.0
 
 * Update Android dependencies to latest.
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
index 130522ef4041..7c01c516c843 100644
--- a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
+++ b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
@@ -108,7 +108,6 @@ public void onMethodCall(final MethodCall call, final Result result) {
                 public void onComplete(@NonNull Task<InstanceIdResult> task) {
                   if (!task.isSuccessful()) {
                     Log.w(TAG, "getToken, error fetching instanceID: ", task.getException());
-                    result.success(null);
                     return;
                   }
                   channel.invokeMethod("onToken", task.getResult().getToken());
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
index 6826f13ec8ea..15cd60a2dd0d 100644
--- a/packages/firebase_messaging/pubspec.yaml
+++ b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 5.0.0
+version: 5.0.1
 
 flutter:
   plugin:

From 89af81d325a3fb8f16ec88a08d28b8ffd2c9b54e Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Tue, 7 May 2019 12:29:32 -0700
Subject: [PATCH 399/410] [cloud_firestore] Update CocoaPod versions dependency
 (#1580)

* Increase cloud_firestore dependency on iOS to ensure FieldValue.increment availability
---
 packages/cloud_firestore/CHANGELOG.md                | 4 ++++
 packages/cloud_firestore/ios/cloud_firestore.podspec | 2 +-
 packages/cloud_firestore/pubspec.yaml                | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
index 6c2d84583d20..7324b36febe0 100644
--- a/packages/cloud_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.11.0+1
+
+* Update iOS CocoaPod dependencies to '~> 6.0' to ensure support for `FieldValue.increment`.
+
 ## 0.11.0
 
 * Update Android dependencies to latest.
diff --git a/packages/cloud_firestore/ios/cloud_firestore.podspec b/packages/cloud_firestore/ios/cloud_firestore.podspec
index fe753037602e..36ff217157f1 100755
--- a/packages/cloud_firestore/ios/cloud_firestore.podspec
+++ b/packages/cloud_firestore/ios/cloud_firestore.podspec
@@ -19,6 +19,6 @@ Firestore plugin for Flutter.
   s.dependency 'Firebase/Database'
   s.dependency 'Firebase/Core'
   s.dependency 'Firebase/Auth'
-  s.dependency 'Firebase/Firestore'
+  s.dependency 'Firebase/Firestore', '~> 6.0'
   s.static_framework = true
 end
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index 8fe40ee3de2e..97d49d131971 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.11.0
+version: 0.11.0+1
 
 flutter:
   plugin:

From d4dc2847d026b027363966a7c18e5e861f93e598 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Tue, 7 May 2019 12:30:45 -0700
Subject: [PATCH 400/410] [firebase_auth] Update to latest CocoaPod (#1578)

* Update firebase_auth podspec
---
 packages/firebase_auth/CHANGELOG.md              | 4 ++++
 packages/firebase_auth/ios/firebase_auth.podspec | 2 +-
 packages/firebase_auth/pubspec.yaml              | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index 0665e3d137a2..a7ce8409a5d3 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.0+1
+
+* Increase Firebase/Auth CocoaPod dependency to '~> 6.0'.
+
 ## 0.10.0
 
 * Update firebase_dynamic_links dependency.
diff --git a/packages/firebase_auth/ios/firebase_auth.podspec b/packages/firebase_auth/ios/firebase_auth.podspec
index 44ac216a5fc7..dc9274a65982 100755
--- a/packages/firebase_auth/ios/firebase_auth.podspec
+++ b/packages/firebase_auth/ios/firebase_auth.podspec
@@ -16,7 +16,7 @@ Firebase Auth plugin for Flutter.
   s.public_header_files = 'Classes/**/*.h'
   s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
-  s.dependency 'Firebase/Auth', '~> 5.19'
+  s.dependency 'Firebase/Auth', '~> 6.0'
   s.dependency 'Firebase/Core'
   s.static_framework = true
 end
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 7fcf85a997bc..1635ef047005 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.10.0"
+version: "0.10.0+1"
 
 flutter:
   plugin:

From 1a4ed625e2071984b51cf8e6c1fbec50d4945e74 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Tue, 7 May 2019 13:48:32 -0700
Subject: [PATCH 401/410] Fix break in firebase_analytics CocoaPod (#1581)

* Fix break in firebase_analytics CocoaPod
---
 packages/firebase_analytics/CHANGELOG.md                    | 6 ++++++
 .../ios/Classes/FirebaseAnalyticsPlugin.m                   | 2 +-
 packages/firebase_analytics/ios/firebase_analytics.podspec  | 1 +
 packages/firebase_analytics/pubspec.yaml                    | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
index a6fafa133f15..43349e986cae 100644
--- a/packages/firebase_analytics/CHANGELOG.md
+++ b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.0.1
+
+* Switch to using the `FIRAnalytics` version of `setAnalyticsCollectionEnabled` for
+  compatibility with Firebase Analytics iOS CocoaPod version 6.0.
+* Update podspec to ensure availability of `setAnalyticsCollectionEnabled`.
+
 ## 3.0.0
 
 * Update Android dependencies to latest.
diff --git a/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m b/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m
index 5567dbda64b4..b8e5413a6ea1 100644
--- a/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m
+++ b/packages/firebase_analytics/ios/Classes/FirebaseAnalyticsPlugin.m
@@ -57,7 +57,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     result(nil);
   } else if ([@"setAnalyticsCollectionEnabled" isEqualToString:call.method]) {
     NSNumber *enabled = [NSNumber numberWithBool:call.arguments];
-    [[FIRAnalyticsConfiguration sharedInstance] setAnalyticsCollectionEnabled:[enabled boolValue]];
+    [FIRAnalytics setAnalyticsCollectionEnabled:[enabled boolValue]];
     result(nil);
   } else if ([@"resetAnalyticsData" isEqualToString:call.method]) {
     [FIRAnalytics resetAnalyticsData];
diff --git a/packages/firebase_analytics/ios/firebase_analytics.podspec b/packages/firebase_analytics/ios/firebase_analytics.podspec
index 9f59d1d01207..70619110e24f 100755
--- a/packages/firebase_analytics/ios/firebase_analytics.podspec
+++ b/packages/firebase_analytics/ios/firebase_analytics.podspec
@@ -17,5 +17,6 @@ Firebase Analytics plugin for Flutter.
   s.ios.deployment_target = '8.0'
   s.dependency 'Flutter'
   s.dependency 'Firebase/Core'
+  s.dependency 'Firebase/Analytics', '~> 6.0'
   s.static_framework = true
 end
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
index dbff970acf36..2b1bc2a89b64 100755
--- a/packages/firebase_analytics/pubspec.yaml
+++ b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 3.0.0
+version: 3.0.1
 
 flutter:
   plugin:

From c19d60ad4597915848ef0943b2feba4558aad85b Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Tue, 7 May 2019 17:43:19 -0700
Subject: [PATCH 402/410] [in_app_purchase] Add consumable demo (#1577)

Also changes how the example app handles state to avoid bugs with
consumables not getting updated based on purchasing. Previously the app
was relying on FutureBuilders, but these didn't handle state updates
over time and across Widgets correctly.
---
 packages/in_app_purchase/CHANGELOG.md         |   4 +
 .../example/lib/consumable_store.dart         |  38 +++
 .../in_app_purchase/example/lib/main.dart     | 219 ++++++++++++------
 packages/in_app_purchase/example/pubspec.yaml |   1 +
 packages/in_app_purchase/pubspec.yaml         |   3 +-
 5 files changed, 198 insertions(+), 67 deletions(-)
 create mode 100644 packages/in_app_purchase/example/lib/consumable_store.dart

diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md
index 118cd609e335..1bd95b9123c3 100644
--- a/packages/in_app_purchase/CHANGELOG.md
+++ b/packages/in_app_purchase/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0+1
+
+Add more consumable handling to the example app.
+
 ## 0.1.0
 
 Beta relase.
diff --git a/packages/in_app_purchase/example/lib/consumable_store.dart b/packages/in_app_purchase/example/lib/consumable_store.dart
new file mode 100644
index 000000000000..d70598ef07a0
--- /dev/null
+++ b/packages/in_app_purchase/example/lib/consumable_store.dart
@@ -0,0 +1,38 @@
+import 'dart:async';
+import 'package:shared_preferences/shared_preferences.dart';
+
+// This is just a development prototype for locally storing consumables. Do not
+// use this.
+class ConsumableStore {
+  static const String _kPrefKey = 'consumables';
+  static Future<void> _writes = Future.value();
+
+  static Future<void> save(String id) {
+    _writes = _writes.then((void _) => _doSave(id));
+    return _writes;
+  }
+
+  static Future<void> consume(String id) {
+    _writes = _writes.then((void _) => _doConsume(id));
+    return _writes;
+  }
+
+  static Future<List<String>> load() async {
+    return (await SharedPreferences.getInstance()).getStringList(_kPrefKey) ??
+        [];
+  }
+
+  static Future<void> _doSave(String id) async {
+    List<String> cached = await load();
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    cached.add(id);
+    await prefs.setStringList(_kPrefKey, cached);
+  }
+
+  static Future<void> _doConsume(String id) async {
+    List<String> cached = await load();
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    cached.remove(id);
+    await prefs.setStringList(_kPrefKey, cached);
+  }
+}
diff --git a/packages/in_app_purchase/example/lib/main.dart b/packages/in_app_purchase/example/lib/main.dart
index fbb1f885bcc5..0b53b7a3bbfd 100644
--- a/packages/in_app_purchase/example/lib/main.dart
+++ b/packages/in_app_purchase/example/lib/main.dart
@@ -6,16 +6,17 @@ import 'dart:async';
 import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:in_app_purchase/in_app_purchase.dart';
+import 'consumable_store.dart';
 
 void main() {
   runApp(MyApp());
 }
 
-// Switch this to true if you want to try out auto consume when buying a consumable.
-const bool kAutoConsume = false;
+const bool kAutoConsume = true;
 
+const String _kConsumableId = 'consumable';
 const List<String> _kProductIds = <String>[
-  'consumable',
+  _kConsumableId,
   'upgrade',
   'subscription'
 ];
@@ -26,9 +27,16 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> {
+  final InAppPurchaseConnection _connection = InAppPurchaseConnection.instance;
   StreamSubscription<List<PurchaseDetails>> _subscription;
-
+  List<String> _notFoundIds = [];
+  List<ProductDetails> _products = [];
+  List<PurchaseDetails> _purchases = [];
+  List<String> _consumables = [];
+  bool _isAvailable = false;
   bool _purchasePending = false;
+  bool _loading = true;
+
   @override
   void initState() {
     Stream purchaseUpdated =
@@ -40,9 +48,60 @@ class _MyAppState extends State<MyApp> {
     }, onError: (error) {
       // handle error here.
     });
+    initStoreInfo();
     super.initState();
   }
 
+  Future<void> initStoreInfo() async {
+    final bool isAvailable = await _connection.isAvailable();
+    if (!isAvailable) {
+      setState(() {
+        _isAvailable = isAvailable;
+        _products = [];
+        _purchases = [];
+        _notFoundIds = [];
+        _consumables = [];
+        _purchasePending = false;
+        _loading = false;
+      });
+      return;
+    }
+
+    ProductDetailsResponse productDetails =
+        await _connection.queryProductDetails(_kProductIds.toSet());
+    if (productDetails.productDetails.isEmpty) {
+      setState(() {
+        _isAvailable = isAvailable;
+        _products = productDetails.productDetails;
+        _purchases = [];
+        _notFoundIds = productDetails.notFoundIDs;
+        _consumables = [];
+        _purchasePending = false;
+        _loading = false;
+      });
+      return;
+    }
+
+    final QueryPurchaseDetailsResponse purchaseResponse =
+        await _connection.queryPastPurchases();
+    final List<PurchaseDetails> verifiedPurchases = [];
+    for (PurchaseDetails purchase in purchaseResponse.pastPurchases) {
+      if (await _verifyPurchase(purchase)) {
+        verifiedPurchases.add(purchase);
+      }
+    }
+    List<String> consumables = await ConsumableStore.load();
+    setState(() {
+      _isAvailable = isAvailable;
+      _products = productDetails.productDetails;
+      _purchases = verifiedPurchases;
+      _notFoundIds = productDetails.notFoundIDs;
+      _consumables = consumables;
+      _purchasePending = false;
+      _loading = false;
+    });
+  }
+
   @override
   void dispose() {
     _subscription.cancel();
@@ -55,38 +114,9 @@ class _MyAppState extends State<MyApp> {
     stack.add(
       ListView(
         children: [
-          FutureBuilder(
-            future: _buildConnectionCheckTile(),
-            builder: (BuildContext context, AsyncSnapshot snapshot) {
-              if (snapshot.error != null) {
-                return buildListCard(ListTile(
-                    title: Text(
-                        'Error connecting: ' + snapshot.error.toString())));
-              } else if (!snapshot.hasData) {
-                return Card(
-                    child: ListTile(title: const Text('Trying to connect...')));
-              }
-              return snapshot.data;
-            },
-          ),
-          FutureBuilder(
-            future: _buildProductList(),
-            builder: (BuildContext context, AsyncSnapshot snapshot) {
-              if (snapshot.error != null) {
-                return Center(
-                  child: buildListCard(ListTile(
-                      title:
-                          Text('Error fetching products ${snapshot.error}'))),
-                );
-              } else if (!snapshot.hasData) {
-                return Card(
-                    child: (ListTile(
-                        leading: CircularProgressIndicator(),
-                        title: Text('Fetching products...'))));
-              }
-              return snapshot.data;
-            },
-          ),
+          _buildConnectionCheckTile(),
+          _buildProductList(),
+          _buildConsumableBox(),
         ],
       ),
     );
@@ -118,17 +148,19 @@ class _MyAppState extends State<MyApp> {
     );
   }
 
-  Future<Card> _buildConnectionCheckTile() async {
-    final bool available = await InAppPurchaseConnection.instance.isAvailable();
+  Card _buildConnectionCheckTile() {
+    if (_loading) {
+      return Card(child: ListTile(title: const Text('Trying to connect...')));
+    }
     final Widget storeHeader = ListTile(
-      leading: Icon(available ? Icons.check : Icons.block,
-          color: available ? Colors.green : ThemeData.light().errorColor),
+      leading: Icon(_isAvailable ? Icons.check : Icons.block,
+          color: _isAvailable ? Colors.green : ThemeData.light().errorColor),
       title: Text(
-          'The store is ' + (available ? 'available' : 'unavailable') + '.'),
+          'The store is ' + (_isAvailable ? 'available' : 'unavailable') + '.'),
     );
     final List<Widget> children = <Widget>[storeHeader];
 
-    if (!available) {
+    if (!_isAvailable) {
       children.addAll([
         Divider(),
         ListTile(
@@ -142,21 +174,23 @@ class _MyAppState extends State<MyApp> {
     return Card(child: Column(children: children));
   }
 
-  Future<Card> _buildProductList() async {
-    InAppPurchaseConnection connection = InAppPurchaseConnection.instance;
-    final bool available = await connection.isAvailable();
-    if (!available) {
+  Card _buildProductList() {
+    if (_loading) {
+      return Card(
+          child: (ListTile(
+              leading: CircularProgressIndicator(),
+              title: Text('Fetching products...'))));
+    }
+    if (!_isAvailable) {
       return Card();
     }
     final ListTile productHeader = ListTile(
         title: Text('Products for Sale',
             style: Theme.of(context).textTheme.headline));
-    ProductDetailsResponse response =
-        await connection.queryProductDetails(_kProductIds.toSet());
     List<ListTile> productList = <ListTile>[];
-    if (!response.notFoundIDs.isEmpty) {
+    if (!_notFoundIds.isEmpty) {
       productList.add(ListTile(
-          title: Text('[${response.notFoundIDs.join(", ")}] not found',
+          title: Text('[${_notFoundIds.join(", ")}] not found',
               style: TextStyle(color: ThemeData.light().errorColor)),
           subtitle: Text(
               'This app needs special configuration to run. Please see example/README.md for instructions.')));
@@ -165,18 +199,14 @@ class _MyAppState extends State<MyApp> {
     // This loading previous purchases code is just a demo. Please do not use this as it is.
     // In your app you should always verify the purchase data using the `verificationData` inside the [PurchaseDetails] object before trusting it.
     // We recommend that you use your own server to verity the purchase data.
-    Map<String, PurchaseDetails> purchases = Map.fromEntries(
-        ((await connection.queryPastPurchases()).pastPurchases)
-            .map((PurchaseDetails purchase) {
+    Map<String, PurchaseDetails> purchases =
+        Map.fromEntries(_purchases.map((PurchaseDetails purchase) {
       if (Platform.isIOS) {
         InAppPurchaseConnection.instance.completePurchase(purchase);
       }
-      if (Platform.isAndroid && purchase.productID == 'consumable') {
-        InAppPurchaseConnection.instance.consumePurchase(purchase);
-      }
       return MapEntry<String, PurchaseDetails>(purchase.productID, purchase);
     }));
-    productList.addAll(response.productDetails.map(
+    productList.addAll(_products.map(
       (ProductDetails productDetails) {
         PurchaseDetails previousPurchase = purchases[productDetails.id];
         return ListTile(
@@ -197,12 +227,12 @@ class _MyAppState extends State<MyApp> {
                           productDetails: productDetails,
                           applicationUserName: null,
                           sandboxTesting: true);
-                      if (productDetails.id == 'consumable') {
-                        connection.buyConsumable(
+                      if (productDetails.id == _kConsumableId) {
+                        _connection.buyConsumable(
                             purchaseParam: purchaseParam,
                             autoConsume: kAutoConsume || Platform.isIOS);
                       } else {
-                        connection.buyNonConsumable(
+                        _connection.buyNonConsumable(
                             purchaseParam: purchaseParam);
                       }
                     },
@@ -215,19 +245,76 @@ class _MyAppState extends State<MyApp> {
             Column(children: <Widget>[productHeader, Divider()] + productList));
   }
 
-  void showPendingUI() {
+  Card _buildConsumableBox() {
+    if (_loading) {
+      return Card(
+          child: (ListTile(
+              leading: CircularProgressIndicator(),
+              title: Text('Fetching consumables...'))));
+    }
+    if (!_isAvailable || _notFoundIds.contains(_kConsumableId)) {
+      return Card();
+    }
+    final ListTile consumableHeader = ListTile(
+        title: Text('Purchased consumables',
+            style: Theme.of(context).textTheme.headline));
+    final List<Widget> tokens = _consumables.map((String id) {
+      return GridTile(
+        child: IconButton(
+          icon: Icon(
+            Icons.stars,
+            size: 42.0,
+            color: Colors.orange,
+          ),
+          splashColor: Colors.yellowAccent,
+          onPressed: () => consume(id),
+        ),
+      );
+    }).toList();
+    return Card(
+        child: Column(children: <Widget>[
+      consumableHeader,
+      Divider(),
+      GridView.count(
+        crossAxisCount: 5,
+        children: tokens,
+        shrinkWrap: true,
+        padding: EdgeInsets.all(16.0),
+      )
+    ]));
+  }
+
+  Future<void> consume(String id) async {
+    await ConsumableStore.consume(id);
+    final List<String> consumables = await ConsumableStore.load();
     setState(() {
-      _purchasePending = true;
+      _consumables = consumables;
     });
   }
 
-  void deliverProduct(PurchaseDetails purchaseDetails) {
-    // IMPORTANT!! Always verify a purchase purchase details before deliver the product.
+  void showPendingUI() {
     setState(() {
-      _purchasePending = false;
+      _purchasePending = true;
     });
   }
 
+  void deliverProduct(PurchaseDetails purchaseDetails) async {
+    // IMPORTANT!! Always verify a purchase purchase details before delivering the product.
+    if (purchaseDetails.productID == _kConsumableId) {
+      await ConsumableStore.save(purchaseDetails.purchaseID);
+      List<String> consumables = await ConsumableStore.load();
+      setState(() {
+        _purchasePending = false;
+        _consumables = consumables;
+      });
+    } else {
+      setState(() {
+        _purchases.add(purchaseDetails);
+        _purchasePending = false;
+      });
+    }
+  }
+
   void handleError(PurchaseError error) {
     setState(() {
       _purchasePending = false;
@@ -265,7 +352,7 @@ class _MyAppState extends State<MyApp> {
         if (Platform.isIOS) {
           InAppPurchaseConnection.instance.completePurchase(purchaseDetails);
         } else if (Platform.isAndroid) {
-          if (!kAutoConsume && purchaseDetails.productID == 'consumable') {
+          if (!kAutoConsume && purchaseDetails.productID == _kConsumableId) {
             InAppPurchaseConnection.instance.consumePurchase(purchaseDetails);
           }
         }
diff --git a/packages/in_app_purchase/example/pubspec.yaml b/packages/in_app_purchase/example/pubspec.yaml
index ccc21beacaec..2f7e7fb6af58 100644
--- a/packages/in_app_purchase/example/pubspec.yaml
+++ b/packages/in_app_purchase/example/pubspec.yaml
@@ -6,6 +6,7 @@ dependencies:
   flutter:
     sdk: flutter
   cupertino_icons: ^0.1.2
+  shared_preferences: ^0.5.2
 
 dev_dependencies:
   test: ^1.5.2
diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml
index 87ba54d63571..f813e185cbef 100644
--- a/packages/in_app_purchase/pubspec.yaml
+++ b/packages/in_app_purchase/pubspec.yaml
@@ -2,7 +2,7 @@ name: in_app_purchase
 description: A Flutter plugin for in-app purchases.
 author:  Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase
-version: 0.1.0
+version: 0.1.0+1
 
 dependencies:
   async: ^2.0.8
@@ -22,6 +22,7 @@ dev_dependencies:
   in_app_purchase_example:
     path: example/
   test: ^1.5.2
+  shared_preferences: ^0.5.2
 
 flutter:
   plugin:

From 9298f1c716aa966a1ba058f0f5e719df8c55b654 Mon Sep 17 00:00:00 2001
From: Aawaz Gyawali <awazgyawali@gmail.com>
Date: Wed, 8 May 2019 23:53:07 +0545
Subject: [PATCH 403/410] Migrated linkWithCredential function to FirebaseUser
 object instead of FirebaseAuth (#1584)

* Migrated linkWithCredential function to user object
---
 packages/firebase_auth/CHANGELOG.md           |  6 ++
 .../firebase_auth/lib/src/firebase_auth.dart  | 33 --------
 .../firebase_auth/lib/src/firebase_user.dart  | 33 ++++++++
 packages/firebase_auth/pubspec.yaml           |  2 +-
 .../test/firebase_auth_test.dart              | 81 ++++++++++++++++---
 5 files changed, 112 insertions(+), 43 deletions(-)

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
index a7ce8409a5d3..98b830419bbf 100644
--- a/packages/firebase_auth/CHANGELOG.md
+++ b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.11.0
+
+* **Breaking change**: `linkWithCredential` is now a function of `FirebaseUser`instead of
+  `FirebaseAuth`.
+* Added test for newer `linkWithCredential` function.
+
 ## 0.10.0+1
 
 * Increase Firebase/Auth CocoaPod dependency to '~> 6.0'.
diff --git a/packages/firebase_auth/lib/src/firebase_auth.dart b/packages/firebase_auth/lib/src/firebase_auth.dart
index 4b2949f280d0..403eba41499a 100644
--- a/packages/firebase_auth/lib/src/firebase_auth.dart
+++ b/packages/firebase_auth/lib/src/firebase_auth.dart
@@ -417,39 +417,6 @@ class FirebaseAuth {
     return currentUser;
   }
 
-  /// Associates a user account from a third-party identity provider with this
-  /// user and returns additional identity provider data.
-  ///
-  /// This allows the user to sign in to this account in the future with
-  /// the given account.
-  ///
-  /// Errors:
-  ///   • `ERROR_WEAK_PASSWORD` - If the password is not strong enough.
-  ///   • `ERROR_INVALID_CREDENTIAL` - If the credential is malformed or has expired.
-  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the account is already in use by a different account.
-  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
-  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
-  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has an account of this type linked.
-  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that this type of account is not enabled.
-  ///   • `ERROR_INVALID_ACTION_CODE` - If the action code in the link is malformed, expired, or has already been used.
-  ///       This can only occur when using [EmailAuthProvider.getCredentialWithLink] to obtain the credential.
-  Future<FirebaseUser> linkWithCredential(AuthCredential credential) async {
-    assert(credential != null);
-    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-    // https://github.com/flutter/flutter/issues/26431
-    // ignore: strong_mode_implicit_dynamic_method
-    final Map<dynamic, dynamic> data = await channel.invokeMethod(
-      'linkWithCredential',
-      <String, dynamic>{
-        'app': app.name,
-        'provider': credential._provider,
-        'data': credential._data,
-      },
-    );
-    final FirebaseUser currentUser = FirebaseUser._(data, app);
-    return currentUser;
-  }
-
   /// Sets the user-facing language code for auth operations that can be
   /// internationalized, such as [sendEmailVerification]. This language
   /// code should follow the conventions defined by the IETF in BCP47.
diff --git a/packages/firebase_auth/lib/src/firebase_user.dart b/packages/firebase_auth/lib/src/firebase_user.dart
index 15fa458f139f..4243ac30ed83 100644
--- a/packages/firebase_auth/lib/src/firebase_user.dart
+++ b/packages/firebase_auth/lib/src/firebase_user.dart
@@ -44,6 +44,39 @@ class FirebaseUser extends UserInfo {
     });
   }
 
+  /// Associates a user account from a third-party identity provider with this
+  /// user and returns additional identity provider data.
+  ///
+  /// This allows the user to sign in to this account in the future with
+  /// the given account.
+  ///
+  /// Errors:
+  ///   • `ERROR_WEAK_PASSWORD` - If the password is not strong enough.
+  ///   • `ERROR_INVALID_CREDENTIAL` - If the credential is malformed or has expired.
+  ///   • `ERROR_CREDENTIAL_ALREADY_IN_USE` - If the account is already in use by a different account.
+  ///   • `ERROR_USER_DISABLED` - If the user has been disabled (for example, in the Firebase console)
+  ///   • `ERROR_REQUIRES_RECENT_LOGIN` - If the user's last sign-in time does not meet the security threshold. Use reauthenticate methods to resolve.
+  ///   • `ERROR_PROVIDER_ALREADY_LINKED` - If the current user already has an account of this type linked.
+  ///   • `ERROR_OPERATION_NOT_ALLOWED` - Indicates that this type of account is not enabled.
+  ///   • `ERROR_INVALID_ACTION_CODE` - If the action code in the link is malformed, expired, or has already been used.
+  ///       This can only occur when using [EmailAuthProvider.getCredentialWithLink] to obtain the credential.
+  Future<FirebaseUser> linkWithCredential(AuthCredential credential) async {
+    assert(credential != null);
+    // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
+    // https://github.com/flutter/flutter/issues/26431
+    // ignore: strong_mode_implicit_dynamic_method
+    final Map<dynamic, dynamic> data = await FirebaseAuth.channel.invokeMethod(
+      'linkWithCredential',
+      <String, dynamic>{
+        'app': _app.name,
+        'provider': credential._provider,
+        'data': credential._data,
+      },
+    );
+    final FirebaseUser currentUser = FirebaseUser._(data, _app);
+    return currentUser;
+  }
+
   /// Initiates email verification for the user.
   Future<void> sendEmailVerification() async {
     // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
index 1635ef047005..22e7d1b62bad 100755
--- a/packages/firebase_auth/pubspec.yaml
+++ b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.10.0+1"
+version: "0.11.0"
 
 flutter:
   plugin:
diff --git a/packages/firebase_auth/test/firebase_auth_test.dart b/packages/firebase_auth/test/firebase_auth_test.dart
index 45b2a05749d9..250569e45b71 100755
--- a/packages/firebase_auth/test/firebase_auth_test.dart
+++ b/packages/firebase_auth/test/firebase_auth_test.dart
@@ -218,11 +218,18 @@ void main() {
         email: 'test@example.com',
         link: '<Url with domain from your Firebase project>',
       );
-      final FirebaseUser user = await auth.linkWithCredential(credential);
+      FirebaseUser user = await auth.currentUser();
+      user = await user.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
+          isMethodCall(
+            'currentUser',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+            },
+          ),
           isMethodCall(
             'linkWithCredential',
             arguments: <String, dynamic>{
@@ -294,11 +301,18 @@ void main() {
         authToken: kMockIdToken,
         authTokenSecret: kMockAccessToken,
       );
-      final FirebaseUser user = await auth.linkWithCredential(credential);
+      FirebaseUser user = await auth.currentUser();
+      user = await user.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
+          isMethodCall(
+            'currentUser',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+            },
+          ),
           isMethodCall(
             'linkWithCredential',
             arguments: <String, dynamic>{
@@ -343,11 +357,18 @@ void main() {
       final AuthCredential credential = GithubAuthProvider.getCredential(
         token: kMockGithubToken,
       );
-      final FirebaseUser user = await auth.linkWithCredential(credential);
+      FirebaseUser user = await auth.currentUser();
+      user = await user.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
+          isMethodCall(
+            'currentUser',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+            },
+          ),
           isMethodCall(
             'linkWithCredential',
             arguments: <String, dynamic>{
@@ -390,11 +411,18 @@ void main() {
         email: kMockEmail,
         password: kMockPassword,
       );
-      final FirebaseUser user = await auth.linkWithCredential(credential);
+      FirebaseUser user = await auth.currentUser();
+      user = await user.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
+          isMethodCall(
+            'currentUser',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+            },
+          ),
           isMethodCall(
             'linkWithCredential',
             arguments: <String, dynamic>{
@@ -602,11 +630,18 @@ void main() {
         idToken: kMockIdToken,
         accessToken: kMockAccessToken,
       );
-      final FirebaseUser user = await auth.linkWithCredential(credential);
+      FirebaseUser user = await auth.currentUser();
+      user = await user.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
+          isMethodCall(
+            'currentUser',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+            },
+          ),
           isMethodCall(
             'linkWithCredential',
             arguments: <String, dynamic>{
@@ -626,11 +661,18 @@ void main() {
       final AuthCredential credential = FacebookAuthProvider.getCredential(
         accessToken: kMockAccessToken,
       );
-      final FirebaseUser user = await auth.linkWithCredential(credential);
+      FirebaseUser user = await auth.currentUser();
+      user = await user.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
+          isMethodCall(
+            'currentUser',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+            },
+          ),
           isMethodCall(
             'linkWithCredential',
             arguments: <String, dynamic>{
@@ -673,11 +715,18 @@ void main() {
         authToken: kMockAuthToken,
         authTokenSecret: kMockAuthTokenSecret,
       );
-      final FirebaseUser user = await auth.linkWithCredential(credential);
+      FirebaseUser user = await auth.currentUser();
+      user = await user.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
+          isMethodCall(
+            'currentUser',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+            },
+          ),
           isMethodCall(
             'linkWithCredential',
             arguments: <String, dynamic>{
@@ -722,11 +771,18 @@ void main() {
       final AuthCredential credential = GithubAuthProvider.getCredential(
         token: kMockGithubToken,
       );
-      final FirebaseUser user = await auth.linkWithCredential(credential);
+      FirebaseUser user = await auth.currentUser();
+      user = await user.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
+          isMethodCall(
+            'currentUser',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+            },
+          ),
           isMethodCall(
             'linkWithCredential',
             arguments: <String, dynamic>{
@@ -769,11 +825,18 @@ void main() {
         email: kMockEmail,
         password: kMockPassword,
       );
-      final FirebaseUser user = await auth.linkWithCredential(credential);
+      FirebaseUser user = await auth.currentUser();
+      user = await user.linkWithCredential(credential);
       verifyUser(user);
       expect(
         log,
         <Matcher>[
+          isMethodCall(
+            'currentUser',
+            arguments: <String, dynamic>{
+              'app': auth.app.name,
+            },
+          ),
           isMethodCall(
             'linkWithCredential',
             arguments: <String, dynamic>{

From a7c074c193e430cf7894509e65d7b60acc8d03ac Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 8 May 2019 16:09:01 -0700
Subject: [PATCH 404/410] [path_provider] add getApplicationSupportDirectory
 (#1566)

* Add support for getApplicationLibraryDirectory
---
 packages/path_provider/CHANGELOG.md           | 10 ++++
 packages/path_provider/example/lib/main.dart  | 22 +++++++
 .../example/test_driver/path_provider.dart    | 15 +++++
 .../ios/Classes/PathProviderPlugin.m          | 26 +++++++++
 packages/path_provider/lib/path_provider.dart | 57 ++++++++++++-------
 packages/path_provider/pubspec.yaml           |  2 +-
 6 files changed, 111 insertions(+), 21 deletions(-)

diff --git a/packages/path_provider/CHANGELOG.md b/packages/path_provider/CHANGELOG.md
index c4c8e763f90d..3314f3872d35 100644
--- a/packages/path_provider/CHANGELOG.md
+++ b/packages/path_provider/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.1.0
+
+* Added `getApplicationSupportDirectory`.
+* Updated documentation for `getApplicationDocumentsDirectory` to suggest
+  using `getApplicationSupportDirectory` on iOS and
+  `getExternalStorageDirectory` on Android.
+* Updated documentation for `getTemporaryDirectory` to suggest using it
+  for caches of files that do not need to be backed up.
+* Updated integration tests and example to reflect the above changes.
+
 ## 1.0.0
 
 * Added integration tests.
diff --git a/packages/path_provider/example/lib/main.dart b/packages/path_provider/example/lib/main.dart
index 9311896128ba..db32f7b68e3a 100644
--- a/packages/path_provider/example/lib/main.dart
+++ b/packages/path_provider/example/lib/main.dart
@@ -35,6 +35,7 @@ class MyHomePage extends StatefulWidget {
 
 class _MyHomePageState extends State<MyHomePage> {
   Future<Directory> _tempDirectory;
+  Future<Directory> _appSupportDirectory;
   Future<Directory> _appDocumentsDirectory;
   Future<Directory> _externalDocumentsDirectory;
 
@@ -65,6 +66,12 @@ class _MyHomePageState extends State<MyHomePage> {
     });
   }
 
+  void _requestAppSupportDirectory() {
+    setState(() {
+      _appSupportDirectory = getApplicationSupportDirectory();
+    });
+  }
+
   void _requestExternalStorageDirectory() {
     setState(() {
       _externalDocumentsDirectory = getExternalStorageDirectory();
@@ -111,6 +118,21 @@ class _MyHomePageState extends State<MyHomePage> {
               child: FutureBuilder<Directory>(
                   future: _appDocumentsDirectory, builder: _buildDirectory),
             ),
+            Column(
+              children: <Widget>[
+                Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: RaisedButton(
+                    child: const Text('Get Application Support Directory'),
+                    onPressed: _requestAppSupportDirectory,
+                  ),
+                ),
+              ],
+            ),
+            Expanded(
+              child: FutureBuilder<Directory>(
+                  future: _appSupportDirectory, builder: _buildDirectory),
+            ),
             Column(children: <Widget>[
               Padding(
                 padding: const EdgeInsets.all(16.0),
diff --git a/packages/path_provider/example/test_driver/path_provider.dart b/packages/path_provider/example/test_driver/path_provider.dart
index c0c623747d17..2f225a7034d8 100644
--- a/packages/path_provider/example/test_driver/path_provider.dart
+++ b/packages/path_provider/example/test_driver/path_provider.dart
@@ -35,6 +35,21 @@ void main() {
     file.deleteSync();
   });
 
+  test('getApplicationSupportDirectory', () async {
+    if (Platform.isIOS) {
+      final Directory result = await getApplicationSupportDirectory();
+      final String uuid = Uuid().v1();
+      final File file = File('${result.path}/$uuid.txt');
+      file.writeAsStringSync('Hello world!');
+      expect(file.readAsStringSync(), 'Hello world!');
+      expect(result.listSync(), isNotEmpty);
+      file.deleteSync();
+    } else if (Platform.isAndroid) {
+      final Future<Directory> result = getApplicationSupportDirectory();
+      expect(result, throwsA(isInstanceOf<UnsupportedError>()));
+    }
+  });
+
   test('getExternalStorageDirectory', () async {
     if (Platform.isIOS) {
       final Future<Directory> result = getExternalStorageDirectory();
diff --git a/packages/path_provider/ios/Classes/PathProviderPlugin.m b/packages/path_provider/ios/Classes/PathProviderPlugin.m
index 3e82e081bf6d..d81d6c676deb 100644
--- a/packages/path_provider/ios/Classes/PathProviderPlugin.m
+++ b/packages/path_provider/ios/Classes/PathProviderPlugin.m
@@ -9,6 +9,13 @@
   return paths.firstObject;
 }
 
+static FlutterError* getFlutterError(NSError* error) {
+  if (error == nil) return nil;
+  return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %ld", error.code]
+                             message:error.domain
+                             details:error.localizedDescription];
+}
+
 @implementation FLTPathProviderPlugin
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
@@ -20,6 +27,21 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
       result([self getTemporaryDirectory]);
     } else if ([@"getApplicationDocumentsDirectory" isEqualToString:call.method]) {
       result([self getApplicationDocumentsDirectory]);
+    } else if ([@"getApplicationSupportDirectory" isEqualToString:call.method]) {
+      NSString* path = [self getApplicationSupportDirectory];
+
+      // Create the path if it doesn't exist
+      NSError* error;
+      NSFileManager* fileManager = [NSFileManager defaultManager];
+      BOOL success = [fileManager createDirectoryAtPath:path
+                            withIntermediateDirectories:YES
+                                             attributes:nil
+                                                  error:&error];
+      if (!success) {
+        result(getFlutterError(error));
+      } else {
+        result(path);
+      }
     } else {
       result(FlutterMethodNotImplemented);
     }
@@ -34,4 +56,8 @@ + (NSString*)getApplicationDocumentsDirectory {
   return GetDirectoryOfType(NSDocumentDirectory);
 }
 
++ (NSString*)getApplicationSupportDirectory {
+  return GetDirectoryOfType(NSApplicationSupportDirectory);
+}
+
 @end
diff --git a/packages/path_provider/lib/path_provider.dart b/packages/path_provider/lib/path_provider.dart
index 1875f7436d8b..08e35d68dd63 100644
--- a/packages/path_provider/lib/path_provider.dart
+++ b/packages/path_provider/lib/path_provider.dart
@@ -10,7 +10,8 @@ import 'package:flutter/services.dart';
 const MethodChannel _channel =
     MethodChannel('plugins.flutter.io/path_provider');
 
-/// Path to the temporary directory on the device.
+/// Path to the temporary directory on the device that is not backed up and is
+/// suitable for storing caches of downloaded files.
 ///
 /// Files in this directory may be cleared at any time. This does *not* return
 /// a new temporary directory. Instead, the caller is responsible for creating
@@ -21,29 +22,47 @@ const MethodChannel _channel =
 ///
 /// On Android, this uses the `getCacheDir` API on the context.
 Future<Directory> getTemporaryDirectory() async {
-  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-  // https://github.com/flutter/flutter/issues/26431
-  // ignore: strong_mode_implicit_dynamic_method
-  final String path = await _channel.invokeMethod('getTemporaryDirectory');
+  final String path =
+      await _channel.invokeMethod<String>('getTemporaryDirectory');
+  if (path == null) {
+    return null;
+  }
+  return Directory(path);
+}
+
+/// Path to a directory where the application may place application support
+/// files.
+///
+/// Use this for files you don’t want exposed to the user. Your app should not
+/// use this directory for user data files.
+///
+/// On iOS, this uses the `NSApplicationSupportDirectory` API.
+/// If this directory does not exist, it is created automatically.
+///
+/// On Android, this function throws an [UnsupportedError].
+Future<Directory> getApplicationSupportDirectory() async {
+  if (!Platform.isIOS)
+    throw UnsupportedError("getApplicationSupportDirectory requires iOS");
+  final String path =
+      await _channel.invokeMethod<String>('getApplicationSupportDirectory');
   if (path == null) {
     return null;
   }
   return Directory(path);
 }
 
-/// Path to a directory where the application may place files that are private
-/// to the application and will only be cleared when the application itself
-/// is deleted.
+/// Path to a directory where the application may place data that is
+/// user-generated, or that cannot otherwise be recreated by your application.
 ///
-/// On iOS, this uses the `NSDocumentsDirectory` API.
+/// On iOS, this uses the `NSDocumentDirectory` API. Consider using
+/// [getApplicationSupportDirectory] instead if the data is not user-generated.
 ///
-/// On Android, this returns the AppData directory.
+/// On Android, this uses the `getDataDirectory` API on the context. Consider
+/// using getExternalStorageDirectory instead if data is intended to be visible
+/// to the user.
 Future<Directory> getApplicationDocumentsDirectory() async {
   final String path =
-      // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-      // https://github.com/flutter/flutter/issues/26431
-      // ignore: strong_mode_implicit_dynamic_method
-      await _channel.invokeMethod('getApplicationDocumentsDirectory');
+      await _channel.invokeMethod<String>('getApplicationDocumentsDirectory');
   if (path == null) {
     return null;
   }
@@ -54,17 +73,15 @@ Future<Directory> getApplicationDocumentsDirectory() async {
 /// The current operating system should be determined before issuing this
 /// function call, as this functionality is only available on Android.
 ///
-/// On iOS, this function throws an UnsupportedError as it is not possible
+/// On iOS, this function throws an [UnsupportedError] as it is not possible
 /// to access outside the app's sandbox.
 ///
-/// On Android this returns getExternalStorageDirectory.
+/// On Android this uses the `getExternalStorageDirectory` API.
 Future<Directory> getExternalStorageDirectory() async {
   if (Platform.isIOS)
     throw UnsupportedError("Functionality not available on iOS");
-  // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
-  // https://github.com/flutter/flutter/issues/26431
-  // ignore: strong_mode_implicit_dynamic_method
-  final String path = await _channel.invokeMethod('getStorageDirectory');
+  final String path =
+      await _channel.invokeMethod<String>('getStorageDirectory');
   if (path == null) {
     return null;
   }
diff --git a/packages/path_provider/pubspec.yaml b/packages/path_provider/pubspec.yaml
index 9913857e150f..73b061924df3 100644
--- a/packages/path_provider/pubspec.yaml
+++ b/packages/path_provider/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for getting commonly used locations on the Android &
   iOS file systems, such as the temp and app data directories.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider
-version: 1.0.0
+version: 1.1.0
 
 flutter:
   plugin:

From c1530334f9c8aec9d7a63f86dd824eeaa37d7523 Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Thu, 9 May 2019 13:01:21 -0700
Subject: [PATCH 405/410] Return image picker method call results on the
 platform thread (#1585)

The MediaScanConnection.scanFile callback is invoked on a background thread.
However, MethodChannel results must be provided on the platform thread.

Fixes https://github.com/flutter/flutter/issues/32315
---
 packages/image_picker/CHANGELOG.md            |  4 ++
 .../imagepicker/ImagePickerPlugin.java        | 52 ++++++++++++++++++-
 .../imagepicker/ImagePickerPluginTest.java    |  6 ++-
 packages/image_picker/pubspec.yaml            |  2 +-
 4 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
index 540898de1e1a..6145a2946d38 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.0+3
+
+* Android: fixed assertion failures due to reply messages that were sent on the wrong thread.
+
 ## 0.6.0+2
 
 * Android: images are saved with their real extension instead of always using `.jpg`.
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
index dbcdf2d6f2eb..371a258966c0 100644
--- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
+++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
@@ -8,6 +8,8 @@
 import android.app.Application;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
 import androidx.annotation.VisibleForTesting;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
@@ -94,12 +96,58 @@ public void onActivityStopped(Activity activity) {}
     }
   }
 
+  // MethodChannel.Result wrapper that responds on the platform thread.
+  private static class MethodResultWrapper implements MethodChannel.Result {
+    private MethodChannel.Result methodResult;
+    private Handler handler;
+
+    MethodResultWrapper(MethodChannel.Result result) {
+      methodResult = result;
+      handler = new Handler(Looper.getMainLooper());
+    }
+
+    @Override
+    public void success(final Object result) {
+      handler.post(
+          new Runnable() {
+            @Override
+            public void run() {
+              methodResult.success(result);
+            }
+          });
+    }
+
+    @Override
+    public void error(
+        final String errorCode, final String errorMessage, final Object errorDetails) {
+      handler.post(
+          new Runnable() {
+            @Override
+            public void run() {
+              methodResult.error(errorCode, errorMessage, errorDetails);
+            }
+          });
+    }
+
+    @Override
+    public void notImplemented() {
+      handler.post(
+          new Runnable() {
+            @Override
+            public void run() {
+              methodResult.notImplemented();
+            }
+          });
+    }
+  }
+
   @Override
-  public void onMethodCall(MethodCall call, MethodChannel.Result result) {
+  public void onMethodCall(MethodCall call, MethodChannel.Result rawResult) {
     if (registrar.activity() == null) {
-      result.error("no_activity", "image_picker plugin requires a foreground activity.", null);
+      rawResult.error("no_activity", "image_picker plugin requires a foreground activity.", null);
       return;
     }
+    MethodChannel.Result result = new MethodResultWrapper(rawResult);
     int imageSource;
     switch (call.method) {
       case METHOD_CALL_IMAGE:
diff --git a/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java b/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
index 23c888643c63..efb9b4526f9e 100644
--- a/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
+++ b/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
@@ -1,6 +1,8 @@
 package io.flutter.plugins.imagepicker;
 
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
@@ -81,7 +83,7 @@ public void onMethodCall_WhenSourceIsGallery_InvokesChooseImageFromGallery() {
 
     plugin.onMethodCall(call, mockResult);
 
-    verify(mockImagePickerDelegate).chooseImageFromGallery(call, mockResult);
+    verify(mockImagePickerDelegate).chooseImageFromGallery(eq(call), any());
     verifyZeroInteractions(mockResult);
   }
 
@@ -92,7 +94,7 @@ public void onMethodCall_WhenSourceIsCamera_InvokesTakeImageWithCamera() {
 
     plugin.onMethodCall(call, mockResult);
 
-    verify(mockImagePickerDelegate).takeImageWithCamera(call, mockResult);
+    verify(mockImagePickerDelegate).takeImageWithCamera(eq(call), any());
     verifyZeroInteractions(mockResult);
   }
 
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
index 586d8ae3a45a..5115bb9f0c07 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/pubspec.yaml
@@ -5,7 +5,7 @@ authors:
   - Flutter Team <flutter-dev@googlegroups.com>
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.6.0+2
+version: 0.6.0+3
 
 flutter:
   plugin:

From a487c38cd04e59be5767c3f4422b4720b35bcebd Mon Sep 17 00:00:00 2001
From: Eddie Tribaldos <EdDT.phi@gmail.com>
Date: Thu, 9 May 2019 17:15:17 -0700
Subject: [PATCH 406/410] [firebase_remote_config)Remove unused property
 "channel" (#1078)

* Remove unused property "channel"
---
 packages/firebase_remote_config/CHANGELOG.md               | 4 ++++
 .../firebaseremoteconfig/FirebaseRemoteConfigPlugin.java   | 7 +------
 packages/firebase_remote_config/pubspec.yaml               | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/firebase_remote_config/CHANGELOG.md b/packages/firebase_remote_config/CHANGELOG.md
index 4ffa31d70c45..288955a501f3 100644
--- a/packages/firebase_remote_config/CHANGELOG.md
+++ b/packages/firebase_remote_config/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0+1
+
+* Minor internal code cleanup in Java implementation.
+
 ## 0.2.0
 
 * Update Android dependencies to latest.
diff --git a/packages/firebase_remote_config/android/src/main/java/io/flutter/plugins/firebase/firebaseremoteconfig/FirebaseRemoteConfigPlugin.java b/packages/firebase_remote_config/android/src/main/java/io/flutter/plugins/firebase/firebaseremoteconfig/FirebaseRemoteConfigPlugin.java
index a480322b6b5d..d95d70e25916 100644
--- a/packages/firebase_remote_config/android/src/main/java/io/flutter/plugins/firebase/firebaseremoteconfig/FirebaseRemoteConfigPlugin.java
+++ b/packages/firebase_remote_config/android/src/main/java/io/flutter/plugins/firebase/firebaseremoteconfig/FirebaseRemoteConfigPlugin.java
@@ -29,19 +29,14 @@ public class FirebaseRemoteConfigPlugin implements MethodCallHandler {
   public static final String DEFAULT_PREF_KEY = "default_keys";
 
   private static SharedPreferences sharedPreferences;
-  private final MethodChannel channel;
 
   public static void registerWith(Registrar registrar) {
     final MethodChannel channel =
         new MethodChannel(registrar.messenger(), "plugins.flutter.io/firebase_remote_config");
-    channel.setMethodCallHandler(new FirebaseRemoteConfigPlugin(channel));
+    channel.setMethodCallHandler(new FirebaseRemoteConfigPlugin());
     sharedPreferences = registrar.context().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
   }
 
-  private FirebaseRemoteConfigPlugin(MethodChannel channel) {
-    this.channel = channel;
-  }
-
   @Override
   public void onMethodCall(MethodCall call, final Result result) {
     switch (call.method) {
diff --git a/packages/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/pubspec.yaml
index e74cb80ca107..702a0dd695e6 100644
--- a/packages/firebase_remote_config/pubspec.yaml
+++ b/packages/firebase_remote_config/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Remote Config. Update your application
   re-releasing.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_remote_config
-version: 0.2.0
+version: 0.2.0+1
 
 dependencies:
   flutter:

From 5f50d6dd1f766f5018cfb50cfda5d2dd3250a1db Mon Sep 17 00:00:00 2001
From: Jaumard <jimmy.aumard@gmail.com>
Date: Fri, 10 May 2019 02:36:52 +0200
Subject: [PATCH 407/410] [Firebase messaging] iOS direct data messages (#1318)

* ios direct data messages to fix https://github.com/flutter/flutter/issues/25650
---
 packages/firebase_messaging/CHANGELOG.md                    | 4 ++++
 .../ios/Classes/FirebaseMessagingPlugin.m                   | 6 ++++++
 packages/firebase_messaging/pubspec.yaml                    | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
index a4a9f31ed657..9eefb0c3f084 100644
--- a/packages/firebase_messaging/CHANGELOG.md
+++ b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.0.1+1
+
+* Enable support for `onMessage` on iOS using `shouldEstablishDirectChannel`.
+
 ## 5.0.1
 
 * Fix error in the logs on startup if unable to retrieve token on startup on Android.
diff --git a/packages/firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m b/packages/firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m
index 2607e3e64990..549cfcbfe5f6 100644
--- a/packages/firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m
+++ b/packages/firebase_messaging/ios/Classes/FirebaseMessagingPlugin.m
@@ -63,6 +63,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
 
     result(nil);
   } else if ([@"configure" isEqualToString:method]) {
+    [FIRMessaging messaging].shouldEstablishDirectChannel = true;
     [[UIApplication sharedApplication] registerForRemoteNotifications];
     if (_launchNotification != nil) {
       [_channel invokeMethod:@"onLaunch" arguments:_launchNotification];
@@ -191,4 +192,9 @@ - (void)messaging:(nonnull FIRMessaging *)messaging
   [_channel invokeMethod:@"onToken" arguments:fcmToken];
 }
 
+- (void)messaging:(FIRMessaging *)messaging
+    didReceiveMessage:(FIRMessagingRemoteMessage *)remoteMessage {
+  [_channel invokeMethod:@"onMessage" arguments:remoteMessage.appData];
+}
+
 @end
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
index 15cd60a2dd0d..4f917eccf25e 100644
--- a/packages/firebase_messaging/pubspec.yaml
+++ b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 5.0.1
+version: 5.0.1+1
 
 flutter:
   plugin:

From 281b342ec17d4031e0a18131abe63e29c2ebdf8a Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Fri, 10 May 2019 10:10:08 -0700
Subject: [PATCH 408/410] [in_app_purchase] Fix issue with empty purchase
 updates (#1589)

Previously the code was failing to propagate errors from BillingClient
if there were no actual purchases to attach them to.

Also updates the error code. This situation can arise in more situations
than just restoring purchases.
---
 packages/in_app_purchase/CHANGELOG.md         |  5 +++
 .../google_play_connection.dart               | 16 +++++++-
 packages/in_app_purchase/pubspec.yaml         |  2 +-
 .../google_play_connection_test.dart          | 38 +++++++++++++++++++
 4 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md
index 1bd95b9123c3..a5e9cce734c1 100644
--- a/packages/in_app_purchase/CHANGELOG.md
+++ b/packages/in_app_purchase/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.0+2
+
+* Fix bug where error only purchases updates weren't propagated correctly in
+  `google_play_connection.dart`.
+
 ## 0.1.0+1
 
 Add more consumable handling to the example app.
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
index 5f39dedcef22..5a0cbaf31c82 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
@@ -183,7 +183,7 @@ class GooglePlayConnection
     } else {
       error = PurchaseError(
         source: PurchaseSource.GooglePlay,
-        code: kRestoredPurchaseErrorCode,
+        code: kPurchaseErrorCode,
         message: {'message': resultWrapper.responseCode.toString()},
       );
       status = PurchaseStatus.error;
@@ -194,7 +194,19 @@ class GooglePlayConnection
         ..status = status
         ..error = error);
     }).toList();
-    return Future.wait(purchases);
+    if (!purchases.isEmpty) {
+      return Future.wait(purchases);
+    } else {
+      return [
+        PurchaseDetails(
+            purchaseID: null,
+            productID: null,
+            transactionDate: null,
+            verificationData: null)
+          ..status = PurchaseStatus.error
+          ..error = error
+      ];
+    }
   }
 
   static Future<PurchaseDetails> _maybeAutoConsumePurchase(
diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml
index f813e185cbef..0e8ee7f6c4c8 100644
--- a/packages/in_app_purchase/pubspec.yaml
+++ b/packages/in_app_purchase/pubspec.yaml
@@ -2,7 +2,7 @@ name: in_app_purchase
 description: A Flutter plugin for in-app purchases.
 author:  Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase
-version: 0.1.0+1
+version: 0.1.0+2
 
 dependencies:
   async: ^2.0.8
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index 9d1313287903..e3ab16c6931b 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -212,6 +212,44 @@ void main() {
       expect(result.productID, dummySkuDetails.sku);
     });
 
+    test('handles an error with an empty purchases list', () async {
+      final SkuDetailsWrapper skuDetails = dummySkuDetails;
+      final String accountId = "hashedAccountId";
+      final BillingResponse sentCode = BillingResponse.error;
+      stubPlatform.addResponse(
+          name: launchMethodName,
+          value: BillingResponseConverter().toJson(sentCode),
+          additionalStepBeforeReturn: (_) {
+            // Mock java update purchase callback.
+            MethodCall call = MethodCall(kOnPurchasesUpdated, {
+              'responseCode': BillingResponseConverter().toJson(sentCode),
+              'purchasesList': []
+            });
+            connection.billingClient.callHandler(call);
+          });
+      Completer completer = Completer();
+      PurchaseDetails purchaseDetails;
+      Stream purchaseStream =
+          GooglePlayConnection.instance.purchaseUpdatedStream;
+      StreamSubscription subscription;
+      subscription = purchaseStream.listen((_) {
+        purchaseDetails = _.first;
+        completer.complete(purchaseDetails);
+        subscription.cancel();
+      }, onDone: () {});
+      final PurchaseParam purchaseParam = PurchaseParam(
+          productDetails: skuDetails.toProductDetails(),
+          applicationUserName: accountId);
+      await GooglePlayConnection.instance
+          .buyNonConsumable(purchaseParam: purchaseParam);
+      PurchaseDetails result = await completer.future;
+
+      expect(result.error, isNotNull);
+      expect(result.error.source, PurchaseSource.GooglePlay);
+      expect(result.status, PurchaseStatus.error);
+      expect(result.purchaseID, isNull);
+    });
+
     test('buy consumable with auto consume, serializes and deserializes data',
         () async {
       final SkuDetailsWrapper skuDetails = dummySkuDetails;

From 0ce7b25b4d45cef3f75991e188189302c9438099 Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Fri, 10 May 2019 13:26:58 -0700
Subject: [PATCH 409/410] [in_app_purchase] Guard against dupe
 onBillingSetupFinished calls (#1588)

Theoretically this API should only be called once, but there's an open
issue that suggests that in some cases this is being triggered multiple
times. Check for multiple calls and bail instead of sending multiple
replies.
---
 packages/in_app_purchase/CHANGELOG.md         |  4 ++++
 .../inapppurchase/InAppPurchasePlugin.java    |  9 +++++++++
 .../example/android/app/build.gradle          |  4 ++++
 .../InAppPurchasePluginTest.java              | 19 +++++++++++++++++++
 packages/in_app_purchase/pubspec.yaml         |  2 +-
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md
index a5e9cce734c1..bb86ae5fbfb5 100644
--- a/packages/in_app_purchase/CHANGELOG.md
+++ b/packages/in_app_purchase/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0+3
+
+* Guard against multiple onSetupFinished() calls.
+
 ## 0.1.0+2
 
 * Fix bug where error only purchases updates weren't propagated correctly in
diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
index 12792af4507e..16ab5916c908 100644
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
@@ -10,6 +10,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.util.Log;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.android.billingclient.api.BillingClient;
@@ -34,6 +35,7 @@
 
 /** Wraps a {@link BillingClient} instance and responds to Dart calls for it. */
 public class InAppPurchasePlugin implements MethodCallHandler {
+  private static final String TAG = "InAppPurchasePlugin";
   private @Nullable BillingClient billingClient;
   private final Activity activity;
   private final Context context;
@@ -126,8 +128,15 @@ private void startConnection(final int handle, final Result result) {
 
     billingClient.startConnection(
         new BillingClientStateListener() {
+          private boolean alreadyFinished = false;
+
           @Override
           public void onBillingSetupFinished(int responseCode) {
+            if (alreadyFinished) {
+              Log.d(TAG, "Tried to call onBilllingSetupFinished multiple times.");
+              return;
+            }
+            alreadyFinished = true;
             // Consider the fact that we've finished a success, leave it to the Dart side to validate the responseCode.
             result.success(responseCode);
           }
diff --git a/packages/in_app_purchase/example/android/app/build.gradle b/packages/in_app_purchase/example/android/app/build.gradle
index 57541c5237ad..a383eb4a965b 100644
--- a/packages/in_app_purchase/example/android/app/build.gradle
+++ b/packages/in_app_purchase/example/android/app/build.gradle
@@ -95,6 +95,10 @@ android {
             }
         }
     }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
 }
 
 flutter {
diff --git a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
index d3491e46a5e1..4792505b4476 100644
--- a/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
+++ b/packages/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
@@ -118,6 +118,25 @@ public void startConnection() {
     verify(result, times(1)).success(100);
   }
 
+  @Test
+  public void startConnection_multipleCalls() {
+    Map<String, Integer> arguments = new HashMap<>();
+    arguments.put("handle", 1);
+    MethodCall call = new MethodCall(START_CONNECTION, arguments);
+    ArgumentCaptor<BillingClientStateListener> captor =
+        ArgumentCaptor.forClass(BillingClientStateListener.class);
+    doNothing().when(mockBillingClient).startConnection(captor.capture());
+
+    plugin.onMethodCall(call, result);
+    verify(result, never()).success(any());
+    captor.getValue().onBillingSetupFinished(100);
+    captor.getValue().onBillingSetupFinished(200);
+    captor.getValue().onBillingSetupFinished(300);
+
+    verify(result, times(1)).success(100);
+    verify(result, times(1)).success(any());
+  }
+
   @Test
   public void endConnection() {
     // Set up a connected BillingClient instance
diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml
index 0e8ee7f6c4c8..9b0fe1f759b7 100644
--- a/packages/in_app_purchase/pubspec.yaml
+++ b/packages/in_app_purchase/pubspec.yaml
@@ -2,7 +2,7 @@ name: in_app_purchase
 description: A Flutter plugin for in-app purchases.
 author:  Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase
-version: 0.1.0+2
+version: 0.1.0+3
 
 dependencies:
   async: ^2.0.8

From 5fc45ba83f069be8e55b3b22c4e53ad70ea8881d Mon Sep 17 00:00:00 2001
From: Michael Klimushyn <mklim@google.com>
Date: Fri, 10 May 2019 16:30:38 -0700
Subject: [PATCH 410/410] [in_app_purchase] Propagate launchBillingFlow
 failures (#1590)

Previously the buy methods were just returning `void`, so the immediate
response of `BillingClient#launchBillingFlow` was unaccessible. Change
it to return a `Future<bool>` and return whether or not the launch flow
succeeded in google_play_connection. Always return true in
app_store_connection since there's no equivalent status there.
---
 packages/in_app_purchase/CHANGELOG.md         |  5 +++
 .../in_app_purchase/app_store_connection.dart |  9 ++--
 .../google_play_connection.dart               |  9 ++--
 .../in_app_purchase_connection.dart           | 43 +++++++++++--------
 packages/in_app_purchase/pubspec.yaml         |  2 +-
 .../google_play_connection_test.dart          | 37 +++++++++++++++-
 6 files changed, 76 insertions(+), 29 deletions(-)

diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md
index bb86ae5fbfb5..00d432c3e962 100644
--- a/packages/in_app_purchase/CHANGELOG.md
+++ b/packages/in_app_purchase/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.0+4
+
+* Change the `buy` methods to return `Future<bool>` instead of `void` in order
+  to propagate `launchBillingFlow` failures up through `google_play_connection`.
+
 ## 0.1.0+3
 
 * Guard against multiple onSetupFinished() calls.
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase/app_store_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase/app_store_connection.dart
index 02a409012fdb..d38b1c2dc6e4 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase/app_store_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase/app_store_connection.dart
@@ -44,20 +44,21 @@ class AppStoreConnection implements InAppPurchaseConnection {
   Future<bool> isAvailable() => SKPaymentQueueWrapper.canMakePayments();
 
   @override
-  void buyNonConsumable({@required PurchaseParam purchaseParam}) {
-    _skPaymentQueueWrapper.addPayment(SKPaymentWrapper(
+  Future<bool> buyNonConsumable({@required PurchaseParam purchaseParam}) async {
+    await _skPaymentQueueWrapper.addPayment(SKPaymentWrapper(
         productIdentifier: purchaseParam.productDetails.id,
         quantity: 1,
         applicationUsername: purchaseParam.applicationUserName,
         simulatesAskToBuyInSandbox: purchaseParam.sandboxTesting,
         requestData: null));
+    return true; // There's no error feedback from iOS here to return.
   }
 
   @override
-  void buyConsumable(
+  Future<bool> buyConsumable(
       {@required PurchaseParam purchaseParam, bool autoConsume = true}) {
     assert(autoConsume == true, 'On iOS, we should always auto consume');
-    buyNonConsumable(purchaseParam: purchaseParam);
+    return buyNonConsumable(purchaseParam: purchaseParam);
   }
 
   @override
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
index 5a0cbaf31c82..11013f104ad3 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase/google_play_connection.dart
@@ -48,19 +48,20 @@ class GooglePlayConnection
   }
 
   @override
-  void buyNonConsumable({@required PurchaseParam purchaseParam}) {
-    billingClient.launchBillingFlow(
+  Future<bool> buyNonConsumable({@required PurchaseParam purchaseParam}) async {
+    BillingResponse response = await billingClient.launchBillingFlow(
         sku: purchaseParam.productDetails.id,
         accountId: purchaseParam.applicationUserName);
+    return response == BillingResponse.ok;
   }
 
   @override
-  void buyConsumable(
+  Future<bool> buyConsumable(
       {@required PurchaseParam purchaseParam, bool autoConsume = true}) {
     if (autoConsume) {
       _productIdsToConsume.add(purchaseParam.productDetails.id);
     }
-    buyNonConsumable(purchaseParam: purchaseParam);
+    return buyNonConsumable(purchaseParam: purchaseParam);
   }
 
   @override
diff --git a/packages/in_app_purchase/lib/src/in_app_purchase/in_app_purchase_connection.dart b/packages/in_app_purchase/lib/src/in_app_purchase/in_app_purchase_connection.dart
index c9a29bc01986..00954aed7ad0 100644
--- a/packages/in_app_purchase/lib/src/in_app_purchase/in_app_purchase_connection.dart
+++ b/packages/in_app_purchase/lib/src/in_app_purchase/in_app_purchase_connection.dart
@@ -81,14 +81,18 @@ abstract class InAppPurchaseConnection {
   /// You always need to restore all the non consumable products for user when
   /// they switch their phones.
   ///
-  /// This method does not return anything. Instead, after triggering this
-  /// method, purchase updates will be sent to [purchaseUpdatedStream]. You
-  /// should [Stream.listen] to [purchaseUpdatedStream] to get [PurchaseDetails]
-  /// objects in different [PurchaseDetails.status] and update your UI
-  /// accordingly. When the [PurchaseDetails.status] is
-  /// [PurchaseStatus.purchased] or [PurchaseStatus.error], you should deliver
-  /// the content or handle the error. On iOS, you also need to call
-  /// [completePurchase] to finish the purchasing process.
+  /// This method does not return the result of the purchase. Instead, after
+  /// triggering this method, purchase updates will be sent to
+  /// [purchaseUpdatedStream]. You should [Stream.listen] to
+  /// [purchaseUpdatedStream] to get [PurchaseDetails] objects in different
+  /// [PurchaseDetails.status] and update your UI accordingly. When the
+  /// [PurchaseDetails.status] is [PurchaseStatus.purchased] or
+  /// [PurchaseStatus.error], you should deliver the content or handle the
+  /// error. On iOS, you also need to call [completePurchase] to finish the
+  /// purchasing process.
+  ///
+  /// This method does return whether or not the purchase request was initially
+  /// sent succesfully.
   ///
   /// Consumable items are defined differently by the different underlying
   /// payment platforms, and there's no way to query for whether or not the
@@ -109,7 +113,7 @@ abstract class InAppPurchaseConnection {
   ///  * [queryPastPurchases], for restoring non consumable products.
   ///
   /// Calling this method for consumable items will cause unwanted behaviors!
-  void buyNonConsumable({@required PurchaseParam purchaseParam});
+  Future<bool> buyNonConsumable({@required PurchaseParam purchaseParam});
 
   /// Buy a consumable product.
   ///
@@ -140,14 +144,17 @@ abstract class InAppPurchaseConnection {
   /// will cause user never be able to buy the same item again. Manually setting
   /// this to `false` on iOS will throw an `Exception`.
   ///
-  /// This method does not return anything. Instead, after triggering this
-  /// method, purchase updates will be sent to [purchaseUpdatedStream]. You
-  /// should [Stream.listen] to [purchaseUpdatedStream] to get [PurchaseDetails]
-  /// objects in different [PurchaseDetails.status] and update your UI
-  /// accordingly. When the [PurchaseDetails.status] is
-  /// [PurchaseStatus.purchased] or [PurchaseStatus.error], you should deliver
-  /// the content or handle the error, then call [completePurchase] to finish
-  /// the purchasing process.
+  /// This method does not return the result of the purchase. Instead, after
+  /// triggering this method, purchase updates will be sent to
+  /// [purchaseUpdatedStream]. You should [Stream.listen] to
+  /// [purchaseUpdatedStream] to get [PurchaseDetails] objects in different
+  /// [PurchaseDetails.status] and update your UI accordingly. When the
+  /// [PurchaseDetails.status] is [PurchaseStatus.purchased] or
+  /// [PurchaseStatus.error], you should deliver the content or handle the
+  /// error, then call [completePurchase] to finish the purchasing process.
+  ///
+  /// This method does return whether or not the purchase request was initially
+  /// sent succesfully.
   ///
   /// See also:
   ///
@@ -158,7 +165,7 @@ abstract class InAppPurchaseConnection {
   ///
   /// Calling this method for non consumable items will cause unwanted
   /// behaviors!
-  void buyConsumable(
+  Future<bool> buyConsumable(
       {@required PurchaseParam purchaseParam, bool autoConsume = true});
 
   /// (App Store only) Mark that purchased content has been delivered to the
diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml
index 9b0fe1f759b7..d79c3d8eb76c 100644
--- a/packages/in_app_purchase/pubspec.yaml
+++ b/packages/in_app_purchase/pubspec.yaml
@@ -2,7 +2,7 @@ name: in_app_purchase
 description: A Flutter plugin for in-app purchases.
 author:  Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase
-version: 0.1.0+3
+version: 0.1.0+4
 
 dependencies:
   async: ^2.0.8
diff --git a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
index e3ab16c6931b..7b8a6424db39 100644
--- a/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
+++ b/packages/in_app_purchase/test/in_app_purchase_connection/google_play_connection_test.dart
@@ -204,9 +204,11 @@ void main() {
       final PurchaseParam purchaseParam = PurchaseParam(
           productDetails: skuDetails.toProductDetails(),
           applicationUserName: accountId);
-      await GooglePlayConnection.instance
+      final bool launchResult = await GooglePlayConnection.instance
           .buyNonConsumable(purchaseParam: purchaseParam);
+
       PurchaseDetails result = await completer.future;
+      expect(launchResult, isTrue);
       expect(result.purchaseID, 'orderID1');
       expect(result.status, PurchaseStatus.purchased);
       expect(result.productID, dummySkuDetails.sku);
@@ -301,17 +303,48 @@ void main() {
       final PurchaseParam purchaseParam = PurchaseParam(
           productDetails: skuDetails.toProductDetails(),
           applicationUserName: accountId);
-      await GooglePlayConnection.instance
+      final bool launchResult = await GooglePlayConnection.instance
           .buyConsumable(purchaseParam: purchaseParam);
 
       // Verify that the result has succeeded
       PurchaseDetails result = await completer.future;
+      expect(launchResult, isTrue);
       expect(result.billingClientPurchase.purchaseToken,
           await consumeCompleter.future);
       expect(result.status, PurchaseStatus.purchased);
       expect(result.error, isNull);
     });
 
+    test('buyNonConsumable propagates failures to launch the billing flow',
+        () async {
+      final BillingResponse sentCode = BillingResponse.error;
+      stubPlatform.addResponse(
+          name: launchMethodName,
+          value: BillingResponseConverter().toJson(sentCode));
+
+      final bool result = await GooglePlayConnection.instance.buyNonConsumable(
+          purchaseParam: PurchaseParam(
+              productDetails: dummySkuDetails.toProductDetails()));
+
+      // Verify that the failure has been converted and returned
+      expect(result, isFalse);
+    });
+
+    test('buyConsumable propagates failures to launch the billing flow',
+        () async {
+      final BillingResponse sentCode = BillingResponse.error;
+      stubPlatform.addResponse(
+          name: launchMethodName,
+          value: BillingResponseConverter().toJson(sentCode));
+
+      final bool result = await GooglePlayConnection.instance.buyConsumable(
+          purchaseParam: PurchaseParam(
+              productDetails: dummySkuDetails.toProductDetails()));
+
+      // Verify that the failure has been converted and returned
+      expect(result, isFalse);
+    });
+
     test('adds consumption failures to PurchaseDetails objects', () async {
       final SkuDetailsWrapper skuDetails = dummySkuDetails;
       final String accountId = "hashedAccountId";