Merge branch 'firebase:main' into main

nattapong2041 · web-flow · commit b60b5a6c9b2c · 2026-03-04T23:15:15.000+07:00
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
         with:
           distribution: "temurin"
-          java-version: "17"
+          java-version: "21"
       - name: Enable KVM
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
@@ -101,7 +101,7 @@ jobs:
       - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
         with:
           distribution: "temurin"
-          java-version: "11"
+          java-version: "21"
       - name: 'Free up space'
         run: |
           sudo rm -rf \
@@ -197,7 +197,7 @@ jobs:
       - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
         with:
           distribution: "temurin"
-          java-version: "11"
+          java-version: "21"
       - uses: hendrikmuhs/ccache-action@ed74d11c0b343532753ecead8a951bb09bb34bc9
         name: Xcode Compile Cache
         with:
diff --git a/.github/workflows/issue-labels.yml b/.github/workflows/issue-labels.yml
@@ -16,13 +16,16 @@ jobs:
       - name: Check if the comment is from the OP
         id: check-op
         run: |
-          OP=${{ github.event.issue.user.login }}
-          COMMENTER=${{ github.event.comment.user.login }}
+          OP=${GITHUB_EVENT_ISSUE_USER_LOGIN}
+          COMMENTER=${GITHUB_EVENT_COMMENT_USER_LOGIN}
           if [ "$OP" = "$COMMENTER" ]; then
             echo "op_comment=true" >> $GITHUB_ENV
           else
             echo "op_comment=false" >> $GITHUB_ENV
           fi
+        env:
+          GITHUB_EVENT_ISSUE_USER_LOGIN: ${{ github.event.issue.user.login }}
+          GITHUB_EVENT_COMMENT_USER_LOGIN: ${{ github.event.comment.user.login }}
       - name: Add 'Needs Attention' label if OP responded
         if: env.op_comment == 'true'
         uses: actions-ecosystem/action-add-labels@v1
@@ -48,4 +51,4 @@ jobs:
         with:
           labels: 'Needs Attention'
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -57,14 +57,18 @@ jobs:
         if: matrix.target == 'html'
         run: |
           melos exec \
-            --scope=${{ matrix.package }}* \
+            --scope=${MATRIX_PACKAGE}* \
             --dir-exists="test" \
             --fail-fast -- "flutter test --platform chrome"
+        env:
+          MATRIX_PACKAGE: ${{ matrix.package }}
 
       - name: Run unit tests
         if: matrix.target == 'io'
         run: |
           melos exec \
-            --scope=${{ matrix.package }}* \
+            --scope=${MATRIX_PACKAGE}* \
             --dir-exists="test" \
             --fail-fast -- "flutter test"
+        env:
+          MATRIX_PACKAGE: ${{ matrix.package }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -136,7 +136,7 @@ These tests require the Firebase Emulator.
 To start the Firebase Emulator, run this command:
 
 ```bash
-firebase emulator:start
+melos emulator:start
 ```
 
 Once the Firebase Emulator is up and running, execute the following Melos command from the terminal:
diff --git a/packages/firebase_ui_auth/example/pubspec.yaml b/packages/firebase_ui_auth/example/pubspec.yaml
@@ -23,8 +23,8 @@ environment:
 dependencies:
   app_tracking_transparency: ^2.0.6
   cupertino_icons: ^1.0.6
-  firebase_auth: ^6.1.1
-  firebase_core: ^4.2.0
+  firebase_auth: ^6.1.3
+  firebase_core: ^4.3.0
   flutter:
     sdk: flutter
   flutter_localizations:
diff --git a/packages/firebase_ui_auth/pubspec.yaml b/packages/firebase_ui_auth/pubspec.yaml
@@ -11,8 +11,8 @@ environment:
 dependencies:
   app_links: ^6.4.0
   email_validator: ^2.1.17
-  firebase_auth: ^6.1.1
-  firebase_core: ^4.2.0
+  firebase_auth: ^6.1.3
+  firebase_core: ^4.3.0
   firebase_ui_localizations: ^2.0.1
   firebase_ui_oauth: ^2.0.1
   firebase_ui_shared: ^1.4.2
diff --git 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: ^4.2.0
-  firebase_database: ^12.0.3
+  firebase_core: ^4.3.0
+  firebase_database: ^12.1.1
 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
@@ -9,7 +9,7 @@ environment:
 
 dependencies:
   collection: ^1.18.0
-  firebase_database: ^12.0.3
+  firebase_database: ^12.1.1
   firebase_ui_localizations: ^2.0.1
   flutter:
     sdk: flutter
diff --git 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: ^2.0.1
-  cloud_firestore: ^6.0.3
+  cloud_firestore: ^6.1.1
   cupertino_icons: ^1.0.6
-  firebase_core: ^4.2.0
+  firebase_core: ^4.3.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
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  cloud_firestore: ^6.0.3
+  cloud_firestore: ^6.1.1
   firebase_ui_localizations: ^2.0.1
   firebase_ui_shared: ^1.4.2
   flutter:
diff --git 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: ^4.2.0
+  firebase_core: ^4.3.0
   firebase_ui_auth: ^3.0.1
   firebase_ui_localizations: ^2.0.1
   flutter:
diff --git a/packages/firebase_ui_localizations/lib/l10n/firebase_ui_nb.arb b/packages/firebase_ui_localizations/lib/l10n/firebase_ui_nb.arb
@@ -529,7 +529,7 @@
     "description": "Confirm delete account button label",
     "placeholders": {}
   },
