Merge branch 'main' into firestore-pipelines-dart-api-v2

SelaseKay · SelaseKay · commit dfd3d6fdf6cc · 2026-03-20T08:05:21.000Z
diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/method_channel/method_channel_aggregate_query.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/method_channel/method_channel_aggregate_query.dart
@@ -8,7 +8,7 @@ import 'method_channel_firestore.dart';
 /// An implementation of [AggregateQueryPlatform] for the [MethodChannel]
 class MethodChannelAggregateQuery extends AggregateQueryPlatform {
   MethodChannelAggregateQuery(
-    query,
+    QueryPlatform query,
     this._pigeonParameters,
     this._path,
     this._pigeonApp,
diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_load_bundle_task_snapshot.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_load_bundle_task_snapshot.dart
@@ -10,7 +10,7 @@ import '../../cloud_firestore_platform_interface.dart';
 /// The interface a load bundle task snapshot must extend.
 class LoadBundleTaskSnapshotPlatform extends PlatformInterface {
   // ignore: public_member_api_docs
-  LoadBundleTaskSnapshotPlatform(this.taskState, data)
+  LoadBundleTaskSnapshotPlatform(this.taskState, Map<String, dynamic> data)
       : bytesLoaded = data['bytesLoaded'],
         documentsLoaded = data['documentsLoaded'],
         totalBytes = data['totalBytes'],
diff --git a/packages/cloud_firestore/cloud_firestore_web/lib/src/aggregate_query_web.dart b/packages/cloud_firestore/cloud_firestore_web/lib/src/aggregate_query_web.dart
@@ -15,7 +15,7 @@ class AggregateQueryWeb extends AggregateQueryPlatform {
   /// without retrieving the actual documents.
   AggregateQueryWeb(
     QueryPlatform query,
-    _webQuery,
+    firestore_interop.Query _webQuery,
     this._aggregateQueries,
   )   : _delegate = firestore_interop.AggregateQuery(_webQuery),
         _webQuery = _webQuery,
diff --git a/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_confirmation_result_test.dart b/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_confirmation_result_test.dart
@@ -47,5 +47,5 @@ void main() {
 }
 
 class TestConfirmationResultPlatform extends ConfirmationResultPlatform {
-  TestConfirmationResultPlatform(verificationId) : super(verificationId);
+  TestConfirmationResultPlatform(String verificationId) : super(verificationId);
 }
diff --git a/packages/firebase_core/firebase_core_platform_interface/lib/src/method_channel/method_channel_firebase_app.dart b/packages/firebase_core/firebase_core_platform_interface/lib/src/method_channel/method_channel_firebase_app.dart
@@ -18,7 +18,7 @@ class MethodChannelFirebaseApp extends FirebaseAppPlatform {
   MethodChannelFirebaseApp(
     String name,
     FirebaseOptions options, {
-    isAutomaticDataCollectionEnabled,
+    bool? isAutomaticDataCollectionEnabled,
   })  : _isAutomaticDataCollectionEnabled =
             isAutomaticDataCollectionEnabled ?? false,
         super(name, options);
diff --git a/packages/firebase_performance/firebase_performance_platform_interface/test/method_channel_tests/method_channel_http_metric_test.dart b/packages/firebase_performance/firebase_performance_platform_interface/test/method_channel_tests/method_channel_http_metric_test.dart
@@ -204,7 +204,7 @@ class TestFirebasePerformancePlatform extends FirebasePerformancePlatform {
 
 class TestMethodChannelHttpMetric extends MethodChannelHttpMetric {
   TestMethodChannelHttpMetric(
-    url,
-    method,
+    String url,
+    HttpMethod method,
   ) : super(url, method);
 }
diff --git a/packages/firebase_performance/firebase_performance_platform_interface/test/method_channel_tests/method_channel_trace_test.dart b/packages/firebase_performance/firebase_performance_platform_interface/test/method_channel_tests/method_channel_trace_test.dart
@@ -166,5 +166,5 @@ void main() {
 }
 
 class TestMethodChannelTrace extends MethodChannelTrace {
-  TestMethodChannelTrace(name) : super(name);
+  TestMethodChannelTrace(String name) : super(name);
 }
diff --git a/packages/firebase_storage/firebase_storage_platform_interface/test/platform_interface_tests/platform_interface_list_result_test.dart b/packages/firebase_storage/firebase_storage_platform_interface/test/platform_interface_tests/platform_interface_list_result_test.dart
@@ -66,7 +66,8 @@ void main() {
 }
 
 class TestListResultPlatform extends ListResultPlatform {
-  TestListResultPlatform(storage, nextPageToken)
+  TestListResultPlatform(
+      FirebaseStoragePlatform? storage, String? nextPageToken)
       : super(storage, nextPageToken);
 }
 
diff --git a/packages/firebase_storage/firebase_storage_platform_interface/test/platform_interface_tests/platform_interface_reference_test.dart b/packages/firebase_storage/firebase_storage_platform_interface/test/platform_interface_tests/platform_interface_reference_test.dart
@@ -15,9 +15,9 @@ import '../mock.dart';
 void main() {
   setupFirebaseStorageMocks();
 
-  TestReferencePlatform? referencePlatform;
-  FirebaseApp? app;
-  FirebaseStoragePlatform? firebaseStoragePlatform;
+  FirebaseApp app;
+  FirebaseStoragePlatform firebaseStoragePlatform;
+  late TestReferencePlatform referencePlatform;
 
   group('$ReferencePlatform()', () {
     setUpAll(() async {
@@ -35,7 +35,7 @@ void main() {
     group('verify()', () {
       test('calls successfully', () {
         try {
-          ReferencePlatform.verify(referencePlatform!);
+          ReferencePlatform.verify(referencePlatform);
           return;
         } catch (_) {
           fail('thrown an unexpected exception');
@@ -44,23 +44,23 @@ void main() {
     });
 
     test('get.bucket returns successfully', () async {
-      final bucket = referencePlatform!.bucket;
+      final bucket = referencePlatform.bucket;
       expect(bucket, isA<String>());
     });
 
     test('get.fullPath returns successfully', () async {
-      final fullPath = referencePlatform!.fullPath;
+      final fullPath = referencePlatform.fullPath;
       expect(fullPath, isA<String>());
     });
 
     test('get.name returns successfully', () async {
-      final name = referencePlatform!.name;
+      final name = referencePlatform.name;
       expect(name, isA<String>());
     });
 
     test('get.parent should throw unimplemented', () async {
       try {
-        referencePlatform!.parent;
+        referencePlatform.parent;
       } on UnimplementedError catch (e) {
         expect(e.message, equals('ref() is not implemented'));
         return;
@@ -70,7 +70,7 @@ void main() {
 
     test('get.root should throw unimplemented', () async {
       try {
-        referencePlatform!.root;
+        referencePlatform.root;
       } on UnimplementedError catch (e) {
         expect(e.message, equals('ref() is not implemented'));
         return;
@@ -80,7 +80,7 @@ void main() {
 
     test('get.child should throw unimplemented', () async {
       try {
-        referencePlatform!.child('/');
+        referencePlatform.child('/');
       } on UnimplementedError catch (e) {
         expect(e.message, equals('ref() is not implemented'));
         return;
@@ -90,7 +90,7 @@ void main() {
 
     test('throws if delete()', () async {
       try {
-        await referencePlatform!.delete();
+        await referencePlatform.delete();
       } on UnimplementedError catch (e) {
         expect(e.message, equals('delete() is not implemented'));
         return;
@@ -100,7 +100,7 @@ void main() {
 
     test('throws if getDownloadURL()', () async {
       try {
-        await referencePlatform!.getDownloadURL();
+        await referencePlatform.getDownloadURL();
       } on UnimplementedError catch (e) {
         expect(e.message, equals('getDownloadURL() is not implemented'));
         return;
@@ -110,7 +110,7 @@ void main() {
 
     test('throws if getMetadata()', () async {
       try {
-        await referencePlatform!.getMetadata();
+        await referencePlatform.getMetadata();
       } on UnimplementedError catch (e) {
         expect(e.message, equals('getMetadata() is not implemented'));
         return;
@@ -120,7 +120,7 @@ void main() {
 
     test('throws if list()', () async {
       try {
-        await referencePlatform!.list(const ListOptions(maxResults: 10));
+        await referencePlatform.list(const ListOptions(maxResults: 10));
       } on UnimplementedError catch (e) {
         expect(e.message, equals('list() is not implemented'));
         return;
@@ -130,7 +130,7 @@ void main() {
 
     test('throws if listAll()', () async {
       try {
-        await referencePlatform!.listAll();
+        await referencePlatform.listAll();
       } on UnimplementedError catch (e) {
         expect(e.message, equals('listAll() is not implemented'));
         return;
@@ -140,7 +140,7 @@ void main() {
 
     test('throws if putBlob()', () async {
       try {
-        referencePlatform!.putBlob(null);
+        referencePlatform.putBlob(null);
       } on UnimplementedError catch (e) {
         expect(e.message, equals('putBlob() is not implemented'));
         return;
@@ -150,7 +150,7 @@ void main() {
 
     test('throws if putString()', () async {
       try {
-        referencePlatform!.putString('foo', PutStringFormat.base64);
+        referencePlatform.putString('foo', PutStringFormat.base64);
       } on UnimplementedError catch (e) {
         expect(e.message, equals('putString() is not implemented'));
         return;
@@ -161,7 +161,8 @@ void main() {
 }
 
 class TestReferencePlatform extends ReferencePlatform {
-  TestReferencePlatform(storage, path) : super(storage, path);
+  TestReferencePlatform(FirebaseStoragePlatform storage, String path)
+      : super(storage, path);
 }
 
 class TestFirebaseStoragePlatform extends FirebaseStoragePlatform {
diff --git a/packages/firebase_storage/firebase_storage_web/lib/src/interop/storage_interop.dart b/packages/firebase_storage/firebase_storage_web/lib/src/interop/storage_interop.dart
@@ -229,6 +229,7 @@ extension type ListResultJsImpl._(JSObject _) implements JSObject {
 /// See: <https://firebase.google.com/docs/reference/js/firebase.storage#stringformat>
 @JS()
 @staticInterop
+// ignore: avoid_classes_with_only_static_members
 class StringFormat {
   /// Indicates the string should be interpreted 'raw', that is, as normal text.
   /// The string will be interpreted as UTF-16, then uploaded as a UTF-8 byte
diff --git a/packages/firebase_storage/firebase_storage_web/lib/src/reference_web.dart b/packages/firebase_storage/firebase_storage_web/lib/src/reference_web.dart
@@ -25,7 +25,6 @@ final _storageUrlPrefix = RegExp(r'^(?:gs|https?):\//');
 /// The web implementation of a Firebase Storage 'ref'
 class ReferenceWeb extends ReferencePlatform {
   /// Constructor for this ref
-  @override
   ReferenceWeb(FirebaseStorageWeb storage, String path)
       : _path = path,
         super(storage, path) {
diff --git a/scripts/generate_versions_gradle.dart b/scripts/generate_versions_gradle.dart
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// ignore_for_file: avoid_print
+
 import 'dart:io';
 
 import 'package:cli_util/cli_logging.dart' as logging;
@@ -36,11 +38,11 @@ void main() async {
 
   // Define files using paths
   final globalConfig = File(globalConfigPath);
-  
+
   // Check if the files exist
   if (!globalConfig.existsSync()) {
     throw Exception(
-    'global_config.gradle file not found in the expected location.',
+      'global_config.gradle file not found in the expected location.',
     );
   }
 
@@ -60,14 +62,16 @@ void main() async {
       case 'firebase_performance':
       case 'firebase_remote_config':
       case 'firebase_storage':
-        final localConfigGradleFilePath = '${package.path}/android/local-config.gradle';
+        final localConfigGradleFilePath =
+            '${package.path}/android/local-config.gradle';
 
         final copiedConfig = await globalConfig.copy(
-        localConfigGradleFilePath,
+          localConfigGradleFilePath,
         );
         print('File copied to: ${copiedConfig.path}');
 
-        final gradlePropertiesFilePath = '${package.path}/example/android/gradle.properties';
+        final gradlePropertiesFilePath =
+            '${package.path}/example/android/gradle.properties';
         extractAndWriteProperty(
           globalConfig: globalConfig,
           gradlePropertiesFile: File(gradlePropertiesFilePath),
@@ -76,14 +80,15 @@ void main() async {
         break;
       case 'firebase_data_connect':
         // Only has gradle in the example application.
-        final localConfigGradleFilePath = '${package.path}/example/android/app/local-config.gradle';
+        final localConfigGradleFilePath =
+            '${package.path}/example/android/app/local-config.gradle';
         final copiedConfig = await globalConfig.copy(
-        localConfigGradleFilePath,
+          localConfigGradleFilePath,
         );
-        // ignore: avoid_print
         print('File copied to: ${copiedConfig.path}');
-        
-        final gradlePropertiesFilePath = '${package.path}/example/android/gradle.properties';
+
+        final gradlePropertiesFilePath =
+            '${package.path}/example/android/gradle.properties';
         extractAndWriteProperty(
           globalConfig: globalConfig,
           gradlePropertiesFile: File(gradlePropertiesFilePath),
@@ -117,18 +122,17 @@ Future<melos.MelosWorkspace> getMelosWorkspace() async {
   return workspace;
 }
 
-Future<void> extractAndWriteProperty({
+void extractAndWriteProperty({
   required File globalConfig,
   required File gradlePropertiesFile,
-}) async {
-
+}) {
   const String propertyName = 'androidGradlePluginVersion';
-  if (!await globalConfig.exists()) {
+  if (!globalConfig.existsSync()) {
     print('Global config file not found: ${globalConfig.path}');
     return;
   }
 
-  final globalContent = await globalConfig.readAsString();
+  final globalContent = globalConfig.readAsStringSync();
 
   // Extract the property from the ext block
   final regex = RegExp('$propertyName\\s*=\\s*[\'"]?([^\\n\'"]+)[\'"]?');
@@ -141,9 +145,9 @@ Future<void> extractAndWriteProperty({
 
   final value = match.group(1);
 
-  final lines = await gradlePropertiesFile.exists()
-      ? await gradlePropertiesFile.readAsLines()
-      : [];
+  final lines = gradlePropertiesFile.existsSync()
+      ? gradlePropertiesFile.readAsLinesSync()
+      : <String>[];
 
   bool updated = false;
 
@@ -159,7 +163,7 @@ Future<void> extractAndWriteProperty({
     updatedLines.add('$propertyName=$value');
   }
 
-  await gradlePropertiesFile.writeAsString(updatedLines.join('\n'));
+  gradlePropertiesFile.writeAsStringSync(updatedLines.join('\n'));
 
   print('Wrote $propertyName=$value to ${gradlePropertiesFile.path}');
 }
diff --git a/scripts/generate_versions_spm.dart b/scripts/generate_versions_spm.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// ignore_for_file: avoid_print
+
 import 'package:melos/melos.dart' as melos;
 import 'package:glob/glob.dart';
 import 'dart:io';
@@ -131,7 +133,11 @@ void updateVersionsPackageSwift(String firebaseiOSVersion) {
 
 void updateLibraryVersionPureSwiftPlugins() {
   // Packages that require updating library versions
-  const packages = ['firebase_ml_model_downloader', 'firebase_app_installations', 'cloud_functions'];
+  const packages = [
+    'firebase_ml_model_downloader',
+    'firebase_app_installations',
+    'cloud_functions',
+  ];
 
   for (final package in packages) {
     final pubspecPath = 'packages/$package/$package/pubspec.yaml';
diff --git a/scripts/generate_versions_web.dart b/scripts/generate_versions_web.dart
diff --git a/tests/integration_test/firebase_auth/firebase_auth_instance_e2e_test.dart b/tests/integration_test/firebase_auth/firebase_auth_instance_e2e_test.dart

Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,5 @@ void main() {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`class TestConfirmationResultPlatform extends ConfirmationResultPlatform {`
`50`		`- TestConfirmationResultPlatform(verificationId) : super(verificationId);`
	`50`	`+ TestConfirmationResultPlatform(String verificationId) : super(verificationId);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ class TestFirebasePerformancePlatform extends FirebasePerformancePlatform {`
`204`	`204`
`205`	`205`	`class TestMethodChannelHttpMetric extends MethodChannelHttpMetric {`
`206`	`206`	`TestMethodChannelHttpMetric(`
`207`		`- url,`
`208`		`- method,`
	`207`	`+ String url,`
	`208`	`+ HttpMethod method,`
`209`	`209`	`) : super(url, method);`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,5 +166,5 @@ void main() {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`class TestMethodChannelTrace extends MethodChannelTrace {`
`169`		`- TestMethodChannelTrace(name) : super(name);`
	`169`	`+ TestMethodChannelTrace(String name) : super(name);`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,8 @@ void main() {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`class TestListResultPlatform extends ListResultPlatform {`
`69`		`- TestListResultPlatform(storage, nextPageToken)`
	`69`	`+ TestListResultPlatform(`
	`70`	`+ FirebaseStoragePlatform? storage, String? nextPageToken)`
`70`	`71`	`: super(storage, nextPageToken);`
`71`	`72`	`}`
`72`	`73`