From fcac18d4940abdf789c53ec7d3433ba4d03b224e Mon Sep 17 00:00:00 2001 From: kevmoo Date: Tue, 21 Apr 2026 08:26:04 -0700 Subject: [PATCH 1/3] chore: update example dependencies across repo including fixing the latest lints --- .../cloud_firestore/pipeline_example/pubspec.yaml | 2 +- packages/firebase_ai/firebase_ai/example/pubspec.yaml | 8 ++++---- packages/firebase_ai/firebase_ai/pubspec.yaml | 2 +- .../firebase_app_installations/example/lib/main.dart | 4 ++-- .../firebase_app_installations/example/pubspec.yaml | 2 +- .../firebase_app_installations_platform_interface.dart | 2 -- .../pubspec.yaml | 2 +- .../lib/src/interop/installations_interop.dart | 2 +- .../firebase_app_installations_web/pubspec.yaml | 2 +- packages/firebase_auth/firebase_auth/example/pubspec.yaml | 2 +- .../firebase_data_connect/example/lib/main.dart | 2 +- .../firebase_data_connect/example/pubspec.yaml | 2 +- .../firebase_data_connect/pubspec.yaml | 2 +- .../firebase_database_web/lib/src/interop/database.dart | 2 +- .../firebase_database/firebase_database_web/pubspec.yaml | 2 +- .../firebase_messaging/example/pubspec.yaml | 2 +- .../firebase_ml_model_downloader/example/lib/main.dart | 2 +- .../firebase_ml_model_downloader/example/pubspec.yaml | 2 +- 18 files changed, 21 insertions(+), 23 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/pipeline_example/pubspec.yaml b/packages/cloud_firestore/cloud_firestore/pipeline_example/pubspec.yaml index 3a5b9b2acb1a..5bff723de6c6 100644 --- a/packages/cloud_firestore/cloud_firestore/pipeline_example/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore/pipeline_example/pubspec.yaml @@ -51,7 +51,7 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^4.0.0 + flutter_lints: ^6.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ai/firebase_ai/example/pubspec.yaml b/packages/firebase_ai/firebase_ai/example/pubspec.yaml index 4de1694ae5bf..c407f685e649 100644 --- a/packages/firebase_ai/firebase_ai/example/pubspec.yaml +++ b/packages/firebase_ai/firebase_ai/example/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - camera: ^0.11.2+1 + camera: ^0.12.0+1 camera_macos: ^0.0.9 cupertino_icons: ^1.0.6 firebase_ai: ^3.11.0 @@ -30,8 +30,8 @@ dependencies: flutter: sdk: flutter flutter_animate: ^4.5.2 - flutter_markdown: ^0.6.20 - flutter_soloud: ^3.1.6 + flutter_markdown: ^0.7.7+1 + flutter_soloud: ^4.0.2 image: ^4.5.4 image_picker: ^1.1.2 path_provider: ^2.1.5 @@ -39,7 +39,7 @@ dependencies: waveform_flutter: ^1.2.0 dev_dependencies: - flutter_lints: ^4.0.0 + flutter_lints: ^6.0.0 flutter_test: sdk: flutter diff --git a/packages/firebase_ai/firebase_ai/pubspec.yaml b/packages/firebase_ai/firebase_ai/pubspec.yaml index 6857ad0b0fcd..bdbc9fb8effe 100644 --- a/packages/firebase_ai/firebase_ai/pubspec.yaml +++ b/packages/firebase_ai/firebase_ai/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: web_socket_channel: ^3.0.1 dev_dependencies: - flutter_lints: ^4.0.0 + flutter_lints: ^6.0.0 flutter_test: sdk: flutter matcher: ^0.12.16 diff --git a/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart b/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart index 56332b8cbe82..eb64f6a490f1 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart +++ b/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart @@ -72,7 +72,7 @@ class _InstallationsCardState extends State { String id = 'None'; String authToken = 'None'; - init() async { + Future init() async { await getId(); await getAuthToken(); } @@ -101,7 +101,7 @@ class _InstallationsCardState extends State { } } - Future getAuthToken([forceRefresh = false]) async { + Future getAuthToken([bool forceRefresh = false]) async { try { final token = await FirebaseInstallations.instance.getToken(forceRefresh); setState(() { diff --git a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml index 72a88b7373c6..2533faea74dd 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: sdk: flutter dev_dependencies: - flutter_lints: ^4.0.0 + flutter_lints: ^6.0.0 flutter: uses-material-design: true diff --git a/packages/firebase_app_installations/firebase_app_installations_platform_interface/lib/firebase_app_installations_platform_interface.dart b/packages/firebase_app_installations/firebase_app_installations_platform_interface/lib/firebase_app_installations_platform_interface.dart index 1c0e99358cfb..2dacec194481 100644 --- a/packages/firebase_app_installations/firebase_app_installations_platform_interface/lib/firebase_app_installations_platform_interface.dart +++ b/packages/firebase_app_installations/firebase_app_installations_platform_interface/lib/firebase_app_installations_platform_interface.dart @@ -2,6 +2,4 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -library firebase_app_installations_platform_interface; - export 'src/platform_interface/firebase_app_installations_platform_interface.dart'; diff --git a/packages/firebase_app_installations/firebase_app_installations_platform_interface/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations_platform_interface/pubspec.yaml index 64857f9f4346..9c4c59768c73 100644 --- a/packages/firebase_app_installations/firebase_app_installations_platform_interface/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations_platform_interface/pubspec.yaml @@ -21,4 +21,4 @@ dev_dependencies: firebase_core_platform_interface: ^6.0.3 flutter_test: sdk: flutter - flutter_lints: ^4.0.0 + flutter_lints: ^6.0.0 diff --git a/packages/firebase_app_installations/firebase_app_installations_web/lib/src/interop/installations_interop.dart b/packages/firebase_app_installations/firebase_app_installations_web/lib/src/interop/installations_interop.dart index 64a899e4e9fb..00f72ab66cd8 100644 --- a/packages/firebase_app_installations/firebase_app_installations_web/lib/src/interop/installations_interop.dart +++ b/packages/firebase_app_installations/firebase_app_installations_web/lib/src/interop/installations_interop.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. @JS('firebase_installations') -library firebase_interop.installations; +library; import 'dart:js_interop'; diff --git a/packages/firebase_app_installations/firebase_app_installations_web/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations_web/pubspec.yaml index 6ff04ba25b05..17973ad0ff79 100644 --- a/packages/firebase_app_installations/firebase_app_installations_web/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations_web/pubspec.yaml @@ -23,7 +23,7 @@ dev_dependencies: firebase_core_platform_interface: ^6.0.3 flutter_test: sdk: flutter - flutter_lints: ^4.0.0 + flutter_lints: ^6.0.0 flutter: plugin: diff --git a/packages/firebase_auth/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/firebase_auth/example/pubspec.yaml index 9b96f37ac33f..847cb6319f97 100644 --- a/packages/firebase_auth/firebase_auth/example/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/example/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: sdk: flutter flutter_facebook_auth: ^7.1.5 flutter_signin_button: ^2.0.0 - font_awesome_flutter: ^10.8.0 + font_awesome_flutter: ^11.0.0 google_sign_in: ^6.1.0 google_sign_in_dartio: ^0.3.0 diff --git a/packages/firebase_data_connect/firebase_data_connect/example/lib/main.dart b/packages/firebase_data_connect/firebase_data_connect/example/lib/main.dart index da63eec3afbd..98f684749ffa 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/lib/main.dart +++ b/packages/firebase_data_connect/firebase_data_connect/example/lib/main.dart @@ -248,7 +248,7 @@ class _DataConnectWidgetState extends State { ])); } - _showError(String message) { + void _showError(String message) { showDialog( context: context, builder: (context) { diff --git a/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml b/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml index fa457d5cd9ba..9cfefc6a92bf 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml +++ b/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml @@ -30,7 +30,7 @@ dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^4.0.0 + flutter_lints: ^6.0.0 integration_test: sdk: flutter diff --git a/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml b/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml index cf0d70d2d13d..e41d36a699ac 100644 --- a/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml +++ b/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml @@ -34,7 +34,7 @@ dev_dependencies: build_runner: ^2.4.12 firebase_app_check_platform_interface: ^0.3.0 firebase_auth_platform_interface: ^8.1.9 - flutter_lints: ^4.0.0 + flutter_lints: ^6.0.0 flutter_test: sdk: flutter mockito: ^5.0.0 diff --git a/packages/firebase_database/firebase_database_web/lib/src/interop/database.dart b/packages/firebase_database/firebase_database_web/lib/src/interop/database.dart index 66a11d3b8337..2c3ae9240aea 100755 --- a/packages/firebase_database/firebase_database_web/lib/src/interop/database.dart +++ b/packages/firebase_database/firebase_database_web/lib/src/interop/database.dart @@ -125,7 +125,7 @@ class DatabaseReference extends Query { /// /// This method returns [ThenableReference], [DatabaseReference] /// with a [Future] property. - ThenableReference push([value]) => ThenableReference.fromJsObject( + ThenableReference push([Object? value]) => ThenableReference.fromJsObject( database_interop.push(jsObject, value?.jsify())); /// Removes data from actual database location. diff --git a/packages/firebase_database/firebase_database_web/pubspec.yaml b/packages/firebase_database/firebase_database_web/pubspec.yaml index 0b054ee4949f..addfff88fa07 100644 --- a/packages/firebase_database/firebase_database_web/pubspec.yaml +++ b/packages/firebase_database/firebase_database_web/pubspec.yaml @@ -22,7 +22,7 @@ dev_dependencies: firebase_core_platform_interface: ^6.0.3 flutter_test: sdk: flutter - flutter_lints: ^4.0.0 + flutter_lints: ^6.0.0 flutter: diff --git a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml index 886e72a31853..9267bfe5b016 100644 --- a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: firebase_messaging: ^16.2.0 flutter: sdk: flutter - flutter_local_notifications: ^17.2.1 + flutter_local_notifications: ^21.0.0 http: ^1.0.0 flutter: diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart index d8bd1bca91c1..0d996951cb39 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart @@ -35,7 +35,7 @@ class _MyAppState extends State { FirebaseCustomModel? model; /// Initially get the lcoal model if found, and asynchronously get the latest one in background. - initWithLocalModel() async { + Future initWithLocalModel() async { final newModel = await FirebaseModelDownloader.instance.getModel( kModelName, FirebaseModelDownloadType.localModelUpdateInBackground); diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml index 97be28d2f7f4..490a03e093b5 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: firebase_ml_model_downloader: ^0.4.2 dev_dependencies: - flutter_lints: ^4.0.0 + flutter_lints: ^6.0.0 flutter: uses-material-design: true From be2b9f7dbd426cd6a7d1387804669c0b20ae73a0 Mon Sep 17 00:00:00 2001 From: kevmoo Date: Tue, 21 Apr 2026 11:12:32 -0700 Subject: [PATCH 2/3] fix CI bits --- .../firebase_ai/example/lib/utils/audio_output.dart | 2 +- .../firebase_auth/firebase_auth/example/pubspec.yaml | 2 +- .../firebase_auth/ios/firebase_auth/Package.swift | 4 ++-- .../lib/src/interop/database.dart | 11 ++++++----- .../firebase_messaging/example/lib/main.dart | 8 ++++---- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/firebase_ai/firebase_ai/example/lib/utils/audio_output.dart b/packages/firebase_ai/firebase_ai/example/lib/utils/audio_output.dart index 4e0623eeef97..4ec2a1a4911d 100644 --- a/packages/firebase_ai/firebase_ai/example/lib/utils/audio_output.dart +++ b/packages/firebase_ai/firebase_ai/example/lib/utils/audio_output.dart @@ -69,7 +69,7 @@ class AudioOutput { return null; } // Play audio stream - handle = await SoLoud.instance.play(myStream); + handle = SoLoud.instance.play(myStream); return stream = myStream; } diff --git a/packages/firebase_auth/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/firebase_auth/example/pubspec.yaml index 847cb6319f97..9b96f37ac33f 100644 --- a/packages/firebase_auth/firebase_auth/example/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/example/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: sdk: flutter flutter_facebook_auth: ^7.1.5 flutter_signin_button: ^2.0.0 - font_awesome_flutter: ^11.0.0 + font_awesome_flutter: ^10.8.0 google_sign_in: ^6.1.0 google_sign_in_dartio: ^0.3.0 diff --git a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift index 2905220b029a..fe4429cf5fc9 100644 --- a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift +++ b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift @@ -33,8 +33,8 @@ let package = Package( .process("Resources"), ], cSettings: [ - .headerSearchPath("include/firebase_auth/Private"), - .headerSearchPath("include/firebase_auth/Public"), + .headerSearchPath("include/Private"), + .headerSearchPath("include/Public"), .define("LIBRARY_VERSION", to: "\"\(library_version)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-auth\""), ] diff --git a/packages/firebase_database/firebase_database_web/lib/src/interop/database.dart b/packages/firebase_database/firebase_database_web/lib/src/interop/database.dart index 2c3ae9240aea..e9095b557278 100755 --- a/packages/firebase_database/firebase_database_web/lib/src/interop/database.dart +++ b/packages/firebase_database/firebase_database_web/lib/src/interop/database.dart @@ -148,8 +148,8 @@ class DatabaseReference extends Query { /// Sets a priority for data at actual database location. /// /// The [priority] must be a [String], [num] or `null`, or the error is thrown. - Future setPriority(priority) => - database_interop.setPriority(jsObject, priority).toDart; + Future setPriority(Object? priority) => + database_interop.setPriority(jsObject, priority?.jsify()).toDart; /// Sets data [newVal] at actual database location with provided priority /// [newPriority]. @@ -159,9 +159,10 @@ class DatabaseReference extends Query { /// The [newVal] must be a Dart basic type or the error is thrown. /// The [newPriority] must be a [String], [num] or `null`, or the error /// is thrown. - Future setWithPriority(Object? newVal, newPriority) => database_interop - .setWithPriority(jsObject, newVal?.jsify(), newPriority) - .toDart; + Future setWithPriority(Object? newVal, Object? newPriority) => + database_interop + .setWithPriority(jsObject, newVal?.jsify(), newPriority?.jsify()) + .toDart; /// Atomically updates data at actual database location. /// diff --git a/packages/firebase_messaging/firebase_messaging/example/lib/main.dart b/packages/firebase_messaging/firebase_messaging/example/lib/main.dart index 128d68951a0b..6175abd772c4 100644 --- a/packages/firebase_messaging/firebase_messaging/example/lib/main.dart +++ b/packages/firebase_messaging/firebase_messaging/example/lib/main.dart @@ -98,10 +98,10 @@ void showFlutterNotification(RemoteMessage message) { AndroidNotification? android = message.notification?.android; if (notification != null && android != null && !kIsWeb) { flutterLocalNotificationsPlugin.show( - notification.hashCode, - notification.title, - notification.body, - NotificationDetails( + id: notification.hashCode, + title: notification.title, + body: notification.body, + notificationDetails: NotificationDetails( android: AndroidNotificationDetails( channel.id, channel.name, From 17887c82b937bf7a47eac83e3de1a2397e1df2ff Mon Sep 17 00:00:00 2001 From: kevmoo Date: Tue, 21 Apr 2026 11:57:00 -0700 Subject: [PATCH 3/3] fix swift bits in the auth package for desktop --- .../firebase_auth/macos/firebase_auth/Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift b/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift index 691a98814c6f..c7f29e7ad0e1 100644 --- a/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift +++ b/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift @@ -33,8 +33,8 @@ let package = Package( .process("Resources"), ], cSettings: [ - .headerSearchPath("include/firebase_auth/Private"), - .headerSearchPath("include/firebase_auth/Public"), + .headerSearchPath("include/Private"), + .headerSearchPath("include/Public"), .define("LIBRARY_VERSION", to: "\"\(library_version)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-auth\""), ]