From cca5e581050dd8ff0bdf597ce10717c01b71fc0f Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@google.com>
Date: Mon, 14 Dec 2020 15:56:09 -0800
Subject: [PATCH 1/7] [google_sign_in] Migrate to nnbd

---
 .../google_sign_in/CHANGELOG.md               |  4 ++
 .../google_sign_in/lib/google_sign_in.dart    | 67 ++++++++++---------
 .../google_sign_in/lib/src/common.dart        |  8 +--
 .../google_sign_in/lib/testing.dart           | 18 ++---
 .../google_sign_in/lib/widgets.dart           | 15 ++---
 .../google_sign_in/pubspec.yaml               | 18 ++---
 .../test/google_sign_in_test.dart             | 38 +++++------
 .../CHANGELOG.md                              |  4 ++
 .../google_sign_in_platform_interface.dart    | 23 ++++---
 .../src/method_channel_google_sign_in.dart    | 35 +++++-----
 .../lib/src/types.dart                        | 18 ++---
 .../lib/src/utils.dart                        |  4 +-
 .../pubspec.yaml                              | 14 ++--
 .../method_channel_google_sign_in_test.dart   |  9 ++-
 14 files changed, 140 insertions(+), 135 deletions(-)

diff --git a/packages/google_sign_in/google_sign_in/CHANGELOG.md b/packages/google_sign_in/google_sign_in/CHANGELOG.md
index 7f5b4f2bdd17..d87df7466312 100644
--- a/packages/google_sign_in/google_sign_in/CHANGELOG.md
+++ b/packages/google_sign_in/google_sign_in/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.0.0-nullsafety
+
+* Migrate to nnbd.
+
 ## 4.5.9
 
 * Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.
