From b029232e5e24ab8d9ad646f40cd0d3298c7647cb Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Wed, 6 Dec 2023 15:08:15 -0800
Subject: [PATCH 1/2] Drop quiver usage in several packages

camera: was NOT used at all. Superfluous usage!
google_sign_in_platform_interface: dropping usage was trivial with
  new dart:core APIs
---
 packages/camera/camera/CHANGELOG.md                        | 1 +
 packages/camera/camera/pubspec.yaml                        | 1 -
 packages/camera/camera_android/example/pubspec.yaml        | 1 -
 packages/camera/camera_avfoundation/example/pubspec.yaml   | 1 -
 .../google_sign_in_platform_interface/CHANGELOG.md         | 1 +
 .../google_sign_in_platform_interface/lib/src/types.dart   | 7 +++----
 .../google_sign_in_platform_interface/pubspec.yaml         | 1 -
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md
index b8a108b188b6..6f5a604c7ca0 100644
--- a/packages/camera/camera/CHANGELOG.md
+++ b/packages/camera/camera/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## NEXT
 
 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
+* Drop unused dependency on `package:quiver`.
 
 ## 0.10.5+5
 
diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml
index f498076a1f40..d72dafe8bfe6 100644
--- a/packages/camera/camera/pubspec.yaml
+++ b/packages/camera/camera/pubspec.yaml
@@ -28,7 +28,6 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_plugin_android_lifecycle: ^2.0.2
-  quiver: ^3.0.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/camera/camera_android/example/pubspec.yaml b/packages/camera/camera_android/example/pubspec.yaml
index f921c680dc55..a7f2bede8f1e 100644
--- a/packages/camera/camera_android/example/pubspec.yaml
+++ b/packages/camera/camera_android/example/pubspec.yaml
@@ -18,7 +18,6 @@ dependencies:
   flutter:
     sdk: flutter
   path_provider: ^2.0.0
-  quiver: ^3.0.0
   video_player: ^2.1.4
 
 dev_dependencies:
diff --git a/packages/camera/camera_avfoundation/example/pubspec.yaml b/packages/camera/camera_avfoundation/example/pubspec.yaml
index 89ec765581b1..3332e37c0e1f 100644
--- a/packages/camera/camera_avfoundation/example/pubspec.yaml
+++ b/packages/camera/camera_avfoundation/example/pubspec.yaml
@@ -18,7 +18,6 @@ dependencies:
   flutter:
     sdk: flutter
   path_provider: ^2.0.0
-  quiver: ^3.0.0
   video_player: ^2.1.4
 
 dev_dependencies:
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 ab6285bce82c..4146d93079b4 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,6 +1,7 @@
 ## NEXT
 
 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
+* Drop dependency on `package:quiver`.
 
 ## 2.4.2
 
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 13568c80b330..5c74450b4806 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
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/widgets.dart';
-import 'package:quiver/core.dart';
 
 /// Default configuration options to use when signing in.
 ///
@@ -132,8 +131,8 @@ class GoogleSignInUserData {
   @override
   // TODO(stuartmorgan): Make this class immutable in the next breaking change.
   // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  int get hashCode => hashObjects(
-      <String?>[displayName, email, id, photoUrl, idToken, serverAuthCode]);
+  int get hashCode =>
+      Object.hash(displayName, email, id, photoUrl, idToken, serverAuthCode);
 
   @override
   // TODO(stuartmorgan): Make this class immutable in the next breaking change.
@@ -176,7 +175,7 @@ class GoogleSignInTokenData {
   @override
   // TODO(stuartmorgan): Make this class immutable in the next breaking change.
   // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  int get hashCode => hash3(idToken, accessToken, serverAuthCode);
+  int get hashCode => Object.hash(idToken, accessToken, serverAuthCode);
 
   @override
   // TODO(stuartmorgan): Make this class immutable in the next breaking change.
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 c0387253de83..6050d2f718c4 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,6 @@ dependencies:
   flutter:
     sdk: flutter
   plugin_platform_interface: ^2.1.0
-  quiver: ^3.0.0
 
 dev_dependencies:
   flutter_test:

From 8db2b3196544123794ba535b29816ba397608790 Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Wed, 6 Dec 2023 15:17:14 -0800
Subject: [PATCH 2/2] nit

---
 packages/camera/camera/CHANGELOG.md                             | 2 +-
 packages/camera/camera/pubspec.yaml                             | 2 +-
 .../google_sign_in_platform_interface/CHANGELOG.md              | 2 +-
 .../google_sign_in_platform_interface/pubspec.yaml              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md
index 6f5a604c7ca0..5de97815491a 100644
--- a/packages/camera/camera/CHANGELOG.md
+++ b/packages/camera/camera/CHANGELOG.md
@@ -1,4 +1,4 @@
-## NEXT
+## 0.10.5+6
 
 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
 * Drop unused dependency on `package:quiver`.
diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml
index d72dafe8bfe6..a14fb80eb371 100644
--- a/packages/camera/camera/pubspec.yaml
+++ b/packages/camera/camera/pubspec.yaml
@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
   Dart.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.10.5+5
+version: 0.10.5+6
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
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 4146d93079b4..eba3544dd3b7 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,4 +1,4 @@
-## NEXT
+## 2.4.3
 
 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
 * Drop dependency on `package:quiver`.
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 6050d2f718c4..883d08957d38 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
@@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/google_sign_i
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
 # 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: 2.4.2
+version: 2.4.3
 
 environment:
   sdk: ">=3.0.0 <4.0.0"