🔀 Fix merge conflict with master. Update version number and override serverAuthCode in test

ValentinVignal · ValentinVignal · commit 316afbf26838 · 2021-10-26T23:13:29.000+08:00
diff --git 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.2.1
+
+ Change the placeholder of the GoogleUserCircleAvatar to a transparent image.
+
 ## 5.2.0
 
 * Add `GoogleSignInAccount.serverAuthCode`. Mark `GoogleSignInAuthentication.serverAuthCode` as deprecated.
diff --git a/packages/google_sign_in/google_sign_in/pubspec.yaml b/packages/google_sign_in/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.
 repository: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
-version: 5.2.0
+version: 5.2.1
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
diff --git a/packages/google_sign_in/google_sign_in/test/widgets_test.dart b/packages/google_sign_in/google_sign_in/test/widgets_test.dart
@@ -25,6 +25,9 @@ class _TestGoogleIdentity extends GoogleIdentity {
 
   @override
   String? get displayName => null;
+
+  @override
+  String? get serverAuthCode => null;
 }
 
 /// A mocked [HttpClient] which always returns a [_MockHttpRequest].

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,9 @@ class _TestGoogleIdentity extends GoogleIdentity {`
`25`	`25`
`26`	`26`	`@override`
`27`	`27`	`String? get displayName => null;`
	`28`	`+`
	`29`	`+ @override`
	`30`	`+ String? get serverAuthCode => null;`
`28`	`31`	`}`
`29`	`32`
`30`	`33`	`/// A mocked [HttpClient] which always returns a [_MockHttpRequest].`