From ea06ba6c8c4cfbbee6d11db6fd115a0bf432037f Mon Sep 17 00:00:00 2001
From: russellwheatley <russellwheatley85@gmail.com>
Date: Wed, 8 Jan 2025 10:56:04 +0000
Subject: [PATCH 01/10] test(ui_oauth, ui_storage): fix tests which use
 deprecated API

---
 .../firebase_ui_oauth/test/flutterfire_ui_oauth_test.dart   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/firebase_ui_oauth/test/flutterfire_ui_oauth_test.dart b/packages/firebase_ui_oauth/test/flutterfire_ui_oauth_test.dart
index bc7ac3701..99c200663 100644
--- a/packages/firebase_ui_oauth/test/flutterfire_ui_oauth_test.dart
+++ b/packages/firebase_ui_oauth/test/flutterfire_ui_oauth_test.dart
@@ -138,7 +138,7 @@ void main() {
       final expectedColor = style.backgroundColor.getValue(Brightness.dark);
 
       final containerFinder = find.byWidgetPredicate((widget) {
-        return widget is Material && widget.color!.value == expectedColor.value;
+        return widget is Material && widget.color!.r == expectedColor.r && widget.color!.g == expectedColor.g && widget.color!.b == expectedColor.b;
       });
 
       expect(containerFinder, findsOneWidget);
@@ -150,8 +150,8 @@ void main() {
       final textFinder = find.byWidgetPredicate(
         (widget) =>
             widget is Text &&
-            widget.style!.color!.value ==
-                style.color.getValue(Brightness.dark).value,
+            widget.style!.color!.r ==
+                style.color.getValue(Brightness.dark).r && widget.style!.color!.g == style.color.getValue(Brightness.dark).g && widget.style!.color!.b == style.color.getValue(Brightness.dark).b,
       );
 
       expect(textFinder, findsOneWidget);

From 0acca44c2ccb79a3cb936904212a8de20a5ca14e Mon Sep 17 00:00:00 2001
From: russellwheatley <russellwheatley85@gmail.com>
Date: Wed, 8 Jan 2025 11:16:09 +0000
Subject: [PATCH 02/10] chore(ui_oauth, storage): replace deprecated API

---
 .../test/flutterfire_ui_oauth_test.dart       | 10 +++++---
 .../lib/src/widgets/image.dart                | 24 ++++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/packages/firebase_ui_oauth/test/flutterfire_ui_oauth_test.dart b/packages/firebase_ui_oauth/test/flutterfire_ui_oauth_test.dart
index 99c200663..b80f14805 100644
--- a/packages/firebase_ui_oauth/test/flutterfire_ui_oauth_test.dart
+++ b/packages/firebase_ui_oauth/test/flutterfire_ui_oauth_test.dart
@@ -138,7 +138,10 @@ void main() {
       final expectedColor = style.backgroundColor.getValue(Brightness.dark);
 
       final containerFinder = find.byWidgetPredicate((widget) {
-        return widget is Material && widget.color!.r == expectedColor.r && widget.color!.g == expectedColor.g && widget.color!.b == expectedColor.b;
+        return widget is Material &&
+            widget.color!.r == expectedColor.r &&
+            widget.color!.g == expectedColor.g &&
+            widget.color!.b == expectedColor.b;
       });
 
       expect(containerFinder, findsOneWidget);
@@ -150,8 +153,9 @@ void main() {
       final textFinder = find.byWidgetPredicate(
         (widget) =>
             widget is Text &&
-            widget.style!.color!.r ==
-                style.color.getValue(Brightness.dark).r && widget.style!.color!.g == style.color.getValue(Brightness.dark).g && widget.style!.color!.b == style.color.getValue(Brightness.dark).b,
+            widget.style!.color!.r == style.color.getValue(Brightness.dark).r &&
+            widget.style!.color!.g == style.color.getValue(Brightness.dark).g &&
+            widget.style!.color!.b == style.color.getValue(Brightness.dark).b,
       );
 
       expect(textFinder, findsOneWidget);
diff --git a/packages/firebase_ui_storage/lib/src/widgets/image.dart b/packages/firebase_ui_storage/lib/src/widgets/image.dart
index ac83944fe..bf0b64700 100644
--- a/packages/firebase_ui_storage/lib/src/widgets/image.dart
+++ b/packages/firebase_ui_storage/lib/src/widgets/image.dart
@@ -438,7 +438,13 @@ class _SolidColorLoadingStateVariantPlaceholder extends StatelessWidget {
       return color!;
     }
 
-    return Theme.of(context).colorScheme.surfaceTint.withOpacity(0.12);
+    final themeColor = Theme.of(context).colorScheme.surfaceTint;
+    return themeColor.withValues(
+      red: themeColor.r,
+      green: themeColor.g,
+      blue: themeColor.b,
+      alpha: (0.12 * 255),
+    );
   }
 
   @override
@@ -588,8 +594,20 @@ class __ShimmerLoadingStateVariantPlaceholderState
 
   @override
   Widget build(BuildContext context) {
-    final a = Theme.of(context).colorScheme.surfaceTint.withOpacity(0.12);
-    final b = Theme.of(context).colorScheme.surfaceTint.withOpacity(0.24);
+    final themeColor = Theme.of(context).colorScheme.surfaceTint;
+    final a = themeColor.withValues(
+      red: themeColor.r,
+      green: themeColor.g,
+      blue: themeColor.b,
+      alpha: (0.12 * 255),
+    );
+
+    final b = themeColor.withValues(
+      red: themeColor.r,
+      green: themeColor.g,
+      blue: themeColor.b,
+      alpha: (0.24 * 255),
+    );
 
     final (lighter, darker) = switch (Theme.of(context).brightness) {
       Brightness.light => (a, b),

From 2f3ec64d9b45ba75d9117cac9d9de27bd26f6dcd Mon Sep 17 00:00:00 2001
From: russellwheatley <russellwheatley85@gmail.com>
Date: Wed, 8 Jan 2025 11:28:41 +0000
Subject: [PATCH 03/10] chore: bump dependencies

---
 packages/firebase_ui_auth/example/pubspec.yaml          | 4 ++--
 packages/firebase_ui_auth/pubspec.yaml                  | 6 +++---
 packages/firebase_ui_database/example/pubspec.yaml      | 4 ++--
 packages/firebase_ui_database/pubspec.yaml              | 2 +-
 packages/firebase_ui_firestore/example/pubspec.yaml     | 4 ++--
 packages/firebase_ui_firestore/pubspec.yaml             | 2 +-
 packages/firebase_ui_localizations/example/pubspec.yaml | 2 +-
 packages/firebase_ui_oauth/example/pubspec.yaml         | 4 ++--
 packages/firebase_ui_oauth/pubspec.yaml                 | 2 +-
 packages/firebase_ui_oauth_apple/pubspec.yaml           | 2 +-
 packages/firebase_ui_oauth_facebook/pubspec.yaml        | 2 +-
 packages/firebase_ui_oauth_google/pubspec.yaml          | 2 +-
 packages/firebase_ui_oauth_twitter/pubspec.yaml         | 2 +-
 packages/firebase_ui_storage/example/pubspec.yaml       | 4 ++--
 packages/firebase_ui_storage/pubspec.yaml               | 2 +-
 tests/pubspec.yaml                                      | 8 ++++----
 16 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/firebase_ui_auth/example/pubspec.yaml b/packages/firebase_ui_auth/example/pubspec.yaml
index f69992b45..f1ee17166 100644
--- a/packages/firebase_ui_auth/example/pubspec.yaml
+++ b/packages/firebase_ui_auth/example/pubspec.yaml
@@ -22,8 +22,8 @@ environment:
 
 dependencies:
   cupertino_icons: ^1.0.6
-  firebase_auth: ^5.3.2
-  firebase_core: ^3.7.0
+  firebase_auth: ^5.3.4
+  firebase_core: ^3.9.0
   flutter:
     sdk: flutter
   flutter_localizations:
diff --git a/packages/firebase_ui_auth/pubspec.yaml b/packages/firebase_ui_auth/pubspec.yaml
index 31660bb4e..8df11c698 100644
--- a/packages/firebase_ui_auth/pubspec.yaml
+++ b/packages/firebase_ui_auth/pubspec.yaml
@@ -10,9 +10,9 @@ environment:
 
 dependencies:
   email_validator: ^2.1.17
-  firebase_auth: ^5.3.2
-  firebase_core: ^3.7.0
-  firebase_dynamic_links: ^6.0.9
+  firebase_auth: ^5.3.4
+  firebase_core: ^3.9.0
+  firebase_dynamic_links: ^6.0.11
   firebase_ui_localizations: ^1.13.0
   firebase_ui_oauth: ^1.6.0
   firebase_ui_shared: ^1.4.1
diff --git a/packages/firebase_ui_database/example/pubspec.yaml b/packages/firebase_ui_database/example/pubspec.yaml
index e497ad476..f72bf993d 100644
--- a/packages/firebase_ui_database/example/pubspec.yaml
+++ b/packages/firebase_ui_database/example/pubspec.yaml
@@ -33,8 +33,8 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
-  firebase_core: ^3.7.0
-  firebase_database: ^11.1.5
+  firebase_core: ^3.9.0
+  firebase_database: ^11.2.0
 dev_dependencies:
   drive: ^1.0.0-1.0.nullsafety.5
   flutter_test:
diff --git a/packages/firebase_ui_database/pubspec.yaml b/packages/firebase_ui_database/pubspec.yaml
index 8a651e134..5608ff7ed 100644
--- a/packages/firebase_ui_database/pubspec.yaml
+++ b/packages/firebase_ui_database/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 
 dependencies:
   collection: ^1.18.0
-  firebase_database: ^11.1.5
+  firebase_database: ^11.2.0
   firebase_ui_localizations: ^1.13.0
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_firestore/example/pubspec.yaml b/packages/firebase_ui_firestore/example/pubspec.yaml
index 9d4848160..3391b96d4 100644
--- a/packages/firebase_ui_firestore/example/pubspec.yaml
+++ b/packages/firebase_ui_firestore/example/pubspec.yaml
@@ -30,9 +30,9 @@ dependencies:
   flutter:
     sdk: flutter
   firebase_ui_firestore: ^1.7.0
-  cloud_firestore: ^5.4.5
+  cloud_firestore: ^5.6.0
   cupertino_icons: ^1.0.6
-  firebase_core: ^3.7.0
+  firebase_core: ^3.9.0
 dev_dependencies:
   drive: ^1.0.0-1.0.nullsafety.5
   flutter_test:
diff --git a/packages/firebase_ui_firestore/pubspec.yaml b/packages/firebase_ui_firestore/pubspec.yaml
index 4b7997dd8..0376848bb 100644
--- a/packages/firebase_ui_firestore/pubspec.yaml
+++ b/packages/firebase_ui_firestore/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  cloud_firestore: ^5.4.5
+  cloud_firestore: ^5.6.0
   firebase_ui_localizations: ^1.13.0
   firebase_ui_shared: ^1.4.1
   flutter:
diff --git a/packages/firebase_ui_localizations/example/pubspec.yaml b/packages/firebase_ui_localizations/example/pubspec.yaml
index 42e9310a1..514bbc13b 100644
--- a/packages/firebase_ui_localizations/example/pubspec.yaml
+++ b/packages/firebase_ui_localizations/example/pubspec.yaml
@@ -31,7 +31,7 @@ environment:
 dependencies:
   cupertino_icons: ^1.0.6
 
-  firebase_core: ^3.7.0
+  firebase_core: ^3.9.0
   firebase_ui_auth: ^1.16.0
   firebase_ui_localizations: ^1.13.0
   flutter:
diff --git a/packages/firebase_ui_oauth/example/pubspec.yaml b/packages/firebase_ui_oauth/example/pubspec.yaml
index b18a60356..38474ea58 100644
--- a/packages/firebase_ui_oauth/example/pubspec.yaml
+++ b/packages/firebase_ui_oauth/example/pubspec.yaml
@@ -33,8 +33,8 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
-  firebase_auth: ^5.3.2
-  firebase_core: ^3.7.0
+  firebase_auth: ^5.3.4
+  firebase_core: ^3.9.0
   firebase_ui_oauth: ^1.6.0
   firebase_ui_oauth_apple: ^1.3.0
   firebase_ui_oauth_facebook: ^1.3.0
diff --git a/packages/firebase_ui_oauth/pubspec.yaml b/packages/firebase_ui_oauth/pubspec.yaml
index 1776c2e09..f4681c415 100644
--- a/packages/firebase_ui_oauth/pubspec.yaml
+++ b/packages/firebase_ui_oauth/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 
 dependencies:
   desktop_webview_auth: ^0.0.14
-  firebase_auth: ^5.3.2
+  firebase_auth: ^5.3.4
   firebase_ui_auth: ^1.16.0
   firebase_ui_shared: ^1.4.1
   flutter_svg: ^2.0.9
diff --git a/packages/firebase_ui_oauth_apple/pubspec.yaml b/packages/firebase_ui_oauth_apple/pubspec.yaml
index 45407f5ec..c66996903 100644
--- a/packages/firebase_ui_oauth_apple/pubspec.yaml
+++ b/packages/firebase_ui_oauth_apple/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  firebase_auth: ^5.3.2
+  firebase_auth: ^5.3.4
   firebase_ui_oauth: ^1.6.0
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_oauth_facebook/pubspec.yaml b/packages/firebase_ui_oauth_facebook/pubspec.yaml
index 0bf8e9867..a95a4daa5 100644
--- a/packages/firebase_ui_oauth_facebook/pubspec.yaml
+++ b/packages/firebase_ui_oauth_facebook/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  firebase_auth: ^5.3.2
+  firebase_auth: ^5.3.4
   firebase_ui_oauth: ^1.6.0
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_oauth_google/pubspec.yaml b/packages/firebase_ui_oauth_google/pubspec.yaml
index 84740ca80..018e3a961 100644
--- a/packages/firebase_ui_oauth_google/pubspec.yaml
+++ b/packages/firebase_ui_oauth_google/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  firebase_auth: ^5.3.2
+  firebase_auth: ^5.3.4
   firebase_ui_oauth: ^1.6.0
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_oauth_twitter/pubspec.yaml b/packages/firebase_ui_oauth_twitter/pubspec.yaml
index 6d762c9f4..add006f22 100644
--- a/packages/firebase_ui_oauth_twitter/pubspec.yaml
+++ b/packages/firebase_ui_oauth_twitter/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_auth: ^5.3.2
+  firebase_auth: ^5.3.4
   firebase_ui_oauth: ^1.6.0
   twitter_login: ^4.4.2
 
diff --git a/packages/firebase_ui_storage/example/pubspec.yaml b/packages/firebase_ui_storage/example/pubspec.yaml
index d889205a5..3b7030b45 100644
--- a/packages/firebase_ui_storage/example/pubspec.yaml
+++ b/packages/firebase_ui_storage/example/pubspec.yaml
@@ -9,8 +9,8 @@ environment:
 dependencies:
   cupertino_icons: ^1.0.6
   file_picker: ^6.1.1
-  firebase_core: ^3.7.0
-  firebase_storage: ^12.3.5
+  firebase_core: ^3.9.0
+  firebase_storage: ^12.3.7
   firebase_ui_storage: ^2.1.0
   firebase_ui_shared: ^1.4.1
 
diff --git a/packages/firebase_ui_storage/pubspec.yaml b/packages/firebase_ui_storage/pubspec.yaml
index ff36b9d3c..71cb0ae51 100644
--- a/packages/firebase_ui_storage/pubspec.yaml
+++ b/packages/firebase_ui_storage/pubspec.yaml
@@ -13,7 +13,7 @@ false_secrets:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_storage: ^12.3.5
+  firebase_storage: ^12.3.7
   firebase_ui_localizations: ^1.13.0
   firebase_ui_shared: ^1.4.1
   path: ^1.8.3
diff --git a/tests/pubspec.yaml b/tests/pubspec.yaml
index 5d06b7457..02ecd2016 100644
--- a/tests/pubspec.yaml
+++ b/tests/pubspec.yaml
@@ -10,8 +10,8 @@ dependencies:
   flutter:
     sdk: flutter
   cupertino_icons: ^1.0.6
-  firebase_auth: ^5.3.2
-  firebase_core: ^3.7.0
+  firebase_auth: ^5.3.4
+  firebase_core: ^3.9.0
   firebase_ui_auth: ^1.16.0
   firebase_ui_localizations: ^1.13.0
   firebase_ui_oauth_apple: ^1.3.0
@@ -21,12 +21,12 @@ dependencies:
   flutter_facebook_auth: ^6.0.3
   twitter_login: ^4.4.2
   firebase_ui_oauth_twitter: ^1.3.0
-  cloud_firestore: ^5.4.5
+  cloud_firestore: ^5.6.0
   firebase_ui_firestore: ^1.7.0
   http: ^1.1.2
   google_sign_in: ^6.2.1
   firebase_ui_shared: ^1.4.1
-  firebase_database: ^11.1.5
+  firebase_database: ^11.2.0
   firebase_ui_database: ^1.5.0
 
 dev_dependencies:

From 65029e053a85eccd11b7d590f27962ccbec80ade Mon Sep 17 00:00:00 2001
From: russellwheatley <russellwheatley85@gmail.com>
Date: Wed, 8 Jan 2025 14:14:48 +0000
Subject: [PATCH 04/10] bump FlutterFire dependencies

---
 packages/firebase_ui_auth/example/pubspec.yaml          | 4 ++--
 packages/firebase_ui_auth/pubspec.yaml                  | 6 +++---
 packages/firebase_ui_database/example/pubspec.yaml      | 4 ++--
 packages/firebase_ui_database/pubspec.yaml              | 2 +-
 packages/firebase_ui_firestore/example/pubspec.yaml     | 4 ++--
 packages/firebase_ui_firestore/pubspec.yaml             | 2 +-
 packages/firebase_ui_localizations/example/pubspec.yaml | 2 +-
 packages/firebase_ui_oauth/example/pubspec.yaml         | 4 ++--
 packages/firebase_ui_oauth/pubspec.yaml                 | 2 +-
 packages/firebase_ui_oauth_apple/pubspec.yaml           | 2 +-
 packages/firebase_ui_oauth_facebook/pubspec.yaml        | 2 +-
 packages/firebase_ui_oauth_google/pubspec.yaml          | 2 +-
 packages/firebase_ui_oauth_twitter/pubspec.yaml         | 2 +-
 packages/firebase_ui_storage/example/pubspec.yaml       | 4 ++--
 packages/firebase_ui_storage/pubspec.yaml               | 2 +-
 tests/ios/Podfile                                       | 2 +-
 tests/macos/Podfile                                     | 2 +-
 tests/pubspec.yaml                                      | 8 ++++----
 18 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/packages/firebase_ui_auth/example/pubspec.yaml b/packages/firebase_ui_auth/example/pubspec.yaml
index f1ee17166..b6baf3b0a 100644
--- a/packages/firebase_ui_auth/example/pubspec.yaml
+++ b/packages/firebase_ui_auth/example/pubspec.yaml
@@ -22,8 +22,8 @@ environment:
 
 dependencies:
   cupertino_icons: ^1.0.6
-  firebase_auth: ^5.3.4
-  firebase_core: ^3.9.0
+  firebase_auth: ^5.4.0
+  firebase_core: ^3.10.0
   flutter:
     sdk: flutter
   flutter_localizations:
diff --git a/packages/firebase_ui_auth/pubspec.yaml b/packages/firebase_ui_auth/pubspec.yaml
index 8df11c698..a5d56fab4 100644
--- a/packages/firebase_ui_auth/pubspec.yaml
+++ b/packages/firebase_ui_auth/pubspec.yaml
@@ -10,9 +10,9 @@ environment:
 
 dependencies:
   email_validator: ^2.1.17
-  firebase_auth: ^5.3.4
-  firebase_core: ^3.9.0
-  firebase_dynamic_links: ^6.0.11
+  firebase_auth: ^5.4.0
+  firebase_core: ^3.10.0
+  firebase_dynamic_links: ^6.1.0
   firebase_ui_localizations: ^1.13.0
   firebase_ui_oauth: ^1.6.0
   firebase_ui_shared: ^1.4.1
diff --git a/packages/firebase_ui_database/example/pubspec.yaml b/packages/firebase_ui_database/example/pubspec.yaml
index f72bf993d..a5d52d620 100644
--- a/packages/firebase_ui_database/example/pubspec.yaml
+++ b/packages/firebase_ui_database/example/pubspec.yaml
@@ -33,8 +33,8 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
-  firebase_core: ^3.9.0
-  firebase_database: ^11.2.0
+  firebase_core: ^3.10.0
+  firebase_database: ^11.3.0
 dev_dependencies:
   drive: ^1.0.0-1.0.nullsafety.5
   flutter_test:
diff --git a/packages/firebase_ui_database/pubspec.yaml b/packages/firebase_ui_database/pubspec.yaml
index 5608ff7ed..6b95794da 100644
--- a/packages/firebase_ui_database/pubspec.yaml
+++ b/packages/firebase_ui_database/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 
 dependencies:
   collection: ^1.18.0
-  firebase_database: ^11.2.0
+  firebase_database: ^11.3.0
   firebase_ui_localizations: ^1.13.0
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_firestore/example/pubspec.yaml b/packages/firebase_ui_firestore/example/pubspec.yaml
index 3391b96d4..9917d9e1e 100644
--- a/packages/firebase_ui_firestore/example/pubspec.yaml
+++ b/packages/firebase_ui_firestore/example/pubspec.yaml
@@ -30,9 +30,9 @@ dependencies:
   flutter:
     sdk: flutter
   firebase_ui_firestore: ^1.7.0
-  cloud_firestore: ^5.6.0
+  cloud_firestore: ^5.6.1
   cupertino_icons: ^1.0.6
-  firebase_core: ^3.9.0
+  firebase_core: ^3.10.0
 dev_dependencies:
   drive: ^1.0.0-1.0.nullsafety.5
   flutter_test:
diff --git a/packages/firebase_ui_firestore/pubspec.yaml b/packages/firebase_ui_firestore/pubspec.yaml
index 0376848bb..4ee3fbea5 100644
--- a/packages/firebase_ui_firestore/pubspec.yaml
+++ b/packages/firebase_ui_firestore/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  cloud_firestore: ^5.6.0
+  cloud_firestore: ^5.6.1
   firebase_ui_localizations: ^1.13.0
   firebase_ui_shared: ^1.4.1
   flutter:
diff --git a/packages/firebase_ui_localizations/example/pubspec.yaml b/packages/firebase_ui_localizations/example/pubspec.yaml
index 514bbc13b..c5a83bb0d 100644
--- a/packages/firebase_ui_localizations/example/pubspec.yaml
+++ b/packages/firebase_ui_localizations/example/pubspec.yaml
@@ -31,7 +31,7 @@ environment:
 dependencies:
   cupertino_icons: ^1.0.6
 
-  firebase_core: ^3.9.0
+  firebase_core: ^3.10.0
   firebase_ui_auth: ^1.16.0
   firebase_ui_localizations: ^1.13.0
   flutter:
diff --git a/packages/firebase_ui_oauth/example/pubspec.yaml b/packages/firebase_ui_oauth/example/pubspec.yaml
index 38474ea58..9ba3bf3f2 100644
--- a/packages/firebase_ui_oauth/example/pubspec.yaml
+++ b/packages/firebase_ui_oauth/example/pubspec.yaml
@@ -33,8 +33,8 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
-  firebase_auth: ^5.3.4
-  firebase_core: ^3.9.0
+  firebase_auth: ^5.4.0
+  firebase_core: ^3.10.0
   firebase_ui_oauth: ^1.6.0
   firebase_ui_oauth_apple: ^1.3.0
   firebase_ui_oauth_facebook: ^1.3.0
diff --git a/packages/firebase_ui_oauth/pubspec.yaml b/packages/firebase_ui_oauth/pubspec.yaml
index f4681c415..60cde5c44 100644
--- a/packages/firebase_ui_oauth/pubspec.yaml
+++ b/packages/firebase_ui_oauth/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 
 dependencies:
   desktop_webview_auth: ^0.0.14
-  firebase_auth: ^5.3.4
+  firebase_auth: ^5.4.0
   firebase_ui_auth: ^1.16.0
   firebase_ui_shared: ^1.4.1
   flutter_svg: ^2.0.9
diff --git a/packages/firebase_ui_oauth_apple/pubspec.yaml b/packages/firebase_ui_oauth_apple/pubspec.yaml
index c66996903..cd9057d46 100644
--- a/packages/firebase_ui_oauth_apple/pubspec.yaml
+++ b/packages/firebase_ui_oauth_apple/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  firebase_auth: ^5.3.4
+  firebase_auth: ^5.4.0
   firebase_ui_oauth: ^1.6.0
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_oauth_facebook/pubspec.yaml b/packages/firebase_ui_oauth_facebook/pubspec.yaml
index a95a4daa5..94f0fa092 100644
--- a/packages/firebase_ui_oauth_facebook/pubspec.yaml
+++ b/packages/firebase_ui_oauth_facebook/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  firebase_auth: ^5.3.4
+  firebase_auth: ^5.4.0
   firebase_ui_oauth: ^1.6.0
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_oauth_google/pubspec.yaml b/packages/firebase_ui_oauth_google/pubspec.yaml
index 018e3a961..2869dc304 100644
--- a/packages/firebase_ui_oauth_google/pubspec.yaml
+++ b/packages/firebase_ui_oauth_google/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  firebase_auth: ^5.3.4
+  firebase_auth: ^5.4.0
   firebase_ui_oauth: ^1.6.0
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_oauth_twitter/pubspec.yaml b/packages/firebase_ui_oauth_twitter/pubspec.yaml
index add006f22..4f0c68a06 100644
--- a/packages/firebase_ui_oauth_twitter/pubspec.yaml
+++ b/packages/firebase_ui_oauth_twitter/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_auth: ^5.3.4
+  firebase_auth: ^5.4.0
   firebase_ui_oauth: ^1.6.0
   twitter_login: ^4.4.2
 
diff --git a/packages/firebase_ui_storage/example/pubspec.yaml b/packages/firebase_ui_storage/example/pubspec.yaml
index 3b7030b45..23a71730f 100644
--- a/packages/firebase_ui_storage/example/pubspec.yaml
+++ b/packages/firebase_ui_storage/example/pubspec.yaml
@@ -9,8 +9,8 @@ environment:
 dependencies:
   cupertino_icons: ^1.0.6
   file_picker: ^6.1.1
-  firebase_core: ^3.9.0
-  firebase_storage: ^12.3.7
+  firebase_core: ^3.10.0
+  firebase_storage: ^12.4.0
   firebase_ui_storage: ^2.1.0
   firebase_ui_shared: ^1.4.1
 
diff --git a/packages/firebase_ui_storage/pubspec.yaml b/packages/firebase_ui_storage/pubspec.yaml
index 71cb0ae51..5a6b2b13a 100644
--- a/packages/firebase_ui_storage/pubspec.yaml
+++ b/packages/firebase_ui_storage/pubspec.yaml
@@ -13,7 +13,7 @@ false_secrets:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_storage: ^12.3.7
+  firebase_storage: ^12.4.0
   firebase_ui_localizations: ^1.13.0
   firebase_ui_shared: ^1.4.1
   path: ^1.8.3
diff --git a/tests/ios/Podfile b/tests/ios/Podfile
index f39af1eb1..0bfe04771 100644
--- a/tests/ios/Podfile
+++ b/tests/ios/Podfile
@@ -29,7 +29,7 @@ flutter_ios_podfile_setup
 target 'Runner' do
   use_frameworks!
   use_modular_headers!
-  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '11.4.0'
+  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '11.6.0'
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
   target 'RunnerTests' do
diff --git a/tests/macos/Podfile b/tests/macos/Podfile
index 2713a4228..e7cea55ac 100644
--- a/tests/macos/Podfile
+++ b/tests/macos/Podfile
@@ -30,7 +30,7 @@ target 'Runner' do
   use_frameworks!
   use_modular_headers!
 
-  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '11.4.0'
+  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '11.6.0'
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
   target 'RunnerTests' do
diff --git a/tests/pubspec.yaml b/tests/pubspec.yaml
index 02ecd2016..e278d7ee6 100644
--- a/tests/pubspec.yaml
+++ b/tests/pubspec.yaml
@@ -10,8 +10,8 @@ dependencies:
   flutter:
     sdk: flutter
   cupertino_icons: ^1.0.6
-  firebase_auth: ^5.3.4
-  firebase_core: ^3.9.0
+  firebase_auth: ^5.4.0
+  firebase_core: ^3.10.0
   firebase_ui_auth: ^1.16.0
   firebase_ui_localizations: ^1.13.0
   firebase_ui_oauth_apple: ^1.3.0
@@ -21,12 +21,12 @@ dependencies:
   flutter_facebook_auth: ^6.0.3
   twitter_login: ^4.4.2
   firebase_ui_oauth_twitter: ^1.3.0
-  cloud_firestore: ^5.6.0
+  cloud_firestore: ^5.6.1
   firebase_ui_firestore: ^1.7.0
   http: ^1.1.2
   google_sign_in: ^6.2.1
   firebase_ui_shared: ^1.4.1
-  firebase_database: ^11.2.0
+  firebase_database: ^11.3.0
   firebase_ui_database: ^1.5.0
 
 dev_dependencies:

From ce99aa7c38f39f970e59728ba20c47b62a3d00b7 Mon Sep 17 00:00:00 2001
From: russellwheatley <russellwheatley85@gmail.com>
Date: Wed, 8 Jan 2025 14:32:02 +0000
Subject: [PATCH 05/10] test(android): update AGP for test runner

---
 tests/android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/android/build.gradle b/tests/android/build.gradle
index 0391438f4..1218c388c 100644
--- a/tests/android/build.gradle
+++ b/tests/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         // START: FlutterFire Configuration
         classpath 'com.google.gms:google-services:4.3.10'
         // END: FlutterFire Configuration

From 9246b8aa71aef8ef35c9acfa62dbe9e576901e34 Mon Sep 17 00:00:00 2001
From: russellwheatley <russellwheatley85@gmail.com>
Date: Wed, 8 Jan 2025 14:34:33 +0000
Subject: [PATCH 06/10] test(ios): fix invalid device on iOS test runner

---
 .github/workflows/e2e.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index a4f6cca51..62d4d8440 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -168,16 +168,16 @@ jobs:
           npm i
           npm run build
           ../scripts/start-firebase-emulator.sh
+      - uses: futureware-tech/simulator-action@bde6805eedaeaba7775a9959970edc7d8bf10c4d
+        id: simulator
+        with:
+          # List of available simulators: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md#installed-simulators
+          model: "iPhone 15"
       - name: "E2E Tests"
         working-directory: tests
+        env:
+          SIMULATOR: ${{ steps.simulator.outputs.udid }}        
         run: |
-          # Boot simulator and wait for System app to be ready.
-          # List of available simulators: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#installed-simulators
-          SIMULATOR="iPhone 14"
-          xcrun simctl bootstatus "$SIMULATOR" -b
-          xcrun simctl logverbose "$SIMULATOR" enable
-          # Sleep to allow simulator to settle.
-          sleep 15
           # Uncomment following line to have simulator logs printed out for debugging purposes.
           # xcrun simctl spawn booted log stream --predicate 'eventMessage contains "flutter"' &
           flutter test ./integration_test/firebase_ui_test.dart -d "$SIMULATOR" --dart-define=CI=true

From 090498356e397071593e2739ec2897d249778494 Mon Sep 17 00:00:00 2001
From: russellwheatley <russellwheatley85@gmail.com>
Date: Wed, 8 Jan 2025 15:28:53 +0000
Subject: [PATCH 07/10] test(android): update distributionUrl

---
 tests/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/android/gradle/wrapper/gradle-wrapper.properties b/tests/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c..8bc9958ab 100644
--- a/tests/android/gradle/wrapper/gradle-wrapper.properties
+++ b/tests/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

From 5cb6bfae7983037a06c762ffeabe980778e581db Mon Sep 17 00:00:00 2001
From: russellwheatley <russellwheatley85@gmail.com>
Date: Mon, 13 Jan 2025 11:29:57 +0000
Subject: [PATCH 08/10] chore: downgrade compile version for android

---
 tests/android/app/build.gradle                         | 3 ++-
 tests/android/build.gradle                             | 2 +-
 tests/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle
index 20c3a629f..64593c0eb 100644
--- a/tests/android/app/build.gradle
+++ b/tests/android/app/build.gradle
@@ -24,7 +24,8 @@ if (flutterVersionName == null) {
 
 android {
     namespace "io.flutter.plugins.firebase.tests"
-    compileSdkVersion flutter.compileSdkVersion
+    // use "flutter.compileSdkVersion" and bump AGP once twitter_login has released v4.4.3: https://github.com/0maru/twitter_login/issues/139
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
diff --git a/tests/android/build.gradle b/tests/android/build.gradle
index 1218c388c..0391438f4 100644
--- a/tests/android/build.gradle
+++ b/tests/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         // START: FlutterFire Configuration
         classpath 'com.google.gms:google-services:4.3.10'
         // END: FlutterFire Configuration
diff --git a/tests/android/gradle/wrapper/gradle-wrapper.properties b/tests/android/gradle/wrapper/gradle-wrapper.properties
index 8bc9958ab..3c472b99c 100644
--- a/tests/android/gradle/wrapper/gradle-wrapper.properties
+++ b/tests/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

From 0c68fa7252eb2f1c44de1581557ef5c616beea26 Mon Sep 17 00:00:00 2001
From: russellwheatley <russellwheatley85@gmail.com>
Date: Mon, 13 Jan 2025 11:58:47 +0000
Subject: [PATCH 09/10] rm kotlin test app

---
 tests/android/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/android/build.gradle b/tests/android/build.gradle
index 0391438f4..15c1ed767 100644
--- a/tests/android/build.gradle
+++ b/tests/android/build.gradle
@@ -1,5 +1,4 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()

From a8766087a28911b23eb9d0f0db9ff937f053bc01 Mon Sep 17 00:00:00 2001
From: russellwheatley <russellwheatley85@gmail.com>
Date: Mon, 13 Jan 2025 14:55:12 +0000
Subject: [PATCH 10/10] chore: update gradles for android test runner

---
 tests/android/app/build.gradle | 54 ++++++++++------------------------
 tests/android/build.gradle     | 21 ++-----------
 tests/android/settings.gradle  | 20 ++++++++-----
 3 files changed, 32 insertions(+), 63 deletions(-)

diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle
index 64593c0eb..17467309f 100644
--- a/tests/android/app/build.gradle
+++ b/tests/android/app/build.gradle
@@ -1,68 +1,46 @@
 plugins {
     id "com.android.application"
     id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
-}
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+    id "com.google.gms.google-services"
 }
 
 android {
-    namespace "io.flutter.plugins.firebase.tests"
+    namespace = "io.flutter.plugins.firebase.tests"
     // use "flutter.compileSdkVersion" and bump AGP once twitter_login has released v4.4.3: https://github.com/0maru/twitter_login/issues/139
     compileSdkVersion 34
-    ndkVersion flutter.ndkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "io.flutter.plugins.firebase.tests"
+        applicationId = "io.flutter.plugins.firebase.tests"
         // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 23
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = 23
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
 
     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
+            signingConfig = signingConfigs.debug
         }
     }
 }
 
 flutter {
-    source '../..'
-}
-
-dependencies {}
+    source = "../.."
+}
\ No newline at end of file
diff --git a/tests/android/build.gradle b/tests/android/build.gradle
index 15c1ed767..8e9de9d8f 100644
--- a/tests/android/build.gradle
+++ b/tests/android/build.gradle
@@ -1,18 +1,3 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        // START: FlutterFire Configuration
-        classpath 'com.google.gms:google-services:4.3.10'
-        // END: FlutterFire Configuration
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -20,14 +5,14 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
-}
+}
\ No newline at end of file
diff --git a/tests/android/settings.gradle b/tests/android/settings.gradle
index 55c4ca8b1..c0dcfa11c 100644
--- a/tests/android/settings.gradle
+++ b/tests/android/settings.gradle
@@ -5,16 +5,22 @@ pluginManagement {
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
         return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
+    }()
 
-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-    plugins {
-        id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
     }
 }
 
-include ":app"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "com.google.gms.google-services" version "4.4.2" apply false
+}
 
-apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+include ":app"
\ No newline at end of file