diff --git a/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart b/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart
index 0f1f15bbb8c4..175bc28ffdee 100644
--- a/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart
+++ b/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart
@@ -22,13 +22,13 @@ class GoogleSignInAuthentication {
   final GoogleSignInTokenData _data;
 
   /// An OpenID Connect ID token that identifies the user.
-  String get idToken => _data.idToken;
+  String? get idToken => _data.idToken;
 
   /// The OAuth2 access token to access Google services.
-  String get accessToken => _data.accessToken;
+  String? get accessToken => _data.accessToken;
 
   /// Server auth code used to access Google Login
-  String get serverAuthCode => _data.serverAuthCode;
+  String? get serverAuthCode => _data.serverAuthCode;
 
   @override
   String toString() => 'GoogleSignInAuthentication:$_data';
@@ -57,18 +57,18 @@ class GoogleSignInAccount implements GoogleIdentity {
   static const String kUserRecoverableAuthError = 'user_recoverable_auth';
 
   @override
-  final String displayName;
+  final String? displayName;
 
   @override
-  final String email;
+  final String? email;
 
   @override
-  final String id;
+  final String? id;
 
   @override
-  final String photoUrl;
+  final String? photoUrl;
 
-  final String _idToken;
+  final String? _idToken;
   final GoogleSignIn _googleSignIn;
 
   /// Retrieve [GoogleSignInAuthentication] for this account.
@@ -86,15 +86,16 @@ class GoogleSignInAccount implements GoogleIdentity {
       throw StateError('User is no longer signed in.');
     }
 
-    final GoogleSignInTokenData response =
+    final GoogleSignInTokenData? response =
         await GoogleSignInPlatform.instance.getTokens(
-      email: email,
+      email: email!,
       shouldRecoverAuth: true,
     );
+    assert(response != null);
 
     // On Android, there isn't an API for refreshing the idToken, so re-use
     // the one we obtained on login.
-    if (response.idToken == null) {
+    if (response!.idToken == null) {
       response.idToken = _idToken;
     }
     return GoogleSignInAuthentication._(response);
@@ -105,7 +106,7 @@ class GoogleSignInAccount implements GoogleIdentity {
   ///
   /// See also https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization.
   Future<Map<String, String>> get authHeaders async {
-    final String token = (await authentication).accessToken;
+    final String? token = (await authentication).accessToken;
     return <String, String>{
       "Authorization": "Bearer $token",
       "X-Goog-AuthUser": "0",
@@ -117,7 +118,7 @@ class GoogleSignInAccount implements GoogleIdentity {
   /// If client runs into 401 errors using a token, it is expected to call
   /// this method and grab `authHeaders` once again.
   Future<void> clearAuthCache() async {
-    final String token = (await authentication).accessToken;
+    final String token = (await authentication).accessToken!;
     await GoogleSignInPlatform.instance.clearAuthCache(token: token);
   }
 
@@ -174,7 +175,7 @@ class GoogleSignIn {
   /// Factory for creating default sign in user experience.
   factory GoogleSignIn.standard({
     List<String> scopes = const <String>[],
-    String hostedDomain,
+    String? hostedDomain,
   }) {
     return GoogleSignIn(
         signInOption: SignInOption.standard,
@@ -212,22 +213,22 @@ class GoogleSignIn {
   final List<String> scopes;
 
   /// Domain to restrict sign-in to.
-  final String hostedDomain;
+  final String? hostedDomain;
 
   /// Client ID being used to connect to google sign-in. Only supported on web.
-  final String clientId;
+  final String? clientId;
 
-  StreamController<GoogleSignInAccount> _currentUserController =
-      StreamController<GoogleSignInAccount>.broadcast();
+  StreamController<GoogleSignInAccount?> _currentUserController =
+      StreamController<GoogleSignInAccount?>.broadcast();
 
   /// Subscribe to this stream to be notified when the current user changes.
-  Stream<GoogleSignInAccount> get onCurrentUserChanged =>
+  Stream<GoogleSignInAccount?> get onCurrentUserChanged =>
       _currentUserController.stream;
 
   // Future that completes when we've finished calling `init` on the native side
-  Future<void> _initialization;
+  Future<void>? _initialization;
 
-  Future<GoogleSignInAccount> _callMethod(Function method) async {
+  Future<GoogleSignInAccount?> _callMethod(Function method) async {
     await _ensureInitialized();
 
     final dynamic response = await method();
@@ -237,7 +238,7 @@ class GoogleSignIn {
         : null);
   }
 
-  GoogleSignInAccount _setCurrentUser(GoogleSignInAccount currentUser) {
+  GoogleSignInAccount? _setCurrentUser(GoogleSignInAccount? currentUser) {
     if (currentUser != _currentUser) {
       _currentUser = currentUser;
       _currentUserController.add(_currentUser);
@@ -258,7 +259,7 @@ class GoogleSignIn {
   }
 
   /// The most recently scheduled method call.
-  Future<void> _lastMethodCall;
+  Future<void>? _lastMethodCall;
 
   /// Returns a [Future] that completes with a success after [future], whether
   /// it completed with a value or an error.
@@ -279,15 +280,15 @@ class GoogleSignIn {
   /// The optional, named parameter [canSkipCall] lets the plugin know that the
   /// method call may be skipped, if there's already [_currentUser] information.
   /// This is used from the [signIn] and [signInSilently] methods.
-  Future<GoogleSignInAccount> _addMethodCall(
+  Future<GoogleSignInAccount?> _addMethodCall(
     Function method, {
     bool canSkipCall = false,
   }) async {
-    Future<GoogleSignInAccount> response;
+    Future<GoogleSignInAccount?> response;
     if (_lastMethodCall == null) {
       response = _callMethod(method);
     } else {
-      response = _lastMethodCall.then((_) {
+      response = _lastMethodCall!.then((_) {
         // If after the last completed call `currentUser` is not `null` and requested
         // method can be skipped (`canSkipCall`), re-use the same authenticated user
         // instead of making extra call to the native side.
@@ -303,8 +304,8 @@ class GoogleSignIn {
   }
 
   /// The currently signed in account, or null if the user is signed out.
-  GoogleSignInAccount get currentUser => _currentUser;
-  GoogleSignInAccount _currentUser;
+  GoogleSignInAccount? get currentUser => _currentUser;
+  GoogleSignInAccount? _currentUser;
 
   /// Attempts to sign in a previously authenticated user without interaction.
   ///
@@ -323,7 +324,7 @@ class GoogleSignIn {
   /// one of [kSignInRequiredError] (when there is no authenticated user) ,
   /// [kNetworkError] (when a network error occurred) or [kSignInFailedError]
   /// (when an unknown error occurred).
-  Future<GoogleSignInAccount> signInSilently({
+  Future<GoogleSignInAccount?> signInSilently({
     bool suppressErrors = true,
   }) async {
     try {
@@ -354,8 +355,8 @@ class GoogleSignIn {
   /// a Future which resolves to the same user instance.
   ///
   /// Re-authentication can be triggered only after [signOut] or [disconnect].
-  Future<GoogleSignInAccount> signIn() {
-    final Future<GoogleSignInAccount> result =
+  Future<GoogleSignInAccount?> signIn() {
+    final Future<GoogleSignInAccount?> result =
         _addMethodCall(GoogleSignInPlatform.instance.signIn, canSkipCall: true);
     bool isCanceled(dynamic error) =>
         error is PlatformException && error.code == kSignInCanceledError;
@@ -363,12 +364,12 @@ class GoogleSignIn {
   }
 
   /// Marks current user as being in the signed out state.
-  Future<GoogleSignInAccount> signOut() =>
+  Future<GoogleSignInAccount?> signOut() =>
       _addMethodCall(GoogleSignInPlatform.instance.signOut);
 
   /// Disconnects the current user from the app and revokes previous
   /// authentication.
-  Future<GoogleSignInAccount> disconnect() =>
+  Future<GoogleSignInAccount?> disconnect() =>
       _addMethodCall(GoogleSignInPlatform.instance.disconnect);
 
   /// Requests the user grants additional Oauth [scopes].
diff --git a/packages/google_sign_in/google_sign_in/lib/src/common.dart b/packages/google_sign_in/google_sign_in/lib/src/common.dart
index 14bed4fe114a..bb1363fed22c 100644
--- a/packages/google_sign_in/google_sign_in/lib/src/common.dart
+++ b/packages/google_sign_in/google_sign_in/lib/src/common.dart
@@ -12,7 +12,7 @@ abstract class GoogleIdentity {
   /// currently signed in user to your backend server. Instead, send an ID token
   /// which can be securely validated on the server.
   /// `GoogleSignInAccount.authentication.idToken` provides such an ID token.
-  String get id;
+  String? get id;
 
   /// The email address of the signed in user.
   ///
@@ -23,15 +23,15 @@ abstract class GoogleIdentity {
   /// currently signed in user to your backend server. Instead, send an ID token
   /// which can be securely validated on the server.
   /// `GoogleSignInAccount.authentication.idToken` provides such an ID token.
-  String get email;
+  String? get email;
 
   /// The display name of the signed in user.
   ///
   /// Not guaranteed to be present for all users, even when configured.
-  String get displayName;
+  String? get displayName;
 
   /// The photo url of the signed in user if the user has a profile picture.
   ///
   /// Not guaranteed to be present for all users, even when configured.
-  String get photoUrl;
+  String? get photoUrl;
 }
diff --git a/packages/google_sign_in/google_sign_in/lib/testing.dart b/packages/google_sign_in/google_sign_in/lib/testing.dart
index 8d62ff463ca6..ed0ca4f2de7c 100644
--- a/packages/google_sign_in/google_sign_in/lib/testing.dart
+++ b/packages/google_sign_in/google_sign_in/lib/testing.dart
@@ -32,7 +32,7 @@ class FakeSignInBackend {
   /// This does not represent the signed-in user, but rather an object that will
   /// be returned when [GoogleSignIn.signIn] or [GoogleSignIn.signInSilently] is
   /// called.
-  FakeUser user;
+  late FakeUser user;
 
   /// Handles method calls that would normally be sent to the native backend.
   /// Returns with the expected values based on the current [user].
@@ -42,7 +42,7 @@ class FakeSignInBackend {
         // do nothing
         return null;
       case 'getTokens':
-        return <String, String>{
+        return <String, String?>{
           'idToken': user.idToken,
           'accessToken': user.accessToken,
         };
@@ -72,24 +72,24 @@ class FakeUser {
   });
 
   /// Will be converted into [GoogleSignInUserData.id].
-  final String id;
+  final String? id;
 
   /// Will be converted into [GoogleSignInUserData.email].
-  final String email;
+  final String? email;
 
   /// Will be converted into [GoogleSignInUserData.displayName].
-  final String displayName;
+  final String? displayName;
 
   /// Will be converted into [GoogleSignInUserData.photoUrl].
-  final String photoUrl;
+  final String? photoUrl;
 
   /// Will be converted into [GoogleSignInTokenData.idToken].
-  final String idToken;
+  final String? idToken;
 
   /// Will be converted into [GoogleSignInTokenData.accessToken].
-  final String accessToken;
+  final String? accessToken;
 
-  Map<String, String> get _asMap => <String, String>{
+  Map<String, String?> get _asMap => <String, String?>{
         'id': id,
         'email': email,
         'displayName': displayName,
diff --git a/packages/google_sign_in/google_sign_in/lib/widgets.dart b/packages/google_sign_in/google_sign_in/lib/widgets.dart
index 3375628f47b5..3cee9717eef0 100644
--- a/packages/google_sign_in/google_sign_in/lib/widgets.dart
+++ b/packages/google_sign_in/google_sign_in/lib/widgets.dart
@@ -4,7 +4,6 @@
 
 import 'dart:typed_data';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import 'src/common.dart';
@@ -23,7 +22,7 @@ class GoogleUserCircleAvatar extends StatelessWidget {
   /// in place of a profile photo, or a default profile photo if the user's
   /// identity does not specify a `displayName`.
   const GoogleUserCircleAvatar({
-    @required this.identity,
+    required this.identity,
     this.placeholderPhotoUrl,
     this.foregroundColor,
     this.backgroundColor,
@@ -42,13 +41,13 @@ class GoogleUserCircleAvatar extends StatelessWidget {
   /// The color of the text to be displayed if photo is not available.
   ///
   /// If a foreground color is not specified, the theme's text color is used.
-  final Color foregroundColor;
+  final Color? foregroundColor;
 
   /// The color with which to fill the circle. Changing the background color
   /// will cause the avatar to animate to the new color.
   ///
   /// If a background color is not specified, the theme's primary color is used.
-  final Color backgroundColor;
+  final Color? backgroundColor;
 
   /// The URL of a photo to use if the user's [identity] does not specify a
   /// `photoUrl`.
@@ -57,7 +56,7 @@ class GoogleUserCircleAvatar extends StatelessWidget {
   /// then this widget will attempt to display the user's first initial as
   /// determined from the identity's [displayName] field. If that is `null` a
   /// default (generic) Google profile photo will be displayed.
-  final String placeholderPhotoUrl;
+  final String? placeholderPhotoUrl;
 
   @override
   Widget build(BuildContext context) {
@@ -86,20 +85,20 @@ class GoogleUserCircleAvatar extends StatelessWidget {
     // Placeholder to use when there is no photo URL, and while the photo is
     // loading. Uses the first character of the display name (if it has one),
     // or the first letter of the email address if it does not.
-    final List<String> placeholderCharSources = <String>[
+    final List<String?> placeholderCharSources = <String?>[
       identity.displayName,
       identity.email,
       '-',
     ];
     final String placeholderChar = placeholderCharSources
-        .firstWhere((String str) => str != null && str.trimLeft().isNotEmpty)
+        .firstWhere((String? str) => str != null && str.trimLeft().isNotEmpty)!
         .trimLeft()[0]
         .toUpperCase();
     final Widget placeholder = Center(
       child: Text(placeholderChar, textAlign: TextAlign.center),
     );
 
-    final String photoUrl = identity.photoUrl ?? placeholderPhotoUrl;
+    final String? photoUrl = identity.photoUrl ?? placeholderPhotoUrl;
     if (photoUrl == null) {
       return placeholder;
     }
diff --git a/packages/google_sign_in/google_sign_in/pubspec.yaml b/packages/google_sign_in/google_sign_in/pubspec.yaml
index 6e0366c790bf..2a2506a38357 100644
--- a/packages/google_sign_in/google_sign_in/pubspec.yaml
+++ b/packages/google_sign_in/google_sign_in/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_sign_in
 description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in
-version: 4.5.9
+version: 5.0.0-nullsafety
 
 flutter:
   plugin:
@@ -16,16 +16,10 @@ flutter:
         default_package: google_sign_in_web
 
 dependencies:
-  google_sign_in_platform_interface: ^1.1.1
+  google_sign_in_platform_interface: ^2.0.0-nullsafety
   flutter:
     sdk: flutter
-  meta: ^1.0.4
-  # The design on https://flutter.dev/go/federated-plugins was to leave
-  # this constraint as "any". We cannot do it right now as it fails pub publish
-  # validation, so we set a ^ constraint.
-  # TODO(amirh): Revisit this (either update this part in the  design or the pub tool).
-  # https://github.com/flutter/flutter/issues/46264
-  google_sign_in_web: ^0.9.1
+  meta: ^1.3.0-nullsafety.6
 
 dev_dependencies:
   http: ^0.12.0
@@ -33,10 +27,10 @@ dev_dependencies:
     sdk: flutter
   flutter_test:
     sdk: flutter
-  pedantic: ^1.8.0
+  pedantic: ^1.10.0-nullsafety.1
   integration_test:
     path: ../../integration_test
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
-  flutter: ">=1.12.13+hotfix.4"
+  sdk: ">=2.12.0-0 <3.0.0"
+  flutter: ">=1.12.13+hotfix.5"
diff --git a/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart b/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart
index 7305800296f9..c63a15e66bbb 100755
--- a/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart
+++ b/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart
@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.9
-
 import 'dart:async';
 
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart';
+import 'package:third_party.flutter_plugins.google_sign_in.interface/google_sign_in_platform_interface.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:google_sign_in/testing.dart';
 
@@ -43,8 +41,8 @@ void main() {
     };
 
     final List<MethodCall> log = <MethodCall>[];
-    Map<String, dynamic> responses;
-    GoogleSignIn googleSignIn;
+    late Map<String, dynamic> responses;
+    late GoogleSignIn googleSignIn;
 
     setUp(() {
       responses = Map<String, dynamic>.from(kDefaultResponses);
@@ -173,16 +171,16 @@ void main() {
     });
 
     test('concurrent calls of the same method trigger sign in once', () async {
-      final List<Future<GoogleSignInAccount>> futures =
-          <Future<GoogleSignInAccount>>[
+      final List<Future<GoogleSignInAccount?>> futures =
+          <Future<GoogleSignInAccount?>>[
         googleSignIn.signInSilently(),
         googleSignIn.signInSilently(),
       ];
       expect(futures.first, isNot(futures.last),
           reason: 'Must return new Future');
-      final List<GoogleSignInAccount> users = await Future.wait(futures);
+      final List<GoogleSignInAccount?> users = await Future.wait(futures);
       expect(googleSignIn.currentUser, isNotNull);
-      expect(users, <GoogleSignInAccount>[
+      expect(users, <GoogleSignInAccount?>[
         googleSignIn.currentUser,
         googleSignIn.currentUser
       ]);
@@ -218,13 +216,13 @@ void main() {
     });
 
     test('concurrent calls of different signIn methods', () async {
-      final List<Future<GoogleSignInAccount>> futures =
-          <Future<GoogleSignInAccount>>[
+      final List<Future<GoogleSignInAccount?>> futures =
+          <Future<GoogleSignInAccount?>>[
         googleSignIn.signInSilently(),
         googleSignIn.signIn(),
       ];
       expect(futures.first, isNot(futures.last));
-      final List<GoogleSignInAccount> users = await Future.wait(futures);
+      final List<GoogleSignInAccount?> users = await Future.wait(futures);
       expect(
         log,
         <Matcher>[
@@ -248,8 +246,8 @@ void main() {
     });
 
     test('signOut/disconnect methods always trigger native calls', () async {
-      final List<Future<GoogleSignInAccount>> futures =
-          <Future<GoogleSignInAccount>>[
+      final List<Future<GoogleSignInAccount?>> futures =
+          <Future<GoogleSignInAccount?>>[
         googleSignIn.signOut(),
         googleSignIn.signOut(),
         googleSignIn.disconnect(),
@@ -273,8 +271,8 @@ void main() {
     });
 
     test('queue of many concurrent calls', () async {
-      final List<Future<GoogleSignInAccount>> futures =
-          <Future<GoogleSignInAccount>>[
+      final List<Future<GoogleSignInAccount?>> futures =
+          <Future<GoogleSignInAccount?>>[
         googleSignIn.signInSilently(),
         googleSignIn.signOut(),
         googleSignIn.signIn(),
@@ -368,7 +366,7 @@ void main() {
       await googleSignIn.signIn();
       log.clear();
 
-      final GoogleSignInAccount user = googleSignIn.currentUser;
+      final GoogleSignInAccount user = googleSignIn.currentUser!;
       final GoogleSignInAuthentication auth = await user.authentication;
 
       expect(auth.accessToken, '456');
@@ -415,11 +413,11 @@ void main() {
       photoUrl: "https://lh5.googleusercontent.com/photo.jpg",
     );
 
-    GoogleSignIn googleSignIn;
+    late GoogleSignIn googleSignIn;
 
     setUp(() {
       final MethodChannelGoogleSignIn platformInstance =
-          GoogleSignInPlatform.instance;
+          GoogleSignInPlatform.instance as MethodChannelGoogleSignIn;
       platformInstance.channel.setMockMethodCallHandler(
           (FakeSignInBackend()..user = kUserData).handleMethodCall);
       googleSignIn = GoogleSignIn();
@@ -432,7 +430,7 @@ void main() {
     test('can sign in and sign out', () async {
       await googleSignIn.signIn();
 
-      final GoogleSignInAccount user = googleSignIn.currentUser;
+      final GoogleSignInAccount user = googleSignIn.currentUser!;
 
       expect(user.displayName, equals(kUserData.displayName));
       expect(user.email, equals(kUserData.email));
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/CHANGELOG.md b/packages/google_sign_in/google_sign_in_platform_interface/CHANGELOG.md
index e69e912195bf..f01d03080af7 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/CHANGELOG.md
+++ b/packages/google_sign_in/google_sign_in_platform_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0-nullsafety
+
+* Migration to nnbd.
+
 ## 1.1.3
 
 * Update Flutter SDK constraint.
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart
index 966e93551086..cbce6f677d6b 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart
+++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'package:meta/meta.dart' show required, visibleForTesting;
+import 'package:meta/meta.dart' show visibleForTesting;
 import 'src/method_channel_google_sign_in.dart';
 import 'src/types.dart';
 
@@ -78,27 +78,28 @@ abstract class GoogleSignInPlatform {
   ///
   /// See:
   /// https://developers.google.com/identity/sign-in/web/reference#gapiauth2initparams
-  Future<void> init(
-      {@required String hostedDomain,
-      List<String> scopes,
-      SignInOption signInOption,
-      String clientId}) async {
+  Future<void> init({
+    List<String> scopes = const <String>[],
+    SignInOption signInOption = SignInOption.standard,
+    String? hostedDomain,
+    String? clientId,
+  }) async {
     throw UnimplementedError('init() has not been implemented.');
   }
 
   /// Attempts to reuse pre-existing credentials to sign in again, without user interaction.
-  Future<GoogleSignInUserData> signInSilently() async {
+  Future<GoogleSignInUserData?> signInSilently() async {
     throw UnimplementedError('signInSilently() has not been implemented.');
   }
 
   /// Signs in the user with the options specified to [init].
-  Future<GoogleSignInUserData> signIn() async {
+  Future<GoogleSignInUserData?> signIn() async {
     throw UnimplementedError('signIn() has not been implemented.');
   }
 
   /// Returns the Tokens used to authenticate other API calls.
-  Future<GoogleSignInTokenData> getTokens(
-      {@required String email, bool shouldRecoverAuth}) async {
+  Future<GoogleSignInTokenData?> getTokens(
+      {required String email, bool? shouldRecoverAuth}) async {
     throw UnimplementedError('getTokens() has not been implemented.');
   }
 
@@ -118,7 +119,7 @@ abstract class GoogleSignInPlatform {
   }
 
   /// Clears any cached information that the plugin may be holding on to.
-  Future<void> clearAuthCache({@required String token}) async {
+  Future<void> clearAuthCache({required String token}) async {
     throw UnimplementedError('clearAuthCache() has not been implemented.');
   }
 
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart
index 4d2a34fe0fe7..71cfbb84660d 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart
+++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart
@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:flutter/services.dart';
-import 'package:meta/meta.dart' show required, visibleForTesting;
+import 'package:meta/meta.dart' show visibleForTesting;
 
 import '../google_sign_in_platform_interface.dart';
 import 'types.dart';
@@ -20,11 +20,12 @@ class MethodChannelGoogleSignIn extends GoogleSignInPlatform {
       const MethodChannel('plugins.flutter.io/google_sign_in');
 
   @override
-  Future<void> init(
-      {@required String hostedDomain,
-      List<String> scopes = const <String>[],
-      SignInOption signInOption = SignInOption.standard,
-      String clientId}) {
+  Future<void> init({
+    List<String> scopes = const <String>[],
+    SignInOption signInOption = SignInOption.standard,
+    String? hostedDomain,
+    String? clientId,
+  }) {
     return channel.invokeMethod<void>('init', <String, dynamic>{
       'signInOption': signInOption.toString(),
       'scopes': scopes,
@@ -33,22 +34,22 @@ class MethodChannelGoogleSignIn extends GoogleSignInPlatform {
   }
 
   @override
-  Future<GoogleSignInUserData> signInSilently() {
+  Future<GoogleSignInUserData?> signInSilently() {
     return channel
         .invokeMapMethod<String, dynamic>('signInSilently')
         .then(getUserDataFromMap);
   }
 
   @override
-  Future<GoogleSignInUserData> signIn() {
+  Future<GoogleSignInUserData?> signIn() {
     return channel
         .invokeMapMethod<String, dynamic>('signIn')
         .then(getUserDataFromMap);
   }
 
   @override
-  Future<GoogleSignInTokenData> getTokens(
-      {String email, bool shouldRecoverAuth = true}) {
+  Future<GoogleSignInTokenData?> getTokens(
+      {required String email, bool? shouldRecoverAuth = true}) {
     return channel
         .invokeMapMethod<String, dynamic>('getTokens', <String, dynamic>{
       'email': email,
@@ -67,23 +68,23 @@ class MethodChannelGoogleSignIn extends GoogleSignInPlatform {
   }
 
   @override
-  Future<bool> isSignedIn() {
-    return channel.invokeMethod<bool>('isSignedIn');
+  Future<bool> isSignedIn() async {
+    return (await channel.invokeMethod<bool>('isSignedIn'))!;
   }
 
   @override
-  Future<void> clearAuthCache({String token}) {
+  Future<void> clearAuthCache({String? token}) {
     return channel.invokeMethod<void>(
       'clearAuthCache',
-      <String, String>{'token': token},
+      <String, String?>{'token': token},
     );
   }
 
   @override
-  Future<bool> requestScopes(List<String> scopes) {
-    return channel.invokeMethod<bool>(
+  Future<bool> requestScopes(List<String> scopes) async {
+    return (await channel.invokeMethod<bool>(
       'requestScopes',
       <String, List<String>>{'scopes': scopes},
-    );
+    ))!;
   }
 }
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart
index c60402200bdd..509d1665860e 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart
+++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart
@@ -32,7 +32,7 @@ class GoogleSignInUserData {
   /// The display name of the signed in user.
   ///
   /// Not guaranteed to be present for all users, even when configured.
-  String displayName;
+  String? displayName;
 
   /// The email address of the signed in user.
   ///
@@ -42,7 +42,7 @@ class GoogleSignInUserData {
   /// _Important_: Do not use this returned email address to communicate the
   /// currently signed in user to your backend server. Instead, send an ID token
   /// which can be securely validated on the server. See [idToken].
-  String email;
+  String? email;
 
   /// The unique ID for the Google account.
   ///
@@ -51,20 +51,20 @@ class GoogleSignInUserData {
   /// _Important_: Do not use this returned Google ID to communicate the
   /// currently signed in user to your backend server. Instead, send an ID token
   /// which can be securely validated on the server. See [idToken].
-  String id;
+  String? id;
 
   /// The photo url of the signed in user if the user has a profile picture.
   ///
   /// Not guaranteed to be present for all users, even when configured.
-  String photoUrl;
+  String? photoUrl;
 
   /// A token that can be sent to your own server to verify the authentication
   /// data.
-  String idToken;
+  String? idToken;
 
   @override
   int get hashCode =>
-      hashObjects(<String>[displayName, email, id, photoUrl, idToken]);
+      hashObjects(<String?>[displayName, email, id, photoUrl, idToken]);
 
   @override
   bool operator ==(dynamic other) {
@@ -89,13 +89,13 @@ class GoogleSignInTokenData {
   });
 
   /// An OpenID Connect ID token for the authenticated user.
-  String idToken;
+  String? idToken;
 
   /// The OAuth2 access token used to access Google services.
-  String accessToken;
+  String? accessToken;
 
   /// Server auth code used to access Google Login
-  String serverAuthCode;
+  String? serverAuthCode;
 
   @override
   int get hashCode => hash3(idToken, accessToken, serverAuthCode);
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart
index 1ae828604af6..85b85f846103 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart
+++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart
@@ -5,7 +5,7 @@
 import '../google_sign_in_platform_interface.dart';
 
 /// Converts user data coming from native code into the proper platform interface type.
-GoogleSignInUserData getUserDataFromMap(Map<String, dynamic> data) {
+GoogleSignInUserData? getUserDataFromMap(Map<String, dynamic>? data) {
   if (data == null) {
     return null;
   }
@@ -18,7 +18,7 @@ GoogleSignInUserData getUserDataFromMap(Map<String, dynamic> data) {
 }
 
 /// Converts token data coming from native code into the proper platform interface type.
-GoogleSignInTokenData getTokenDataFromMap(Map<String, dynamic> data) {
+GoogleSignInTokenData? getTokenDataFromMap(Map<String, dynamic>? data) {
   if (data == null) {
     return null;
   }
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml b/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml
index 8edeba0072a8..4a46a0da218a 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml
+++ b/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml
@@ -3,20 +3,20 @@ description: A common platform interface for the google_sign_in plugin.
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in_platform_interface
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 1.1.3
+version: 2.0.0-nullsafety
 
 dependencies:
   flutter:
     sdk: flutter
-  meta: ^1.0.5
-  quiver: ">=2.0.0 <3.0.0"
+  meta: ^1.3.0-nullsafety.6
+  quiver: ^2.1.5
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  mockito: ^4.1.1
-  pedantic: ^1.8.0
+  mockito: ^4.1.3
+  pedantic: ^1.10.0-nullsafety.1
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
-  flutter: ">=1.10.0"
+  sdk: ">=2.12.0-0 <3.0.0"
+  flutter: ">=1.12.13+hotfix.5"
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/test/method_channel_google_sign_in_test.dart b/packages/google_sign_in/google_sign_in_platform_interface/test/method_channel_google_sign_in_test.dart
index 5ac34ade1b8d..325f0c10a6ab 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/test/method_channel_google_sign_in_test.dart
+++ b/packages/google_sign_in/google_sign_in_platform_interface/test/method_channel_google_sign_in_test.dart
@@ -29,10 +29,12 @@ const Map<String, dynamic> kDefaultResponses = <String, dynamic>{
   'disconnect': null,
   'isSignedIn': true,
   'getTokens': kTokenData,
+  'requestScopes': true,
 };
 
-final GoogleSignInUserData kUser = getUserDataFromMap(kUserData);
-final GoogleSignInTokenData kToken = getTokenDataFromMap(kTokenData);
+final GoogleSignInUserData? kUser = getUserDataFromMap(kUserData);
+final GoogleSignInTokenData? kToken =
+    getTokenDataFromMap(kTokenData as Map<String, dynamic>);
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
@@ -42,7 +44,8 @@ void main() {
     final MethodChannel channel = googleSignIn.channel;
 
     final List<MethodCall> log = <MethodCall>[];
-    Map<String, dynamic> responses; // Some tests mutate some kDefaultResponses
+    late Map<String, dynamic>
+        responses; // Some tests mutate some kDefaultResponses
 
     setUp(() {
       responses = Map<String, dynamic>.from(kDefaultResponses);

From df46cab054453f249f590600ab6e8f7a1e6dc69d Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@google.com>
Date: Thu, 17 Dec 2020 11:13:39 -0800
Subject: [PATCH 2/7] Update quiver dep

---
 .../google_sign_in_platform_interface/pubspec.yaml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml b/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml
index 4a46a0da218a..b872ece305a9 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml
+++ b/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml
@@ -9,7 +9,7 @@ dependencies:
   flutter:
     sdk: flutter
   meta: ^1.3.0-nullsafety.6
-  quiver: ^2.1.5
+  quiver: ^3.0.0-nullsafety.2
 
 dev_dependencies:
   flutter_test:

From 9b52a7910115cb1ecb143c0894018d33cf035493 Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@google.com>
Date: Fri, 18 Dec 2020 17:01:46 -0800
Subject: [PATCH 3/7] Review comments

---
 .../google_sign_in/lib/google_sign_in.dart      | 11 +++++------
 .../google_sign_in/lib/src/common.dart          |  4 ++--
 .../google_sign_in/lib/widgets.dart             | 14 +-------------
 .../lib/google_sign_in_platform_interface.dart  |  2 +-
 .../lib/src/method_channel_google_sign_in.dart  |  4 ++--
 .../lib/src/types.dart                          | 17 ++++++++++-------
 .../lib/src/utils.dart                          |  9 +++------
 7 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart b/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart
index 175bc28ffdee..1317eb91ecfb 100644
--- a/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart
+++ b/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart
@@ -60,10 +60,10 @@ class GoogleSignInAccount implements GoogleIdentity {
   final String? displayName;
 
   @override
-  final String? email;
+  final String email;
 
   @override
-  final String? id;
+  final String id;
 
   @override
   final String? photoUrl;
@@ -86,16 +86,15 @@ class GoogleSignInAccount implements GoogleIdentity {
       throw StateError('User is no longer signed in.');
     }
 
-    final GoogleSignInTokenData? response =
+    final GoogleSignInTokenData response =
         await GoogleSignInPlatform.instance.getTokens(
-      email: email!,
+      email: email,
       shouldRecoverAuth: true,
     );
-    assert(response != null);
 
     // On Android, there isn't an API for refreshing the idToken, so re-use
     // the one we obtained on login.
-    if (response!.idToken == null) {
+    if (response.idToken == null) {
       response.idToken = _idToken;
     }
     return GoogleSignInAuthentication._(response);
diff --git a/packages/google_sign_in/google_sign_in/lib/src/common.dart b/packages/google_sign_in/google_sign_in/lib/src/common.dart
index bb1363fed22c..60c74ab4c6d5 100644
--- a/packages/google_sign_in/google_sign_in/lib/src/common.dart
+++ b/packages/google_sign_in/google_sign_in/lib/src/common.dart
@@ -12,7 +12,7 @@ abstract class GoogleIdentity {
   /// currently signed in user to your backend server. Instead, send an ID token
   /// which can be securely validated on the server.
   /// `GoogleSignInAccount.authentication.idToken` provides such an ID token.
-  String? get id;
+  String get id;
 
   /// The email address of the signed in user.
   ///
@@ -23,7 +23,7 @@ abstract class GoogleIdentity {
   /// currently signed in user to your backend server. Instead, send an ID token
   /// which can be securely validated on the server.
   /// `GoogleSignInAccount.authentication.idToken` provides such an ID token.
-  String? get email;
+  String get email;
 
   /// The display name of the signed in user.
   ///
diff --git a/packages/google_sign_in/google_sign_in/lib/widgets.dart b/packages/google_sign_in/google_sign_in/lib/widgets.dart
index 3cee9717eef0..c9682930b089 100644
--- a/packages/google_sign_in/google_sign_in/lib/widgets.dart
+++ b/packages/google_sign_in/google_sign_in/lib/widgets.dart
@@ -67,18 +67,6 @@ class GoogleUserCircleAvatar extends StatelessWidget {
     );
   }
 
-  /// Adds correct sizing information to [photoUrl].
-  ///
-  /// Falls back to the default profile photo if [photoUrl] is [null].
-  static String _sizedProfileImageUrl(String photoUrl, double size) {
-    if (photoUrl == null) {
-      // If the user has no profile photo and no display name, fall back to
-      // the default profile photo as a last resort.
-      return 'https://lh3.googleusercontent.com/a/default-user=s${size.round()}-c';
-    }
-    return fife.addSizeDirectiveToUrl(photoUrl, size);
-  }
-
   Widget _buildClippedImage(BuildContext context, BoxConstraints constraints) {
     assert(constraints.maxWidth == constraints.maxHeight);
 
@@ -106,7 +94,7 @@ class GoogleUserCircleAvatar extends StatelessWidget {
     // Add a sizing directive to the profile photo URL.
     final double size =
         MediaQuery.of(context).devicePixelRatio * constraints.maxWidth;
-    final String sizedPhotoUrl = _sizedProfileImageUrl(photoUrl, size);
+    final String sizedPhotoUrl = fife.addSizeDirectiveToUrl(photoUrl, size);
 
     // Fade the photo in over the top of the placeholder.
     return SizedBox(
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart
index cbce6f677d6b..3499558f9114 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart
+++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart
@@ -98,7 +98,7 @@ abstract class GoogleSignInPlatform {
   }
 
   /// Returns the Tokens used to authenticate other API calls.
-  Future<GoogleSignInTokenData?> getTokens(
+  Future<GoogleSignInTokenData> getTokens(
       {required String email, bool? shouldRecoverAuth}) async {
     throw UnimplementedError('getTokens() has not been implemented.');
   }
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart
index 71cfbb84660d..b36676e2376d 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart
+++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart
@@ -48,13 +48,13 @@ class MethodChannelGoogleSignIn extends GoogleSignInPlatform {
   }
 
   @override
-  Future<GoogleSignInTokenData?> getTokens(
+  Future<GoogleSignInTokenData> getTokens(
       {required String email, bool? shouldRecoverAuth = true}) {
     return channel
         .invokeMapMethod<String, dynamic>('getTokens', <String, dynamic>{
       'email': email,
       'shouldRecoverAuth': shouldRecoverAuth,
-    }).then(getTokenDataFromMap);
+    }).then((result) => getTokenDataFromMap(result!));
   }
 
   @override
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart
index 509d1665860e..2db5f612f101 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart
+++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart
@@ -24,10 +24,14 @@ enum SignInOption {
 
 /// Holds information about the signed in user.
 class GoogleSignInUserData {
-  /// Uses the given data to construct an instance. Any of these parameters
-  /// could be null.
-  GoogleSignInUserData(
-      {this.displayName, this.email, this.id, this.photoUrl, this.idToken});
+  /// Uses the given data to construct an instance.
+  GoogleSignInUserData({
+    required this.email,
+    required this.id,
+    this.displayName,
+    this.photoUrl,
+    this.idToken,
+  });
 
   /// The display name of the signed in user.
   ///
@@ -42,7 +46,7 @@ class GoogleSignInUserData {
   /// _Important_: Do not use this returned email address to communicate the
   /// currently signed in user to your backend server. Instead, send an ID token
   /// which can be securely validated on the server. See [idToken].
-  String? email;
+  String email;
 
   /// The unique ID for the Google account.
   ///
@@ -51,7 +55,7 @@ class GoogleSignInUserData {
   /// _Important_: Do not use this returned Google ID to communicate the
   /// currently signed in user to your backend server. Instead, send an ID token
   /// which can be securely validated on the server. See [idToken].
-  String? id;
+  String id;
 
   /// The photo url of the signed in user if the user has a profile picture.
   ///
@@ -81,7 +85,6 @@ class GoogleSignInUserData {
 
 /// Holds authentication data after sign in.
 class GoogleSignInTokenData {
-  /// Either or both parameters may be null.
   GoogleSignInTokenData({
     this.idToken,
     this.accessToken,
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart
index 85b85f846103..f6236d4ca12e 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart
+++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart
@@ -10,18 +10,15 @@ GoogleSignInUserData? getUserDataFromMap(Map<String, dynamic>? data) {
     return null;
   }
   return GoogleSignInUserData(
+      email: data['email']!,
+      id: data['id']!,
       displayName: data['displayName'],
-      email: data['email'],
-      id: data['id'],
       photoUrl: data['photoUrl'],
       idToken: data['idToken']);
 }
 
 /// Converts token data coming from native code into the proper platform interface type.
-GoogleSignInTokenData? getTokenDataFromMap(Map<String, dynamic>? data) {
-  if (data == null) {
-    return null;
-  }
+GoogleSignInTokenData getTokenDataFromMap(Map<String, dynamic> data) {
   return GoogleSignInTokenData(
     idToken: data['idToken'],
     accessToken: data['accessToken'],

From f0065a022fb41897836e14446b84a8e2e3c2d822 Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@google.com>
Date: Sat, 9 Jan 2021 09:51:55 -0800
Subject: [PATCH 4/7] Fix wrong import

---
 .../google_sign_in/google_sign_in/test/google_sign_in_test.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart b/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart
index c63a15e66bbb..2a8d65e32ffd 100755
--- a/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart
+++ b/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:third_party.flutter_plugins.google_sign_in.interface/google_sign_in_platform_interface.dart';
+import 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:google_sign_in/testing.dart';
 

From 105a6df1ddb31e8cf7a69529c635dd70622ea53e Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@google.com>
Date: Wed, 13 Jan 2021 14:23:57 -0800
Subject: [PATCH 5/7] Update mockito version

---
 .../google_sign_in_platform_interface/pubspec.yaml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml b/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml
index b872ece305a9..4480debc9ba3 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml
+++ b/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  mockito: ^4.1.3
+  mockito: ^5.0.0-nullsafety.1
   pedantic: ^1.10.0-nullsafety.1
 
 environment:

From 91ff05c3ebf2c04d6c81bdae892c0fe502ddef39 Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@google.com>
Date: Thu, 14 Jan 2021 22:56:05 -0800
Subject: [PATCH 6/7] Fix failures

---
 .../integration_test/google_sign_in_test.dart        |  2 ++
 .../google_sign_in/test_driver/integration_test.dart |  2 ++
 .../lib/src/types.dart                               |  1 +
 .../test/google_sign_in_platform_interface_test.dart | 12 +++++++-----
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/google_sign_in/google_sign_in/integration_test/google_sign_in_test.dart b/packages/google_sign_in/google_sign_in/integration_test/google_sign_in_test.dart
index 7b2b8d800778..5195c2af1bb9 100644
--- a/packages/google_sign_in/google_sign_in/integration_test/google_sign_in_test.dart
+++ b/packages/google_sign_in/google_sign_in/integration_test/google_sign_in_test.dart
@@ -2,6 +2,8 @@ import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 
+// @dart = 2.9
+
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
diff --git a/packages/google_sign_in/google_sign_in/test_driver/integration_test.dart b/packages/google_sign_in/google_sign_in/test_driver/integration_test.dart
index f07dba382187..4a27ac2f986b 100644
--- a/packages/google_sign_in/google_sign_in/test_driver/integration_test.dart
+++ b/packages/google_sign_in/google_sign_in/test_driver/integration_test.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// @dart = 2.9
+
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart
index 2db5f612f101..a4c5906723dd 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart
+++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart
@@ -85,6 +85,7 @@ class GoogleSignInUserData {
 
 /// Holds authentication data after sign in.
 class GoogleSignInTokenData {
+  /// Build `GoogleSignInTokenData`.
   GoogleSignInTokenData({
     this.idToken,
     this.accessToken,
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/test/google_sign_in_platform_interface_test.dart b/packages/google_sign_in/google_sign_in_platform_interface/test/google_sign_in_platform_interface_test.dart
index f411b8992821..e2565d799e1f 100644
--- a/packages/google_sign_in/google_sign_in_platform_interface/test/google_sign_in_platform_interface_test.dart
+++ b/packages/google_sign_in/google_sign_in_platform_interface/test/google_sign_in_platform_interface_test.dart
@@ -15,7 +15,7 @@ void main() {
     test('Cannot be implemented with `implements`', () {
       expect(() {
         GoogleSignInPlatform.instance = ImplementsGoogleSignInPlatform();
-      }, throwsAssertionError);
+      }, throwsA(isA<Error>()));
     });
 
     test('Can be extended', () {
@@ -23,14 +23,16 @@ void main() {
     });
 
     test('Can be mocked with `implements`', () {
-      final ImplementsGoogleSignInPlatform mock =
-          ImplementsGoogleSignInPlatform();
-      when(mock.isMock).thenReturn(true);
-      GoogleSignInPlatform.instance = mock;
+      GoogleSignInPlatform.instance = ImplementsWithIsMock();
     });
   });
 }
 
+class ImplementsWithIsMock extends Mock implements GoogleSignInPlatform {
+  @override
+  bool get isMock => true;
+}
+
 class ImplementsGoogleSignInPlatform extends Mock
     implements GoogleSignInPlatform {}
 

From c76338cd50bcdf630ae68c5005fc0fed77d0cead Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@google.com>
Date: Thu, 14 Jan 2021 23:17:05 -0800
Subject: [PATCH 7/7] Wrong place for language version

---
 .../google_sign_in/integration_test/google_sign_in_test.dart  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/google_sign_in/google_sign_in/integration_test/google_sign_in_test.dart b/packages/google_sign_in/google_sign_in/integration_test/google_sign_in_test.dart
index 5195c2af1bb9..a900bfbfdc2e 100644
--- a/packages/google_sign_in/google_sign_in/integration_test/google_sign_in_test.dart
+++ b/packages/google_sign_in/google_sign_in/integration_test/google_sign_in_test.dart
@@ -1,9 +1,9 @@
+// @dart = 2.9
+
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 
-// @dart = 2.9
-
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();