Fix: Resolves merge conflicts

packages/google_sign_in/google_sign_in/CHANGELOG.md

@@ -1,7 +1,14 @@
-## 5.3.1
+## 5.3.2
 
+* Updates tests to use a mock platform instead of relying on default
+  method channel implementation internals.
 * Enables mocking models by changing overridden operator == parameter type from `dynamic` to `Object`.
 
+## 5.3.1
+
+* Fixes library_private_types_in_public_api, sort_child_properties_last and use_key_in_widget_constructors
+  lint warnings.
+
 ## 5.3.0
 
 * Moves Android and iOS implementations to federated packages.

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/main/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.3.1
+version: 5.3.2
 
 
 environment:

packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart

@@ -7,14 +7,14 @@ import 'dart:async';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart';
+import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
+import 'google_sign_in_test.mocks.dart';
 
 /// Verify that [GoogleSignInAccount] can be mocked even though it's unused
 // ignore: must_be_immutable
 class MockGoogleSignInAccount extends Mock implements GoogleSignInAccount {}
 
-import 'google_sign_in_test.mocks.dart';
-
 @GenerateMocks(<Type>[GoogleSignInPlatform])
 void main() {
   late MockGoogleSignInPlatform mockPlatform;

packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md

@@ -1,6 +1,13 @@
-## 0.2.2+4
+## 0.2.2+6
 
 * Enables mocking models by changing overridden operator == parameter type from `dynamic` to `Object`.
+
+## 0.2.2+5
+
+* Minor fixes for new analysis options.
+
+## 0.2.2+4
+
 * Removes unnecessary imports.
 * Fixes library_private_types_in_public_api, sort_child_properties_last and use_key_in_widget_constructors
   lint warnings.

packages/in_app_purchase/in_app_purchase_android/pubspec.yaml

@@ -2,7 +2,7 @@ name: in_app_purchase_android
 description: An implementation for the Android platform of the Flutter `in_app_purchase` plugin. This uses the Android BillingClient APIs.
 repository: https://github.com/flutter/plugins/tree/main/packages/in_app_purchase/in_app_purchase_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22
-version: 0.2.2+4
+version: 0.2.2+6
 
 environment:
   sdk: ">=2.14.0 <3.0.0"