-  "sendVerificationEmailLabel": "Send verification email",
+  "sendVerificationEmailLabel": "Send e-postbekreftelse",
   "@sendVerificationEmailLabel": {
     "description": "Used as a button label to send a verification email",
     "placeholders": {}
diff --git a/packages/firebase_ui_localizations/lib/src/lang/nb.dart b/packages/firebase_ui_localizations/lib/src/lang/nb.dart
@@ -335,5 +335,5 @@ class NbLocalizations extends FirebaseUILocalizationLabels {
   String get confirmDeleteAccountButtonLabel => "Ja, slett";
 
   @override
-  String get sendVerificationEmailLabel => "Send verification email";
+  String get sendVerificationEmailLabel => "Send e-postbekreftelse";
 }
diff --git 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: ^6.1.1
-  firebase_core: ^4.2.0
+  firebase_auth: ^6.1.3
+  firebase_core: ^4.3.0
   firebase_ui_oauth: ^2.0.1
   firebase_ui_oauth_apple: ^2.0.1
   firebase_ui_oauth_facebook: ^2.0.1
diff --git a/packages/firebase_ui_oauth/lib/src/oauth_provider_button_base.dart b/packages/firebase_ui_oauth/lib/src/oauth_provider_button_base.dart
@@ -388,17 +388,11 @@ class _ButtonContent extends StatelessWidget {
     required this.iconBackgroundColor,
   });
 
-  Widget _buildLoadingIndicator() {
-    return SizedBox(
-      height: fontSize,
-      width: fontSize,
-      child: loadingIndicator,
-    );
-  }
+  static const kEndPadding = 16.0;
 
   @override
   Widget build(BuildContext context) {
-    Widget child = Padding(
+    final icon = Padding(
       padding: EdgeInsets.all(iconPadding),
       child: SvgPicture.string(
         iconSrc,
@@ -407,39 +401,96 @@ class _ButtonContent extends StatelessWidget {
       ),
     );
 
-    if (label.isNotEmpty) {
-      final content = isLoading
-          ? _buildLoadingIndicator()
-          : Text(
-              label,
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                height: 1.1,
-                color: textColor,
-                fontSize: fontSize,
-              ),
-            );
-
-      final isCupertino = CupertinoUserInterfaceLevel.maybeOf(context) != null;
-      final topMargin = isCupertino ? (height - fontSize) / 2 : 0.0;
+    if (label.isEmpty) {
+      if (!isLoading) return icon;
 
-      child = Stack(
-        children: [
-          child,
-          Align(
-            alignment: AlignmentDirectional.center,
-            child: Padding(
-              padding: EdgeInsets.only(top: topMargin),
-              child: content,
-            ),
-          ),
-        ],
+      return SizedBox.square(
+        dimension: fontSize,
+        child: loadingIndicator,
       );
-    } else if (isLoading) {
-      child = _buildLoadingIndicator();
     }
 
-    return child;
+    final text = TextSpan(
+      text: label,
+      style: TextStyle(
+        height: 1.1,
+        color: textColor,
+        fontSize: fontSize,
+      ),
+    );
+
+    return Row(
+      children: [
+        //
+        icon,
+        //
+        Expanded(
+          child: LayoutBuilder(
+            builder: (context, constraints) {
+              //
+              final availableWidth = constraints.maxWidth;
+
+              // "height" is also the button's width
+              final totalIconWidth = height + (iconPadding * 2);
+              final totalButtonWidth =
+                  availableWidth + totalIconWidth + kEndPadding;
+
+              if (isLoading) {
+                // "fontSize" is also the indicator's width
+                final freeSpace = totalButtonWidth - fontSize;
+                final startPadding =
+                    (freeSpace / 2 - totalIconWidth).clamp(0.0, availableWidth);
+
+                return Padding(
+                  padding: EdgeInsetsDirectional.only(
+                    start: startPadding,
+                  ),
+                  child: Align(
+                    alignment: AlignmentDirectional.centerStart,
+                    child: SizedBox.square(
+                      dimension: fontSize,
+                      child: loadingIndicator,
+                    ),
+                  ),
+                );
+              }
+
+              final isCupertino =
+                  CupertinoUserInterfaceLevel.maybeOf(context) != null;
+              final topPadding = isCupertino ? (height - fontSize) / 2 : 0.0;
+
+              final textWidth = (TextPainter(
+                text: text,
+                textDirection: Directionality.of(context),
+                maxLines: 1,
+              )..layout(maxWidth: availableWidth))
+                  .size
+                  .width;
+              final freeSpace = totalButtonWidth - textWidth;
+              final startPadding =
+                  (freeSpace / 2 - totalIconWidth).clamp(0.0, availableWidth);
+
+              return Padding(
+                padding: EdgeInsetsDirectional.only(
+                  top: topPadding,
+                  start: startPadding,
+                ),
+                child: FittedBox(
+                  fit: BoxFit.scaleDown,
+                  alignment: AlignmentDirectional.centerStart,
+                  child: Text.rich(
+                    text,
+                    style: text.style,
+                  ),
+                ),
+              );
+            },
+          ),
+        ),
+        //
+        const SizedBox(width: kEndPadding),
+      ],
+    );
   }
 }
 
diff --git a/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart b/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart
@@ -2,8 +2,7 @@
 // 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.
 
-import 'package:flutter/widgets.dart';
-
+import 'package:flutter/material.dart';
 import 'package:firebase_ui_shared/firebase_ui_shared.dart';
 import 'package:flutter_svg/svg.dart';
 
diff --git 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.16
-  firebase_auth: ^6.1.1
+  firebase_auth: ^6.1.3
   firebase_ui_auth: ^3.0.1
   firebase_ui_shared: ^1.4.2
   flutter_svg: ^2.0.9
diff --git a/packages/firebase_ui_oauth/test/flutterfire_ui_oauth_test.dart b/packages/firebase_ui_oauth/test/flutterfire_ui_oauth_test.dart
@@ -205,11 +205,13 @@ void main() {
           home: Scaffold(
             body: Row(
               children: [
-                OAuthProviderButtonBase(
-                  provider: provider,
-                  auth: FakeAuth(),
-                  label: 'Sign in with Fake provider',
-                  loadingIndicator: const CircularProgressIndicator(),
+                Expanded(
+                  child: OAuthProviderButtonBase(
+                    provider: provider,
+                    auth: FakeAuth(),
+                    label: 'Sign in with Fake provider',
+                    loadingIndicator: const CircularProgressIndicator(),
+                  ),
                 )
               ],
             ),
diff --git 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: ^6.1.1
+  firebase_auth: ^6.1.3
   firebase_ui_oauth: ^2.0.1
   flutter:
     sdk: flutter
diff --git 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: ^6.1.1
+  firebase_auth: ^6.1.3
   firebase_ui_oauth: ^2.0.1
   flutter:
     sdk: flutter
diff --git 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: ^6.1.1
+  firebase_auth: ^6.1.3
   firebase_ui_oauth: ^2.0.1
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_oauth_twitter/pubspec.yaml b/packages/firebase_ui_oauth_twitter/pubspec.yaml
diff --git a/packages/firebase_ui_shared/lib/src/themed.dart b/packages/firebase_ui_shared/lib/src/themed.dart
diff --git a/packages/firebase_ui_storage/example/pubspec.yaml b/packages/firebase_ui_storage/example/pubspec.yaml
diff --git a/packages/firebase_ui_storage/pubspec.yaml b/packages/firebase_ui_storage/pubspec.yaml
diff --git a/tests/ios/Podfile b/tests/ios/Podfile
diff --git a/tests/macos/Podfile b/tests/macos/Podfile
diff --git a/tests/pubspec.yaml b/tests/pubspec.yaml
